Skip to content

Commit

Permalink
Merge pull request #277 from g-easy/master
Browse files Browse the repository at this point in the history
Implement connect to vsock.
  • Loading branch information
h4sh5 authored Nov 6, 2023
2 parents 47a580d + 3aa3efc commit 70c8fd9
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 0 deletions.
62 changes: 62 additions & 0 deletions sshfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
# include <libgen.h>
# include <darwin_compat.h>
#endif
#ifdef __linux__
# include <linux/vm_sockets.h>
#endif

#include "cache.h"

Expand Down Expand Up @@ -349,6 +352,7 @@ struct sshfs {
pthread_mutex_t lock;
unsigned int randseed;
int max_conns;
char *vsock;
struct conn *conns;
int ptyfd;
int ptypassivefd;
Expand Down Expand Up @@ -504,6 +508,7 @@ static struct fuse_opt sshfs_opts[] = {
SSHFS_OPT("dir_cache=no", dir_cache, 0),
SSHFS_OPT("direct_io", direct_io, 1),
SSHFS_OPT("max_conns=%u", max_conns, 1),
SSHFS_OPT("vsock=%s", vsock, 0),

SSHFS_OPT("-h", show_help, 1),
SSHFS_OPT("--help", show_help, 1),
Expand Down Expand Up @@ -1281,6 +1286,60 @@ static int connect_to(struct conn *conn, char *host, char *port)
return 0;
}

static int connect_vsock(struct conn *conn, char *vsock)
{
#ifndef __linux__
fprintf(stderr, "vsock is not available\n");
return -1;
#else
int err;
int sock;
struct sockaddr_vm addr;
unsigned int cid;
unsigned int port;
char *delim;

delim = strchr(vsock, ':');
if (delim == NULL) {
fprintf(stderr, "invalid vsock, expecting CID:PORT\n");
return -1;
}
*delim = '\0';
errno = 0;
cid = strtoul(vsock, NULL, 10);
if (errno) {
perror("invalid cid");
return -1;
}
errno = 0;
port = strtoul(delim + 1, NULL, 10);
if (errno) {
perror("invalid port");
return -1;
}

sock = socket(AF_VSOCK, SOCK_STREAM, 0);
if (sock == -1) {
perror("failed to create socket");
return -1;
}
memset(&addr, 0, sizeof(addr));
addr.svm_family = AF_VSOCK;
addr.svm_cid = cid;
addr.svm_port = port;
err = connect(sock, (const struct sockaddr *)&addr, sizeof(addr));
if (err == -1) {
perror("failed to connect vsock");
close(sock);
return -1;
}

conn->rfd = sock;
conn->wfd = sock;
return 0;
#endif
}

static int do_write(struct conn *conn, struct iovec *iov, size_t count)
{
int res;
Expand Down Expand Up @@ -1833,6 +1892,8 @@ static int connect_remote(struct conn *conn)
err = connect_passive(conn);
else if (sshfs.directport)
err = connect_to(conn, sshfs.host, sshfs.directport);
else if (sshfs.vsock)
err = connect_vsock(conn, sshfs.vsock);
else
err = start_ssh(conn);
if (!err)
Expand Down Expand Up @@ -3645,6 +3706,7 @@ static void usage(const char *progname)
" -o no_check_root don't check for existence of 'dir' on server\n"
" -o password_stdin read password from stdin (only for pam_mount!)\n"
" -o max_conns=N open parallel SSH connections\n"
" -o vsock=CID:PORT connect to the given vsock\n"
" -o SSHOPT=VAL ssh options (see man ssh_config)\n"
"\n"
"FUSE Options:\n",
Expand Down
3 changes: 3 additions & 0 deletions sshfs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@ Options
-o directport=PORT
directly connect to PORT bypassing ssh

-o vsock=CID:PORT
directly connect using a vsock to CID:PORT bypassing ssh

-o passive
communicate over stdin and stdout bypassing network. Useful for
mounting local filesystem on the remote side. An example using
Expand Down

0 comments on commit 70c8fd9

Please sign in to comment.