#include <stdlib.h>
#include <sys/socket.h>
#include <sys/un.h>
-#include "stolen_from_fuse.h"
+#include "fdpass.h"
-char *socket_name = "/vsys/local_fusemount.control";
+char *socket_name = "/vsys/fd_fusemount.control";
-int rrm_connect_socket() {
+unsigned int arg_length = 128;
+
+void send_argument(int control_channel_fd, const char *source) {
+ int sent;
+ sent=send(control_channel_fd, source, arg_length, 0);
+ if (sent<arg_length) {
+ printf("Error receiving arguments over the control buffer\n");
+ exit(1);
+ }
+}
+
+int connect_socket() {
int fd = socket( AF_UNIX, SOCK_STREAM, 0 );
struct sockaddr_un addr;
addr.sun_family = AF_UNIX;
strcpy( addr.sun_path, socket_name );
int len = strlen(socket_name) + sizeof(addr.sun_family);
+ printf("Connecting to %s\n", socket_name);
assert( connect( fd, (struct sockaddr *) &addr, len ) == 0 );
return fd;
}
-void rrm_do_umount( char *const argv[], int n, int fd ) {
-
- // write the length
- char buf[1024];
- sprintf( buf, "%08x\n", n );
- write( fd, buf, strlen(buf) );
-
- // now write each arg
- int i;
- for( i = 0; i < n; i++ ) {
- assert( strlen(argv[i]) < 1024 );
- sprintf( buf, "%s\n", argv[i] );
- write( fd, buf, strlen(buf) );
- }
+int get_magic_fd (char *data) {
+ char *ptr;
+ int fd;
- char inbuf[10];
- int n2 = read( fd, inbuf, 10 );
- inbuf[n2] = '\0';
+ data[arg_length-1]='\0';
+ ptr = strstr(data,"fd=");
+ if (!ptr)
+ return -1;
- int r = atoi(inbuf);
+ // Found two fd= expressions
+ if (strstr(ptr+3,"fd="))
+ return -1;
-}
-
-int umount2( const char *mnt, int flags ) {
-
- int fd = rrm_connect_socket();
-
- const char *argv[3];
- argv[0] = "fusermount";
- argv[1] = "-u";
- argv[2] = mnt;
-
- rrm_do_umount( (char **const) argv, 3, fd );
-
- close(fd);
-
+ if (*(ptr+3)!='\0') {
+ sscanf(ptr+3,"%d",&fd);
+ return fd;
+ }
+ else
+ return -1;
}
int mount(const char *source, const char *target, const char *filesystemtype,
unsigned long mountflags, const void *data) {
+ int fd = connect_socket();
+ int old_fuse_fd, new_fuse_fd;
+ int dupfd;
- int fd = rrm_connect_socket();
-
char buf[1024];
- sprintf( buf, "%08x\n", 0 );
- write( fd, buf, strlen(buf) );
-
- sprintf( buf, "%s\n%s\n%s\n%ld\n%s\n", source, target, filesystemtype,
- mountflags, data );
- write( fd, buf, strlen(buf) );
-
- char inbuf[10];
- int n = read( fd, inbuf, 9 );
- inbuf[n] = '\0';
-
- int r;
- assert( sscanf( inbuf, "%08x\n", &r ) == 1);
-
- int fuse_fd = 0;
- if( r < 0 ) {
- errno = r;
- return -1;
- } else if( r > 0 ) {
- // get the fd
- fuse_fd = rrm_receive_fd(fd);
-
- // what was the old fd?
- int old_fd;
- char extra[1024];
- int s = sscanf( data, "fd=%d,%s", &old_fd, extra );
- assert( dup2( fuse_fd, old_fd ) == old_fd );
- }
+ send_argument(fd, source);
+ send_argument(fd, target );
+ send_argument(fd, filesystemtype );
+ send_argument(fd, data );
- close(fd);
- return 0;
+ old_fuse_fd = get_magic_fd (data);
-}
-
-int execv( const char *path, char *const argv[] ) {
- if( strstr( path, "fusermount" ) == NULL ) {
- return execv( path, argv );
+ if (old_fuse_fd == -1) {
+ printf ("Reroutemount: Could not identify FUSE fd: %d\n", old_fuse_fd);
+ exit(1);
}
- // also make sure this is an unmount . . .
- int n = 0;
- char *arg = argv[n];
- int found_u = 0;
- while( arg != NULL ) {
- if( strcmp( arg, "-u" ) == 0 ) {
- found_u = 1;
- break;
- }
- arg = argv[++n];
- }
+ send_fd(fd, old_fuse_fd);
+ new_fuse_fd=receive_fd(fd);
- if( !found_u ) {
- return execv( path, argv );
+ if (new_fuse_fd == -1) {
+ printf ("Reroutemount: Fusemount returned bad fd: %d\n", new_fuse_fd);
+ exit(1);
}
- // Have root do any fusermounts we need done
- int fd = rrm_connect_socket();
-
- rrm_do_umount( argv, n, fd );
+ if( (dupfd=dup2(new_fuse_fd, old_fuse_fd )) != old_fuse_fd ) {
+ printf ("Could not duplicate returned file descriptor: %d\n",dupfd);
+ exit(1);
+ }
- exit(0);
+ close(fd);
+ return 0;
}
-
git://git.onelab.eu / vsys-wrappers.git / blobdiff