X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fd_fusemount.c;h=bd334b0125b08a7ab1809a73a3ba5d4678d4a0c8;hb=aebfd1e7387f8c26efbddbcce5385300efc06f26;hp=de05b55344c48b83d8e5758d33543b5d20d7141a;hpb=2d18a9719b31326fba9791ec2c8ef3ad152e78b0;p=vsys-scripts.git

diff --git a/fd_fusemount.c b/fd_fusemount.c
index de05b55..bd334b0 100644
--- a/fd_fusemount.c
+++ b/fd_fusemount.c
@@ -11,16 +11,19 @@ unsigned int rcvbuf = 16*1024*1024;
 unsigned int arg_length = 128;
 unsigned int mountflags = MS_NODEV | MS_NOSUID;
 
+FILE *logfd;
+
 void receive_argument(int control_channel_fd, char *source) {
     int received;
     received=recv(control_channel_fd, source, arg_length, 0);
     if (received<arg_length) {
-        printf("Error receiving arguments over the control buffer\n");
+        fprintf(logfd,"Error receiving arguments over the control buffer\n");
+        close(logfd);
         exit(1);
     }
 }
 
-int get_magic_fd (char *data) {
+int set_magic_fd (char *data, int new_fd) {
     char *ptr;
     int fd;
 
@@ -34,7 +37,17 @@ int get_magic_fd (char *data) {
         return -1;
 
     if (*(ptr+3)!='\0') {
+        char *new_data = (char *) malloc(arg_length);
+        char *head = (char *) malloc(arg_length);
+        char *tail;
         sscanf(ptr+3,"%d",&fd);
+        strncpy(head, data, ptr - data);
+        tail = strchr(ptr+3,',');
+        sprintf(new_data,"%sfd=%d%s",head,new_fd,tail);
+        strcpy(data,new_data);
+        free(tail);
+        free(head);
+        free(new_data);
         return fd;
     }
     else
@@ -44,28 +57,32 @@ int get_magic_fd (char *data) {
 void check_source(char *source) {
     source[arg_length-1]='\0';
     if (strchr(source,'/') || strstr(source,"..")) {
-        printf("Tried mounting with source = %s\n", source);
+        fprintf(logfd, "Tried mounting with source = %s\n", source);
+        close(logfd);
         exit(1);
     }
 }
 
 void check_target(char *target) {
-    source[arg_length-1]='\0';
-    if (strstr(source,"..")) {
-        printf("Tried mounting with target = %s\n", target);
+    target[arg_length-1]='\0';
+    if (strstr(target,"..")) {
+        fprintf(logfd,"Tried mounting with target = %s\n", target);
+        close(logfd);
         exit(1);
     }
 }
 
 void check_fstype(char *filesystemtype) {
     if (strncmp(filesystemtype,"fuse",4)) {
-        printf("Tried mounting filesystem type %s\n", filesystemtype);
+        fprintf(logfd,"Tried mounting filesystem type %s\n", filesystemtype);
+        close(logfd);
+        exit(1);
     }
 }
 
 int main(int argc, char *argv[]) {
     int control_channel_fd, magic_fd, mount_fd;
-    char source[128],target[128],filesystemtype[128],data[128],slice_target[256];
+    char source[128],target[128],filesystemtype[128],data[128],slice_target[1024];
 
     int received;
 
@@ -75,6 +92,9 @@ int main(int argc, char *argv[]) {
     }
 
     char *slice_name = argv[1];
+
+    logfd=fopen("/tmp/fuselog","w");
+    if (!logfd) {logfd = stderr;}
     
     sscanf(argv[2],"%d", &control_channel_fd);
 
@@ -87,29 +107,33 @@ int main(int argc, char *argv[]) {
     receive_argument(control_channel_fd, target);
     receive_argument(control_channel_fd, filesystemtype);
     receive_argument(control_channel_fd, data);
-    
-    magic_fd = get_magic_fd (data);
-
-    if (magic_fd < 3) {
-        printf("Got fd %d in fusemount\n",magic_fd);
-        exit(1);
-    }
 
     mount_fd = receive_fd (control_channel_fd);
 
-    if (mount_fd != magic_fd) {
-        printf("mount_fd (%d) != magic_fd (%d)\n", mount_fd, magic_fd);
+    if (mount_fd < 2) {
+        printf("mount_fd = %d\n", mount_fd);
         exit(1);
     }
 
+    set_magic_fd(data, mount_fd);
+
+
     check_source(source);
     check_target(target);
     check_fstype(filesystemtype);
 
-    sprintf(slice_target,"/vservers/%s/%s", target);
+    sprintf(slice_target,"/vservers/%s/%s", slice_name, target);
+
+    fprintf(logfd, "Mount fd: %d Source: %s slice_target: %s fstype: %s mountflags: %d data: %s\n", mount_fd, source, slice_target, filesystemtype, mountflags, data);
 
     if (!mount(source, slice_target, filesystemtype, mountflags, data)) {
-        send_fd(control_channel_fd, magic_fd);
+        send_fd(control_channel_fd, mount_fd);
+    }
+    else {
+        printf ("Error executing mount\n");
+        exit(1);
     }
 
+    close(logfd);
+    return 0;
 }