mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-23 11:00:25 +00:00
Merge pull request #465 from rneugeba/c-style
Unify C coding style to the Linux kernel coding style (mostly)
This commit is contained in:
commit
94cf16b4e9
@ -1,6 +1,3 @@
|
||||
/*
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@ -28,202 +25,224 @@ char *mount = "/bin/mount";
|
||||
|
||||
void fatal(const char *msg)
|
||||
{
|
||||
syslog(LOG_CRIT, "%s Error: %d. %s", msg, errno, strerror(errno));
|
||||
exit(1);
|
||||
syslog(LOG_CRIT, "%s Error: %d. %s", msg, errno, strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
|
||||
static int handle(int fd, char *tag, char *path)
|
||||
{
|
||||
char *options = NULL;
|
||||
if (asprintf(&options, "trans=fd,dfltuid=1001,dfltgid=50,version=9p2000,msize=4096,rfdno=%d,wfdno=%d", fd, fd) < 0){
|
||||
fatal("asprintf()");
|
||||
}
|
||||
char *argv[] = {
|
||||
mount,
|
||||
"-t", "9p", "-o", options,
|
||||
tag, path,
|
||||
NULL
|
||||
};
|
||||
pid_t pid = fork();
|
||||
if (pid == 0) {
|
||||
execv(mount, argv);
|
||||
fatal("execv()");
|
||||
}
|
||||
int status;
|
||||
if (waitpid(pid, &status, 0) == -1) {
|
||||
syslog(LOG_CRIT, "waitpid failed: %d. %s", errno, strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
return WEXITSTATUS(status);
|
||||
char *options = NULL;
|
||||
int status;
|
||||
pid_t pid;
|
||||
int res;
|
||||
|
||||
res = asprintf(&options,
|
||||
"trans=fd,dfltuid=1001,dfltgid=50,version=9p2000,msize=4096,rfdno=%d,wfdno=%d",
|
||||
fd, fd);
|
||||
if (res < 0)
|
||||
fatal("asprintf()");
|
||||
|
||||
char *argv[] = {
|
||||
mount,
|
||||
"-t", "9p", "-o", options,
|
||||
tag, path,
|
||||
NULL
|
||||
};
|
||||
|
||||
pid = fork();
|
||||
if (pid == 0) {
|
||||
execv(mount, argv);
|
||||
fatal("execv()");
|
||||
}
|
||||
|
||||
res = waitpid(pid, &status, 0);
|
||||
if (res == -1) {
|
||||
syslog(LOG_CRIT,
|
||||
"waitpid failed: %d. %s", errno, strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
return WEXITSTATUS(status);
|
||||
}
|
||||
|
||||
static int create_listening_socket(GUID serviceid) {
|
||||
int lsock = -1;
|
||||
SOCKADDR_HV sa;
|
||||
int res;
|
||||
static int create_listening_socket(GUID serviceid)
|
||||
{
|
||||
SOCKADDR_HV sa;
|
||||
int lsock;
|
||||
int res;
|
||||
|
||||
lsock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW);
|
||||
if (lsock == -1) {
|
||||
fatal("socket()");
|
||||
}
|
||||
lsock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW);
|
||||
if (lsock == -1)
|
||||
fatal("socket()");
|
||||
|
||||
sa.Family = AF_HYPERV;
|
||||
sa.Reserved = 0;
|
||||
sa.VmId = HV_GUID_WILDCARD;
|
||||
sa.ServiceId = serviceid;
|
||||
sa.Family = AF_HYPERV;
|
||||
sa.Reserved = 0;
|
||||
sa.VmId = HV_GUID_WILDCARD;
|
||||
sa.ServiceId = serviceid;
|
||||
|
||||
res = bind(lsock, (const struct sockaddr *)&sa, sizeof(sa));
|
||||
if (res == -1) {
|
||||
fatal("bind()");
|
||||
}
|
||||
res = bind(lsock, (const struct sockaddr *)&sa, sizeof(sa));
|
||||
if (res == -1)
|
||||
fatal("bind()");
|
||||
|
||||
res = listen(lsock, 1);
|
||||
if (res == -1) {
|
||||
fatal("listen()");
|
||||
}
|
||||
return lsock;
|
||||
res = listen(lsock, 1);
|
||||
if (res == -1)
|
||||
fatal("listen()");
|
||||
|
||||
return lsock;
|
||||
}
|
||||
|
||||
static int connect_socket(GUID serviceid) {
|
||||
int sock = -1;
|
||||
SOCKADDR_HV sa;
|
||||
int res;
|
||||
static int connect_socket(GUID serviceid)
|
||||
{
|
||||
SOCKADDR_HV sa;
|
||||
int sock;
|
||||
int res;
|
||||
|
||||
sock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW);
|
||||
if (sock == -1) {
|
||||
fatal("socket()");
|
||||
}
|
||||
sock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW);
|
||||
if (sock == -1)
|
||||
fatal("socket()");
|
||||
|
||||
sa.Family = AF_HYPERV;
|
||||
sa.Reserved = 0;
|
||||
sa.VmId = HV_GUID_PARENT;
|
||||
sa.ServiceId = serviceid;
|
||||
sa.Family = AF_HYPERV;
|
||||
sa.Reserved = 0;
|
||||
sa.VmId = HV_GUID_PARENT;
|
||||
sa.ServiceId = serviceid;
|
||||
|
||||
res = connect(sock, (const struct sockaddr *)&sa, sizeof(sa));
|
||||
if (res == -1) {
|
||||
fatal("connect()");
|
||||
}
|
||||
res = connect(sock, (const struct sockaddr *)&sa, sizeof(sa));
|
||||
if (res == -1)
|
||||
fatal("connect()");
|
||||
|
||||
return sock;
|
||||
return sock;
|
||||
}
|
||||
|
||||
static int accept_socket(int lsock) {
|
||||
int csock = -1;
|
||||
SOCKADDR_HV sac;
|
||||
socklen_t socklen = sizeof(sac);
|
||||
static int accept_socket(int lsock)
|
||||
{
|
||||
SOCKADDR_HV sac;
|
||||
socklen_t socklen = sizeof(sac);
|
||||
int csock;
|
||||
|
||||
csock = accept(lsock, (struct sockaddr *)&sac, &socklen);
|
||||
if (csock == -1) {
|
||||
fatal("accept()");
|
||||
}
|
||||
csock = accept(lsock, (struct sockaddr *)&sac, &socklen);
|
||||
if (csock == -1)
|
||||
fatal("accept()");
|
||||
|
||||
syslog(LOG_INFO, "Connect from: "GUID_FMT":"GUID_FMT"\n",
|
||||
GUID_ARGS(sac.VmId), GUID_ARGS(sac.ServiceId));
|
||||
return csock;
|
||||
syslog(LOG_INFO, "Connect from: " GUID_FMT ":" GUID_FMT "\n",
|
||||
GUID_ARGS(sac.VmId), GUID_ARGS(sac.ServiceId));
|
||||
|
||||
return csock;
|
||||
}
|
||||
|
||||
void usage(char *name)
|
||||
{
|
||||
printf("%s: mount a 9P filesystem from an hvsock connection\n", name);
|
||||
printf("usage:\n");
|
||||
printf("\t[--serviceid <guid>] <listen | connect> <tag> <path>\n");
|
||||
printf("where\n");
|
||||
printf("\t--serviceid <guid>: use <guid> as the well-known service GUID\n");
|
||||
printf("\t (defaults to %s)\n", default_sid);
|
||||
printf("\t--listen: listen forever for incoming AF_HVSOCK connections\n");
|
||||
printf("\t--connect: connect to the parent partition\n");
|
||||
printf("%s: mount a 9P filesystem from an hvsock connection\n", name);
|
||||
printf("usage:\n");
|
||||
printf("\t[--serviceid <guid>] <listen | connect> <tag> <path>\n");
|
||||
printf("where\n");
|
||||
printf("\t--serviceid <guid>: use <guid> as the well-known service GUID\n");
|
||||
printf("\t (defaults to %s)\n", default_sid);
|
||||
printf("\t--listen: listen forever for incoming AF_HVSOCK connections\n");
|
||||
printf("\t--connect: connect to the parent partition\n");
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int res = 0;
|
||||
GUID sid;
|
||||
int c;
|
||||
/* Defaults to a testing GUID */
|
||||
char *serviceid = default_sid;
|
||||
char *tag = NULL;
|
||||
char *path = NULL;
|
||||
int res = 0;
|
||||
GUID sid;
|
||||
int c;
|
||||
/* Defaults to a testing GUID */
|
||||
char *serviceid = default_sid;
|
||||
char *tag = NULL;
|
||||
char *path = NULL;
|
||||
|
||||
opterr = 0;
|
||||
while (1) {
|
||||
static struct option long_options[] = {
|
||||
/* These options set a flag. */
|
||||
{"serviceid", required_argument, NULL, 's'},
|
||||
{0, 0, 0, 0}
|
||||
};
|
||||
int option_index = 0;
|
||||
opterr = 0;
|
||||
while (1) {
|
||||
static struct option long_options[] = {
|
||||
/* These options set a flag. */
|
||||
{"serviceid", required_argument, NULL, 's'},
|
||||
{0, 0, 0, 0}
|
||||
};
|
||||
int option_index = 0;
|
||||
|
||||
c = getopt_long (argc, argv, "s:", long_options, &option_index);
|
||||
if (c == -1) break;
|
||||
c = getopt_long(argc, argv, "s:", long_options, &option_index);
|
||||
if (c == -1)
|
||||
break;
|
||||
|
||||
switch (c) {
|
||||
switch (c) {
|
||||
case 's':
|
||||
serviceid = optarg;
|
||||
break;
|
||||
case 0:
|
||||
break;
|
||||
default:
|
||||
usage(argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
case 's':
|
||||
serviceid = optarg;
|
||||
break;
|
||||
case 0:
|
||||
break;
|
||||
default:
|
||||
usage (argv[0]);
|
||||
exit (1);
|
||||
}
|
||||
}
|
||||
if (optind < argc) {
|
||||
if (strcmp(argv[optind], "listen") == 0) {
|
||||
mode = LISTEN;
|
||||
} else if (strcmp(argv[optind], "connect") == 0) {
|
||||
mode = CONNECT;
|
||||
}
|
||||
optind++;
|
||||
}
|
||||
if (mode == NONE) {
|
||||
fprintf(stderr, "Please supply either listen or connect\n");
|
||||
usage(argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
if (optind < argc) {
|
||||
tag = argv[optind++];
|
||||
}
|
||||
if (optind < argc) {
|
||||
path = argv[optind++];
|
||||
}
|
||||
if (!tag) {
|
||||
fprintf(stderr, "Please supply a tag name\n");
|
||||
usage(argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
if (!path) {
|
||||
fprintf(stderr, "Please supply a path\n");
|
||||
usage(argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
res = parseguid(serviceid, &sid);
|
||||
if (res) {
|
||||
fprintf(stderr, "Failed to parse serviceid as GUID: %s\n", serviceid);
|
||||
usage(argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
if (optind < argc) {
|
||||
if (strcmp(argv[optind], "listen") == 0)
|
||||
mode = LISTEN;
|
||||
else if (strcmp(argv[optind], "connect") == 0)
|
||||
mode = CONNECT;
|
||||
optind++;
|
||||
}
|
||||
if (mode == NONE) {
|
||||
fprintf(stderr, "Please supply either listen or connect\n");
|
||||
usage(argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
openlog(argv[0], LOG_CONS | LOG_NDELAY | LOG_PERROR, LOG_DAEMON);
|
||||
for (;;) {
|
||||
int sock = -1;
|
||||
if (mode == LISTEN) {
|
||||
syslog(LOG_INFO, "starting in listening mode with serviceid=%s, tag=%s, path=%s", serviceid, tag, path);
|
||||
int lsocket = create_listening_socket(sid);
|
||||
sock = accept_socket(lsocket);
|
||||
close(lsocket);
|
||||
} else {
|
||||
syslog(LOG_INFO, "starting in connect mode with serviceid=%s, tag=%s, path=%s", serviceid, tag, path);
|
||||
sock = connect_socket(sid);
|
||||
}
|
||||
int r = handle(sock, tag, path);
|
||||
close(sock);
|
||||
if (r == 0) {
|
||||
syslog(LOG_INFO, "mount successful for serviceid=%s tag=%s path=%s", serviceid, tag, path);
|
||||
exit(0);
|
||||
}
|
||||
/* This can happen if the client times out the connection after we accept it */
|
||||
syslog(LOG_CRIT, "mount failed with %d for serviceid=%s tag=%s path=%s", r, serviceid, tag, path);
|
||||
sleep(1); /* retry */
|
||||
}
|
||||
if (optind < argc)
|
||||
tag = argv[optind++];
|
||||
|
||||
if (optind < argc)
|
||||
path = argv[optind++];
|
||||
|
||||
if (!tag) {
|
||||
fprintf(stderr, "Please supply a tag name\n");
|
||||
usage(argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (!path) {
|
||||
fprintf(stderr, "Please supply a path\n");
|
||||
usage(argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
res = parseguid(serviceid, &sid);
|
||||
if (res) {
|
||||
fprintf(stderr,
|
||||
"Failed to parse serviceid as GUID: %s\n", serviceid);
|
||||
usage(argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
openlog(argv[0], LOG_CONS | LOG_NDELAY | LOG_PERROR, LOG_DAEMON);
|
||||
for (;;) {
|
||||
int lsocket;
|
||||
int sock;
|
||||
int r;
|
||||
|
||||
if (mode == LISTEN) {
|
||||
syslog(LOG_INFO, "starting in listening mode with serviceid=%s, tag=%s, path=%s", serviceid, tag, path);
|
||||
lsocket = create_listening_socket(sid);
|
||||
sock = accept_socket(lsocket);
|
||||
close(lsocket);
|
||||
} else {
|
||||
syslog(LOG_INFO, "starting in connect mode with serviceid=%s, tag=%s, path=%s", serviceid, tag, path);
|
||||
sock = connect_socket(sid);
|
||||
}
|
||||
|
||||
r = handle(sock, tag, path);
|
||||
close(sock);
|
||||
|
||||
if (r == 0) {
|
||||
syslog(LOG_INFO, "mount successful for serviceid=%s tag=%s path=%s", serviceid, tag, path);
|
||||
exit(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* This can happen if the client times out the connection
|
||||
* after we accept it
|
||||
*/
|
||||
syslog(LOG_CRIT, "mount failed with %d for serviceid=%s tag=%s path=%s", r, serviceid, tag, path);
|
||||
sleep(1); /* retry */
|
||||
}
|
||||
}
|
||||
|
@ -4,23 +4,23 @@
|
||||
|
||||
int parseguid(const char *s, GUID *g)
|
||||
{
|
||||
int res;
|
||||
int p0, p1, p2, p3, p4, p5, p6, p7;
|
||||
int res;
|
||||
int p0, p1, p2, p3, p4, p5, p6, p7;
|
||||
|
||||
res = sscanf(s, GUID_FMT,
|
||||
&g->Data1, &g->Data2, &g->Data3,
|
||||
&p0, &p1, &p2, &p3, &p4, &p5, &p6, &p7);
|
||||
if (res != 11)
|
||||
return 1;
|
||||
g->Data4[0] = p0;
|
||||
g->Data4[1] = p1;
|
||||
g->Data4[2] = p2;
|
||||
g->Data4[3] = p3;
|
||||
g->Data4[4] = p4;
|
||||
g->Data4[5] = p5;
|
||||
g->Data4[6] = p6;
|
||||
g->Data4[7] = p7;
|
||||
return 0;
|
||||
res = sscanf(s, GUID_FMT,
|
||||
&g->Data1, &g->Data2, &g->Data3,
|
||||
&p0, &p1, &p2, &p3, &p4, &p5, &p6, &p7);
|
||||
if (res != 11)
|
||||
return 1;
|
||||
g->Data4[0] = p0;
|
||||
g->Data4[1] = p1;
|
||||
g->Data4[2] = p2;
|
||||
g->Data4[3] = p3;
|
||||
g->Data4[4] = p4;
|
||||
g->Data4[5] = p5;
|
||||
g->Data4[6] = p6;
|
||||
g->Data4[7] = p7;
|
||||
return 0;
|
||||
}
|
||||
|
||||
DEFINE_GUID(HV_GUID_ZERO,
|
||||
@ -29,7 +29,6 @@ DEFINE_GUID(HV_GUID_BROADCAST,
|
||||
0xFFFFFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
|
||||
DEFINE_GUID(HV_GUID_WILDCARD,
|
||||
0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
|
||||
|
||||
DEFINE_GUID(HV_GUID_CHILDREN,
|
||||
0x90db8b89, 0x0d35, 0x4f79, 0x8c, 0xe9, 0x49, 0xea, 0x0a, 0xc8, 0xb7, 0xcd);
|
||||
DEFINE_GUID(HV_GUID_LOOPBACK,
|
||||
|
@ -7,10 +7,10 @@
|
||||
|
||||
/* GUID handling */
|
||||
typedef struct _GUID {
|
||||
uint32_t Data1;
|
||||
uint16_t Data2;
|
||||
uint16_t Data3;
|
||||
uint8_t Data4[8];
|
||||
uint32_t Data1;
|
||||
uint16_t Data2;
|
||||
uint16_t Data3;
|
||||
uint8_t Data4[8];
|
||||
} GUID;
|
||||
|
||||
#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
|
||||
@ -33,12 +33,11 @@ extern int parseguid(const char *s, GUID *g);
|
||||
#define AF_HYPERV 43
|
||||
#define HV_PROTOCOL_RAW 1
|
||||
|
||||
typedef struct _SOCKADDR_HV
|
||||
{
|
||||
unsigned short Family;
|
||||
unsigned short Reserved;
|
||||
GUID VmId;
|
||||
GUID ServiceId;
|
||||
typedef struct _SOCKADDR_HV {
|
||||
unsigned short Family;
|
||||
unsigned short Reserved;
|
||||
GUID VmId;
|
||||
GUID ServiceId;
|
||||
} SOCKADDR_HV;
|
||||
|
||||
extern const GUID HV_GUID_ZERO;
|
||||
|
@ -4,23 +4,25 @@
|
||||
|
||||
int parseguid(const char *s, GUID *g)
|
||||
{
|
||||
int res;
|
||||
int p0, p1, p2, p3, p4, p5, p6, p7;
|
||||
int res;
|
||||
int p0, p1, p2, p3, p4, p5, p6, p7;
|
||||
|
||||
res = sscanf(s, GUID_FMT,
|
||||
&g->Data1, &g->Data2, &g->Data3,
|
||||
&p0, &p1, &p2, &p3, &p4, &p5, &p6, &p7);
|
||||
if (res != 11)
|
||||
return 1;
|
||||
g->Data4[0] = p0;
|
||||
g->Data4[1] = p1;
|
||||
g->Data4[2] = p2;
|
||||
g->Data4[3] = p3;
|
||||
g->Data4[4] = p4;
|
||||
g->Data4[5] = p5;
|
||||
g->Data4[6] = p6;
|
||||
g->Data4[7] = p7;
|
||||
return 0;
|
||||
res = sscanf(s, GUID_FMT,
|
||||
&g->Data1, &g->Data2, &g->Data3,
|
||||
&p0, &p1, &p2, &p3, &p4, &p5, &p6, &p7);
|
||||
if (res != 11)
|
||||
return 1;
|
||||
|
||||
g->Data4[0] = p0;
|
||||
g->Data4[1] = p1;
|
||||
g->Data4[2] = p2;
|
||||
g->Data4[3] = p3;
|
||||
g->Data4[4] = p4;
|
||||
g->Data4[5] = p5;
|
||||
g->Data4[6] = p6;
|
||||
g->Data4[7] = p7;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
DEFINE_GUID(HV_GUID_ZERO,
|
||||
@ -28,7 +30,7 @@ DEFINE_GUID(HV_GUID_ZERO,
|
||||
DEFINE_GUID(HV_GUID_BROADCAST,
|
||||
0xFFFFFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
|
||||
DEFINE_GUID(HV_GUID_WILDCARD,
|
||||
0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
|
||||
0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
|
||||
|
||||
DEFINE_GUID(HV_GUID_CHILDREN,
|
||||
0x90db8b89, 0x0d35, 0x4f79, 0x8c, 0xe9, 0x49, 0xea, 0x0a, 0xc8, 0xb7, 0xcd);
|
||||
|
@ -7,10 +7,10 @@
|
||||
|
||||
/* GUID handling */
|
||||
typedef struct _GUID {
|
||||
uint32_t Data1;
|
||||
uint16_t Data2;
|
||||
uint16_t Data3;
|
||||
uint8_t Data4[8];
|
||||
uint32_t Data1;
|
||||
uint16_t Data2;
|
||||
uint16_t Data3;
|
||||
uint8_t Data4[8];
|
||||
} GUID;
|
||||
|
||||
#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
|
||||
@ -33,12 +33,11 @@ extern int parseguid(const char *s, GUID *g);
|
||||
#define AF_HYPERV 43
|
||||
#define HV_PROTOCOL_RAW 1
|
||||
|
||||
typedef struct _SOCKADDR_HV
|
||||
{
|
||||
unsigned short Family;
|
||||
unsigned short Reserved;
|
||||
GUID VmId;
|
||||
GUID ServiceId;
|
||||
typedef struct _SOCKADDR_HV {
|
||||
unsigned short Family;
|
||||
unsigned short Reserved;
|
||||
GUID VmId;
|
||||
GUID ServiceId;
|
||||
} SOCKADDR_HV;
|
||||
|
||||
extern const GUID HV_GUID_ZERO;
|
||||
|
@ -10,162 +10,222 @@
|
||||
#include "protocol.h"
|
||||
|
||||
/* Version 0 of the protocol used this */
|
||||
char expected_hello_old[5] = { 'V', 'M', 'N', 'E', 'T' };
|
||||
char expected_hello_old[5] = {'V', 'M', 'N', 'E', 'T'};
|
||||
|
||||
/* Version 1 and later of the protocol used this */
|
||||
char expected_hello[5] = { 'V', 'M', 'N', '3', 'T' };
|
||||
char expected_hello[5] = {'V', 'M', 'N', '3', 'T'};
|
||||
|
||||
int really_read(int fd, uint8_t *buffer, size_t total){
|
||||
size_t remaining = total;
|
||||
ssize_t n;
|
||||
while (remaining > 0){
|
||||
n = read(fd, buffer, remaining);
|
||||
if (n == 0){
|
||||
syslog(LOG_CRIT, "EOF reading from socket: closing\n");
|
||||
goto err;
|
||||
}
|
||||
if (n < 0){
|
||||
syslog(LOG_CRIT, "Failure reading from socket: closing: %s", strerror(errno));
|
||||
goto err;
|
||||
}
|
||||
remaining -= (size_t)n;
|
||||
buffer = buffer + n;
|
||||
}
|
||||
return 0;
|
||||
err:
|
||||
/* On error: stop reading from the socket and trigger a clean shutdown */
|
||||
shutdown(fd, SHUT_RD);
|
||||
return -1;
|
||||
}
|
||||
|
||||
int really_write(int fd, uint8_t *buffer, size_t total){
|
||||
int really_read(int fd, uint8_t *buffer, size_t total)
|
||||
{
|
||||
size_t remaining = total;
|
||||
ssize_t n;
|
||||
while (remaining > 0){
|
||||
n = write(fd, buffer, remaining);
|
||||
if (n == 0){
|
||||
syslog(LOG_CRIT, "EOF writing to socket: closing");
|
||||
goto err;
|
||||
}
|
||||
if (n < 0){
|
||||
syslog(LOG_CRIT, "Failure writing to socket: closing: %s", strerror(errno));
|
||||
goto err;
|
||||
}
|
||||
remaining -= (size_t) n;
|
||||
buffer = buffer + n;
|
||||
}
|
||||
return 0;
|
||||
ssize_t n;
|
||||
|
||||
while (remaining > 0) {
|
||||
n = read(fd, buffer, remaining);
|
||||
if (n == 0) {
|
||||
syslog(LOG_CRIT, "EOF reading from socket: closing\n");
|
||||
goto err;
|
||||
}
|
||||
if (n < 0) {
|
||||
syslog(LOG_CRIT,
|
||||
"Failure reading from socket: closing: %s",
|
||||
strerror(errno));
|
||||
goto err;
|
||||
}
|
||||
remaining -= (size_t) n;
|
||||
buffer = buffer + n;
|
||||
}
|
||||
return 0;
|
||||
err:
|
||||
/* On error: stop listening to the socket */
|
||||
shutdown(fd, SHUT_WR);
|
||||
return -1;
|
||||
/*
|
||||
* On error: stop reading from the socket and trigger a clean
|
||||
* shutdown
|
||||
*/
|
||||
shutdown(fd, SHUT_RD);
|
||||
return -1;
|
||||
}
|
||||
|
||||
struct init_message *create_init_message(){
|
||||
struct init_message *m = (struct init_message*) malloc(sizeof(struct init_message));
|
||||
bzero(m, sizeof(struct init_message));
|
||||
memcpy(&m->hello[0], &expected_hello[0], sizeof(m->hello));
|
||||
m->version = CURRENT_VERSION;
|
||||
memset(&m->commit[0], 0, sizeof(m->commit));
|
||||
return m;
|
||||
int really_write(int fd, uint8_t *buffer, size_t total)
|
||||
{
|
||||
size_t remaining = total;
|
||||
ssize_t n;
|
||||
|
||||
while (remaining > 0) {
|
||||
n = write(fd, buffer, remaining);
|
||||
if (n == 0) {
|
||||
syslog(LOG_CRIT, "EOF writing to socket: closing");
|
||||
goto err;
|
||||
}
|
||||
if (n < 0) {
|
||||
syslog(LOG_CRIT,
|
||||
"Failure writing to socket: closing: %s",
|
||||
strerror(errno));
|
||||
goto err;
|
||||
}
|
||||
remaining -= (size_t) n;
|
||||
buffer = buffer + n;
|
||||
}
|
||||
return 0;
|
||||
err:
|
||||
/* On error: stop listening to the socket */
|
||||
shutdown(fd, SHUT_WR);
|
||||
return -1;
|
||||
}
|
||||
|
||||
char *print_init_message(struct init_message *m) {
|
||||
char tmp[41];
|
||||
memcpy(&tmp[0], &m->commit[0], 40);
|
||||
tmp[40] = '\000';
|
||||
char *buffer = (char*) malloc(80);
|
||||
int n = snprintf(buffer, 80, "version %d, commit %s", m->version, tmp);
|
||||
if (n < 0) {
|
||||
perror("Failed to format init_message");
|
||||
exit(1);
|
||||
}
|
||||
return buffer;
|
||||
struct init_message *create_init_message()
|
||||
{
|
||||
struct init_message *m;
|
||||
|
||||
m = malloc(sizeof(struct init_message));
|
||||
if (!m)
|
||||
return NULL;
|
||||
|
||||
bzero(m, sizeof(struct init_message));
|
||||
memcpy(&m->hello[0], &expected_hello[0], sizeof(m->hello));
|
||||
m->version = CURRENT_VERSION;
|
||||
memset(&m->commit[0], 0, sizeof(m->commit));
|
||||
|
||||
return m;
|
||||
}
|
||||
|
||||
int read_init_message(int fd, struct init_message *ci) {
|
||||
bzero(ci, sizeof(struct init_message));
|
||||
if (really_read(fd, (uint8_t*) &ci->hello[0], sizeof(ci->hello)) == -1){
|
||||
syslog(LOG_CRIT, "Failed to read hello from client");
|
||||
return -1;
|
||||
}
|
||||
if (memcmp(&ci->hello[0], &expected_hello_old[0], sizeof(expected_hello_old)) == 0) {
|
||||
ci->version = 0;
|
||||
return 0;
|
||||
}
|
||||
if (memcmp(&ci->hello[0], &expected_hello[0], sizeof(expected_hello)) != 0) {
|
||||
syslog(LOG_CRIT, "Failed to read header magic from client");
|
||||
return -1;
|
||||
}
|
||||
if (really_read(fd, (uint8_t*) &ci->version, sizeof(ci->version)) == -1){
|
||||
syslog(LOG_CRIT, "Failed to read header version from client");
|
||||
return -1;
|
||||
}
|
||||
if (really_read(fd, (uint8_t*) &ci->commit[0], sizeof(ci->commit)) == -1){
|
||||
syslog(LOG_CRIT, "Failed to read header hash from client");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
char *print_init_message(struct init_message *m)
|
||||
{
|
||||
char tmp[41];
|
||||
|
||||
memcpy(&tmp[0], &m->commit[0], 40);
|
||||
tmp[40] = '\000';
|
||||
char *buffer;
|
||||
int n;
|
||||
|
||||
buffer = malloc(80);
|
||||
if (!buffer)
|
||||
return NULL;
|
||||
|
||||
n = snprintf(buffer, 80, "version %d, commit %s", m->version, tmp);
|
||||
if (n < 0) {
|
||||
perror("Failed to format init_message");
|
||||
exit(1);
|
||||
}
|
||||
return buffer;
|
||||
}
|
||||
|
||||
int write_init_message(int fd, struct init_message *ci) {
|
||||
if (really_write(fd, (uint8_t*) &ci->hello[0], sizeof(ci->hello)) == -1){
|
||||
syslog(LOG_CRIT, "Failed to write hello to client");
|
||||
return -1;
|
||||
}
|
||||
if (ci->version > 0) {
|
||||
if (really_write(fd, (uint8_t*) &ci->version, sizeof(ci->version)) == -1){
|
||||
syslog(LOG_CRIT, "Failed to write version to client");
|
||||
return -1;
|
||||
}
|
||||
if (really_write(fd, (uint8_t*) &ci->commit[0], sizeof(ci->commit)) == -1){
|
||||
syslog(LOG_CRIT, "Failed to write header hash to client");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
int read_init_message(int fd, struct init_message *ci)
|
||||
{
|
||||
int res;
|
||||
|
||||
bzero(ci, sizeof(struct init_message));
|
||||
|
||||
res = really_read(fd, (uint8_t *)&ci->hello[0], sizeof(ci->hello));
|
||||
if (res == -1) {
|
||||
syslog(LOG_CRIT, "Failed to read hello from client");
|
||||
return -1;
|
||||
}
|
||||
|
||||
res = memcmp(&ci->hello[0],
|
||||
&expected_hello_old[0], sizeof(expected_hello_old));
|
||||
if (res == 0) {
|
||||
ci->version = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
res = memcmp(&ci->hello[0],
|
||||
&expected_hello[0], sizeof(expected_hello));
|
||||
if (res != 0) {
|
||||
syslog(LOG_CRIT, "Failed to read header magic from client");
|
||||
return -1;
|
||||
}
|
||||
|
||||
res = really_read(fd, (uint8_t *)&ci->version, sizeof(ci->version));
|
||||
if (res == -1) {
|
||||
syslog(LOG_CRIT, "Failed to read header version from client");
|
||||
return -1;
|
||||
}
|
||||
|
||||
res = really_read(fd, (uint8_t *)&ci->commit[0], sizeof(ci->commit));
|
||||
if (res == -1) {
|
||||
syslog(LOG_CRIT, "Failed to read header hash from client");
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int read_vif_info(int fd, struct vif_info *vif) {
|
||||
uint8_t buffer[10];
|
||||
if (really_read(fd, &buffer[0], sizeof(buffer)) == -1){
|
||||
syslog(LOG_CRIT, "Failed to read vif info from client");
|
||||
return -1;
|
||||
}
|
||||
vif->mtu = (size_t) (buffer[0] | (buffer[1] << 8));
|
||||
vif->max_packet_size = (size_t) (buffer[2] | (buffer[3] << 8));
|
||||
memcpy(vif->mac, &buffer[4], 6);
|
||||
return 0;
|
||||
int write_init_message(int fd, struct init_message *ci)
|
||||
{
|
||||
int res;
|
||||
|
||||
res = really_write(fd, (uint8_t *)&ci->hello[0], sizeof(ci->hello));
|
||||
if (res == -1) {
|
||||
syslog(LOG_CRIT, "Failed to write hello to client");
|
||||
return -1;
|
||||
}
|
||||
if (ci->version > 0) {
|
||||
res = really_write(fd, (uint8_t *)&ci->version,
|
||||
sizeof(ci->version));
|
||||
if (res == -1) {
|
||||
syslog(LOG_CRIT, "Failed to write version to client");
|
||||
return -1;
|
||||
}
|
||||
res = really_write(fd, (uint8_t *)&ci->commit[0],
|
||||
sizeof(ci->commit));
|
||||
if (res == -1) {
|
||||
syslog(LOG_CRIT,
|
||||
"Failed to write header hash to client");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int read_vif_info(int fd, struct vif_info *vif)
|
||||
{
|
||||
uint8_t buffer[10];
|
||||
|
||||
if (really_read(fd, &buffer[0], sizeof(buffer)) == -1) {
|
||||
syslog(LOG_CRIT, "Failed to read vif info from client");
|
||||
return -1;
|
||||
}
|
||||
|
||||
vif->mtu = (size_t)(buffer[0] | (buffer[1] << 8));
|
||||
vif->max_packet_size = (size_t)(buffer[2] | (buffer[3] << 8));
|
||||
memcpy(vif->mac, &buffer[4], 6);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int write_vif_info(int fd, struct vif_info *vif) {
|
||||
uint8_t buffer[10];
|
||||
buffer[0] = (uint8_t) ((vif->mtu >> 0) & 0xff);
|
||||
buffer[1] = (uint8_t) ((vif->mtu >> 8) & 0xff);
|
||||
buffer[2] = (uint8_t) ((vif->max_packet_size >> 0) & 0xff);
|
||||
buffer[3] = (uint8_t) ((vif->max_packet_size >> 8) & 0xff);
|
||||
memcpy(&buffer[0] + 4, &(vif->mac)[0], 6);
|
||||
if (really_write(fd, &buffer[0], sizeof(buffer)) == -1){
|
||||
syslog(LOG_CRIT, "Failed to write vif into to client");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
int write_vif_info(int fd, struct vif_info *vif)
|
||||
{
|
||||
uint8_t buffer[10];
|
||||
|
||||
buffer[0] = (uint8_t) ((vif->mtu >> 0) & 0xff);
|
||||
buffer[1] = (uint8_t) ((vif->mtu >> 8) & 0xff);
|
||||
buffer[2] = (uint8_t) ((vif->max_packet_size >> 0) & 0xff);
|
||||
buffer[3] = (uint8_t) ((vif->max_packet_size >> 8) & 0xff);
|
||||
memcpy(&buffer[0] + 4, &(vif->mac)[0], 6);
|
||||
|
||||
if (really_write(fd, &buffer[0], sizeof(buffer)) == -1) {
|
||||
syslog(LOG_CRIT, "Failed to write vif into to client");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int write_command(int fd, enum command *c) {
|
||||
uint8_t command = *c;
|
||||
if (really_write(fd, (uint8_t*) &command, sizeof(command)) == -1){
|
||||
syslog(LOG_CRIT, "Failed to write command to client");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
int write_command(int fd, enum command *c)
|
||||
{
|
||||
uint8_t command = *c;
|
||||
|
||||
if (really_write(fd, (uint8_t *)&command, sizeof(command)) == -1) {
|
||||
syslog(LOG_CRIT, "Failed to write command to client");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int write_ethernet_args(int fd, struct ethernet_args *args){
|
||||
if (really_write(fd, (uint8_t*) &args->uuid_string[0], 36) == -1){
|
||||
syslog(LOG_CRIT, "Failed to write ethernet args to client");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
int write_ethernet_args(int fd, struct ethernet_args *args)
|
||||
{
|
||||
if (really_write(fd, (uint8_t *)&args->uuid_string[0], 36) == -1) {
|
||||
syslog(LOG_CRIT, "Failed to write ethernet args to client");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@ -7,14 +7,17 @@
|
||||
/* Client -> Server init_message */
|
||||
/* Server -> Client init_message */
|
||||
struct init_message {
|
||||
char hello[5];
|
||||
uint8_t _padding[3];
|
||||
uint32_t version;
|
||||
char commit[40]; /* git sha of the compiled commit */
|
||||
char hello[5];
|
||||
uint8_t _padding[3];
|
||||
uint32_t version;
|
||||
char commit[40]; /* git sha of the compiled commit */
|
||||
};
|
||||
|
||||
/* This should be bumped whenever we add something (like a feature or a bugfix)
|
||||
and we wish the UI to be able to detect when to trigger a reinstall. */
|
||||
/*
|
||||
* This should be bumped whenever we add something (like a feature or a
|
||||
* bugfix) and we wish the UI to be able to detect when to trigger a
|
||||
* reinstall.
|
||||
*/
|
||||
#define CURRENT_VERSION 13
|
||||
|
||||
extern struct init_message *create_init_message(void);
|
||||
@ -24,24 +27,24 @@ extern char *print_init_message(struct init_message *m);
|
||||
|
||||
/* Client -> Server command */
|
||||
enum command {
|
||||
ethernet = 1,
|
||||
ethernet = 1,
|
||||
};
|
||||
|
||||
extern int write_command(int fd, enum command *c);
|
||||
|
||||
/* Client -> Server command arguments */
|
||||
struct ethernet_args {
|
||||
char uuid_string[36];
|
||||
char uuid_string[36];
|
||||
};
|
||||
|
||||
extern int write_ethernet_args(int fd, struct ethernet_args *args);
|
||||
|
||||
/* Server -> Client: details of a vif */
|
||||
struct vif_info {
|
||||
uint8_t mac[6];
|
||||
short _padding;
|
||||
size_t max_packet_size;
|
||||
size_t mtu;
|
||||
uint8_t mac[6];
|
||||
short _padding;
|
||||
size_t max_packet_size;
|
||||
size_t mtu;
|
||||
};
|
||||
|
||||
extern int read_vif_info(int fd, struct vif_info *vif);
|
||||
|
@ -1,6 +1,3 @@
|
||||
/*
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@ -25,421 +22,470 @@
|
||||
#include <sys/wait.h>
|
||||
#include <ifaddrs.h>
|
||||
|
||||
|
||||
#include "hvsock.h"
|
||||
#include "protocol.h"
|
||||
|
||||
int daemon_flag = 0;
|
||||
int listen_flag = 0;
|
||||
int connect_flag = 0;
|
||||
int daemon_flag;
|
||||
int listen_flag;
|
||||
int connect_flag;
|
||||
|
||||
char *default_sid = "30D48B34-7D27-4B0B-AAAF-BBBED334DD59";
|
||||
|
||||
void fatal(const char *msg)
|
||||
{
|
||||
syslog(LOG_CRIT, "%s Error: %d. %s", msg, errno, strerror(errno));
|
||||
exit(1);
|
||||
syslog(LOG_CRIT, "%s Error: %d. %s", msg, errno, strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
|
||||
int alloc_tap(const char *dev) {
|
||||
int fd;
|
||||
struct ifreq ifr;
|
||||
const char *clonedev = "/dev/net/tun";
|
||||
if ((fd = open(clonedev, O_RDWR)) == -1) {
|
||||
fatal("Failed to open /dev/net/tun");
|
||||
}
|
||||
memset(&ifr, 0, sizeof(ifr));
|
||||
ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
|
||||
strncpy(ifr.ifr_name, dev, IFNAMSIZ);
|
||||
if (ioctl(fd, TUNSETIFF, (void*) &ifr) < 0) {
|
||||
fatal("TUNSETIFF failed");
|
||||
}
|
||||
int persist = 1;
|
||||
if (ioctl(fd, TUNSETPERSIST, persist) < 0) {
|
||||
fatal("TUNSETPERSIST failed");
|
||||
}
|
||||
syslog(LOG_INFO, "successfully created TAP device %s", dev);
|
||||
return fd;
|
||||
int alloc_tap(const char *dev)
|
||||
{
|
||||
const char *clonedev = "/dev/net/tun";
|
||||
struct ifreq ifr;
|
||||
int persist = 1;
|
||||
int fd;
|
||||
|
||||
fd = open(clonedev, O_RDWR);
|
||||
if (fd == -1)
|
||||
fatal("Failed to open /dev/net/tun");
|
||||
|
||||
memset(&ifr, 0, sizeof(ifr));
|
||||
ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
|
||||
strncpy(ifr.ifr_name, dev, IFNAMSIZ);
|
||||
if (ioctl(fd, TUNSETIFF, (void *)&ifr) < 0)
|
||||
fatal("TUNSETIFF failed");
|
||||
|
||||
if (ioctl(fd, TUNSETPERSIST, persist) < 0)
|
||||
fatal("TUNSETPERSIST failed");
|
||||
|
||||
syslog(LOG_INFO, "successfully created TAP device %s", dev);
|
||||
return fd;
|
||||
}
|
||||
|
||||
void set_macaddr(const char *dev, uint8_t *mac) {
|
||||
int fd;
|
||||
struct ifreq ifq;
|
||||
void set_macaddr(const char *dev, uint8_t *mac)
|
||||
{
|
||||
struct ifreq ifq;
|
||||
int fd;
|
||||
|
||||
fd = socket(PF_INET, SOCK_DGRAM, 0);
|
||||
strcpy(ifq.ifr_name, dev);
|
||||
memcpy(&ifq.ifr_hwaddr.sa_data[0], mac, 6);
|
||||
ifq.ifr_hwaddr.sa_family = ARPHRD_ETHER;
|
||||
fd = socket(PF_INET, SOCK_DGRAM, 0);
|
||||
if (fd == -1)
|
||||
fatal("Could not get socket to set MAC address");
|
||||
strcpy(ifq.ifr_name, dev);
|
||||
memcpy(&ifq.ifr_hwaddr.sa_data[0], mac, 6);
|
||||
ifq.ifr_hwaddr.sa_family = ARPHRD_ETHER;
|
||||
|
||||
if (ioctl(fd, SIOCSIFHWADDR, &ifq) == -1) {
|
||||
fatal("SIOCSIFHWADDR failed");
|
||||
}
|
||||
if (ioctl(fd, SIOCSIFHWADDR, &ifq) == -1)
|
||||
fatal("SIOCSIFHWADDR failed");
|
||||
|
||||
close(fd);
|
||||
close(fd);
|
||||
}
|
||||
|
||||
/* Negotiate a vmnet connection, returns 0 on success and 1 on error. */
|
||||
int negotiate(int fd, struct vif_info *vif)
|
||||
{
|
||||
/* Negotiate with com.docker.slirp */
|
||||
struct init_message *me = create_init_message();
|
||||
if (write_init_message(fd, me) == -1) {
|
||||
goto err;
|
||||
}
|
||||
struct init_message you;
|
||||
if (read_init_message(fd, &you) == -1) {
|
||||
goto err;
|
||||
}
|
||||
char *txt = print_init_message(&you);
|
||||
syslog(LOG_INFO, "Server reports %s", txt);
|
||||
free(txt);
|
||||
enum command command = ethernet;
|
||||
if (write_command(fd, &command) == -1) {
|
||||
goto err;
|
||||
}
|
||||
struct ethernet_args args;
|
||||
/* We don't need a uuid */
|
||||
memset(&args.uuid_string[0], 0, sizeof(args.uuid_string));
|
||||
if (write_ethernet_args(fd, &args) == -1) {
|
||||
goto err;
|
||||
}
|
||||
if (read_vif_info(fd, vif) == -1) {
|
||||
goto err;
|
||||
}
|
||||
return 0;
|
||||
enum command command = ethernet;
|
||||
struct init_message *me;
|
||||
struct ethernet_args args;
|
||||
struct init_message you;
|
||||
char *txt;
|
||||
|
||||
me = create_init_message();
|
||||
if (!me)
|
||||
goto err;
|
||||
|
||||
if (write_init_message(fd, me) == -1)
|
||||
goto err;
|
||||
|
||||
if (read_init_message(fd, &you) == -1)
|
||||
goto err;
|
||||
|
||||
txt = print_init_message(&you);
|
||||
if (!txt)
|
||||
goto err;
|
||||
|
||||
syslog(LOG_INFO, "Server reports %s", txt);
|
||||
free(txt);
|
||||
|
||||
if (write_command(fd, &command) == -1)
|
||||
goto err;
|
||||
|
||||
/* We don't need a uuid */
|
||||
memset(&args.uuid_string[0], 0, sizeof(args.uuid_string));
|
||||
if (write_ethernet_args(fd, &args) == -1)
|
||||
goto err;
|
||||
|
||||
if (read_vif_info(fd, vif) == -1)
|
||||
goto err;
|
||||
|
||||
return 0;
|
||||
err:
|
||||
syslog(LOG_CRIT, "Failed to negotiate vmnet connection");
|
||||
return 1;
|
||||
syslog(LOG_CRIT, "Failed to negotiate vmnet connection");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
/* Argument passed to proxy threads */
|
||||
struct connection {
|
||||
int fd; /* Hyper-V socket with vmnet protocol */
|
||||
int tapfd; /* TAP device with ethernet frames */
|
||||
struct vif_info vif; /* Contains VIF MAC, MTU etc, received from server */
|
||||
int fd; /* Hyper-V socket with vmnet protocol */
|
||||
int tapfd; /* TAP device with ethernet frames */
|
||||
struct vif_info vif; /* Contains MAC, MTU etc, received from server */
|
||||
};
|
||||
|
||||
static void* vmnet_to_tap(void *arg)
|
||||
static void *vmnet_to_tap(void *arg)
|
||||
{
|
||||
int length, n;
|
||||
struct connection *connection = (struct connection*) arg;
|
||||
uint8_t header[2];
|
||||
uint8_t buffer[2048];
|
||||
struct connection *connection = (struct connection *)arg;
|
||||
uint8_t buffer[2048];
|
||||
uint8_t header[2];
|
||||
int length, n;
|
||||
|
||||
for (;;) {
|
||||
if (really_read(connection->fd, &header[0], 2) == -1){
|
||||
fatal("Failed to read a packet header from host");
|
||||
}
|
||||
length = (header[0] & 0xff) | ((header[1] & 0xff) << 8);
|
||||
if (length > sizeof(buffer)) {
|
||||
syslog(LOG_CRIT, "Received an over-large packet: %d > %ld", length, sizeof(buffer));
|
||||
exit(1);
|
||||
}
|
||||
if (really_read(connection->fd, &buffer[0], length) == -1){
|
||||
syslog(LOG_CRIT, "Failed to read packet contents from host");
|
||||
exit(1);
|
||||
}
|
||||
n = write(connection->tapfd, &buffer[0], length);
|
||||
if (n != length) {
|
||||
syslog(LOG_CRIT, "Failed to write %d bytes to tap device (wrote %d)", length, n);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
for (;;) {
|
||||
if (really_read(connection->fd, &header[0], 2) == -1)
|
||||
fatal("Failed to read a packet header from host");
|
||||
|
||||
length = (header[0] & 0xff) | ((header[1] & 0xff) << 8);
|
||||
if (length > sizeof(buffer)) {
|
||||
syslog(LOG_CRIT,
|
||||
"Received an over-large packet: %d > %ld",
|
||||
length, sizeof(buffer));
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (really_read(connection->fd, &buffer[0], length) == -1) {
|
||||
syslog(LOG_CRIT,
|
||||
"Failed to read packet contents from host");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
n = write(connection->tapfd, &buffer[0], length);
|
||||
if (n != length) {
|
||||
syslog(LOG_CRIT,
|
||||
"Failed to write %d bytes to tap device (wrote %d)", length, n);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void* tap_to_vmnet(void *arg)
|
||||
static void *tap_to_vmnet(void *arg)
|
||||
{
|
||||
int length;
|
||||
struct connection *connection = (struct connection*) arg;
|
||||
uint8_t header[2];
|
||||
uint8_t buffer[2048];
|
||||
struct connection *connection = (struct connection *)arg;
|
||||
uint8_t buffer[2048];
|
||||
uint8_t header[2];
|
||||
int length;
|
||||
|
||||
for (;;) {
|
||||
length = read(connection->tapfd, &buffer[0], sizeof(buffer));
|
||||
if (length == -1) {
|
||||
if (errno == ENXIO) {
|
||||
fatal("tap device has gone down");
|
||||
}
|
||||
syslog(LOG_WARNING, "ignoring error %d", errno);
|
||||
/* This is what mirage-net-unix does. Is it a good idea really? */
|
||||
continue;
|
||||
}
|
||||
header[0] = (length >> 0) & 0xff;
|
||||
header[1] = (length >> 8) & 0xff;
|
||||
if (really_write(connection->fd, &header[0], 2) == -1){
|
||||
fatal("Failed to write packet header");
|
||||
}
|
||||
if (really_write(connection->fd, &buffer[0], length) == -1) {
|
||||
fatal("Failed to write packet body");
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
for (;;) {
|
||||
length = read(connection->tapfd, &buffer[0], sizeof(buffer));
|
||||
if (length == -1) {
|
||||
if (errno == ENXIO)
|
||||
fatal("tap device has gone down");
|
||||
|
||||
syslog(LOG_WARNING, "ignoring error %d", errno);
|
||||
/*
|
||||
* This is what mirage-net-unix does. Is it a good
|
||||
* idea really?
|
||||
*/
|
||||
continue;
|
||||
}
|
||||
|
||||
header[0] = (length >> 0) & 0xff;
|
||||
header[1] = (length >> 8) & 0xff;
|
||||
if (really_write(connection->fd, &header[0], 2) == -1)
|
||||
fatal("Failed to write packet header");
|
||||
|
||||
if (really_write(connection->fd, &buffer[0], length) == -1)
|
||||
fatal("Failed to write packet body");
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Handle a connection by exchanging ethernet frames forever.
|
||||
/*
|
||||
* Handle a connection by exchanging ethernet frames forever.
|
||||
*/
|
||||
static void handle(struct connection *connection)
|
||||
{
|
||||
pthread_t v2t, t2v;
|
||||
pthread_t v2t, t2v;
|
||||
|
||||
if (pthread_create(&v2t, NULL, vmnet_to_tap, connection) != 0){
|
||||
fatal("Failed to create the vmnet_to_tap thread");
|
||||
}
|
||||
if (pthread_create(&t2v, NULL, tap_to_vmnet, connection) != 0){
|
||||
fatal("Failed to create the tap_to_vmnet thread");
|
||||
}
|
||||
if (pthread_join(v2t, NULL) != 0){
|
||||
fatal("Failed to join the vmnet_to_tap thread");
|
||||
}
|
||||
if (pthread_join(t2v, NULL) != 0){
|
||||
fatal("Failed to join the tap_to_vmnet thread");
|
||||
}
|
||||
if (pthread_create(&v2t, NULL, vmnet_to_tap, connection) != 0)
|
||||
fatal("Failed to create the vmnet_to_tap thread");
|
||||
|
||||
if (pthread_create(&t2v, NULL, tap_to_vmnet, connection) != 0)
|
||||
fatal("Failed to create the tap_to_vmnet thread");
|
||||
|
||||
if (pthread_join(v2t, NULL) != 0)
|
||||
fatal("Failed to join the vmnet_to_tap thread");
|
||||
|
||||
if (pthread_join(t2v, NULL) != 0)
|
||||
fatal("Failed to join the tap_to_vmnet thread");
|
||||
}
|
||||
|
||||
static int create_listening_socket(GUID serviceid) {
|
||||
int lsock = -1;
|
||||
SOCKADDR_HV sa;
|
||||
int res;
|
||||
static int create_listening_socket(GUID serviceid)
|
||||
{
|
||||
SOCKADDR_HV sa;
|
||||
int lsock;
|
||||
int res;
|
||||
|
||||
lsock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW);
|
||||
if (lsock == -1) {
|
||||
fatal("socket()");
|
||||
}
|
||||
lsock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW);
|
||||
if (lsock == -1)
|
||||
fatal("socket()");
|
||||
|
||||
sa.Family = AF_HYPERV;
|
||||
sa.Reserved = 0;
|
||||
sa.VmId = HV_GUID_WILDCARD;
|
||||
sa.ServiceId = serviceid;
|
||||
sa.Family = AF_HYPERV;
|
||||
sa.Reserved = 0;
|
||||
sa.VmId = HV_GUID_WILDCARD;
|
||||
sa.ServiceId = serviceid;
|
||||
|
||||
res = bind(lsock, (const struct sockaddr *)&sa, sizeof(sa));
|
||||
if (res == -1) {
|
||||
fatal("bind()");
|
||||
}
|
||||
res = bind(lsock, (const struct sockaddr *)&sa, sizeof(sa));
|
||||
if (res == -1)
|
||||
fatal("bind()");
|
||||
|
||||
res = listen(lsock, SOMAXCONN);
|
||||
if (res == -1) {
|
||||
fatal("listen()");
|
||||
}
|
||||
return lsock;
|
||||
res = listen(lsock, SOMAXCONN);
|
||||
if (res == -1)
|
||||
fatal("listen()");
|
||||
|
||||
return lsock;
|
||||
}
|
||||
|
||||
static int connect_socket(GUID serviceid) {
|
||||
int sock = -1;
|
||||
SOCKADDR_HV sa;
|
||||
int res;
|
||||
static int connect_socket(GUID serviceid)
|
||||
{
|
||||
SOCKADDR_HV sa;
|
||||
int sock;
|
||||
int res;
|
||||
|
||||
sock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW);
|
||||
if (sock == -1) {
|
||||
fatal("socket()");
|
||||
}
|
||||
sock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW);
|
||||
if (sock == -1)
|
||||
fatal("socket()");
|
||||
|
||||
sa.Family = AF_HYPERV;
|
||||
sa.Reserved = 0;
|
||||
sa.VmId = HV_GUID_PARENT;
|
||||
sa.ServiceId = serviceid;
|
||||
sa.Family = AF_HYPERV;
|
||||
sa.Reserved = 0;
|
||||
sa.VmId = HV_GUID_PARENT;
|
||||
sa.ServiceId = serviceid;
|
||||
|
||||
res = connect(sock, (const struct sockaddr *)&sa, sizeof(sa));
|
||||
if (res == -1) {
|
||||
fatal("connect()");
|
||||
}
|
||||
res = connect(sock, (const struct sockaddr *)&sa, sizeof(sa));
|
||||
if (res == -1)
|
||||
fatal("connect()");
|
||||
|
||||
return sock;
|
||||
return sock;
|
||||
}
|
||||
|
||||
static int accept_socket(int lsock) {
|
||||
int csock = -1;
|
||||
SOCKADDR_HV sac;
|
||||
socklen_t socklen = sizeof(sac);
|
||||
static int accept_socket(int lsock)
|
||||
{
|
||||
SOCKADDR_HV sac;
|
||||
socklen_t socklen = sizeof(sac);
|
||||
int csock;
|
||||
|
||||
csock = accept(lsock, (struct sockaddr *)&sac, &socklen);
|
||||
if (csock == -1) {
|
||||
fatal("accept()");
|
||||
}
|
||||
csock = accept(lsock, (struct sockaddr *)&sac, &socklen);
|
||||
if (csock == -1)
|
||||
fatal("accept()");
|
||||
|
||||
syslog(LOG_INFO, "Connect from: "GUID_FMT":"GUID_FMT"\n",
|
||||
GUID_ARGS(sac.VmId), GUID_ARGS(sac.ServiceId));
|
||||
return csock;
|
||||
syslog(LOG_INFO, "Connect from: " GUID_FMT ":" GUID_FMT "\n",
|
||||
GUID_ARGS(sac.VmId), GUID_ARGS(sac.ServiceId));
|
||||
|
||||
return csock;
|
||||
}
|
||||
|
||||
void write_pidfile(const char *pidfile) {
|
||||
pid_t pid = getpid();
|
||||
char * pid_s;
|
||||
FILE *file;
|
||||
int len;
|
||||
void write_pidfile(const char *pidfile)
|
||||
{
|
||||
pid_t pid = getpid();
|
||||
char *pid_s;
|
||||
FILE *file;
|
||||
int len;
|
||||
|
||||
if (asprintf(&pid_s, "%lld", (long long) pid) == -1) {
|
||||
fatal("Failed to allocate pidfile string");
|
||||
}
|
||||
len = strlen(pid_s);
|
||||
file = fopen(pidfile, "w");
|
||||
if (file == NULL) {
|
||||
syslog(LOG_CRIT, "Failed to open pidfile %s", pidfile);
|
||||
exit(1);
|
||||
}
|
||||
if (asprintf(&pid_s, "%lld", (long long)pid) == -1)
|
||||
fatal("Failed to allocate pidfile string");
|
||||
|
||||
if (fwrite(pid_s, 1, len, file) != len) {
|
||||
fatal("Failed to write pid to pidfile");
|
||||
}
|
||||
fclose(file);
|
||||
free(pid_s);
|
||||
len = strlen(pid_s);
|
||||
file = fopen(pidfile, "w");
|
||||
if (file == NULL) {
|
||||
syslog(LOG_CRIT, "Failed to open pidfile %s", pidfile);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (fwrite(pid_s, 1, len, file) != len)
|
||||
fatal("Failed to write pid to pidfile");
|
||||
|
||||
fclose(file);
|
||||
free(pid_s);
|
||||
}
|
||||
|
||||
void daemonize(const char *pidfile){
|
||||
pid_t pid = fork ();
|
||||
if (pid == -1) {
|
||||
fatal("Failed to fork()");
|
||||
}
|
||||
else if (pid != 0)
|
||||
exit(0);
|
||||
if (setsid () == -1) {
|
||||
fatal("Failed to setsid()");
|
||||
}
|
||||
if (chdir ("/") == -1) {
|
||||
fatal("Failed to chdir()");
|
||||
}
|
||||
int null = open("/dev/null", O_RDWR);
|
||||
dup2(null, STDIN_FILENO);
|
||||
dup2(null, STDOUT_FILENO);
|
||||
dup2(null, STDERR_FILENO);
|
||||
close(null);
|
||||
if (pidfile) write_pidfile(pidfile);
|
||||
void daemonize(const char *pidfile)
|
||||
{
|
||||
pid_t pid;
|
||||
int null;
|
||||
|
||||
pid = fork();
|
||||
if (pid == -1)
|
||||
fatal("Failed to fork()");
|
||||
else if (pid != 0)
|
||||
exit(0);
|
||||
|
||||
if (setsid() == -1)
|
||||
fatal("Failed to setsid()");
|
||||
|
||||
if (chdir("/") == -1)
|
||||
fatal("Failed to chdir()");
|
||||
|
||||
null = open("/dev/null", O_RDWR);
|
||||
if (null == -1)
|
||||
fatal("Failed to open /dev/null");
|
||||
dup2(null, STDIN_FILENO);
|
||||
dup2(null, STDOUT_FILENO);
|
||||
dup2(null, STDERR_FILENO);
|
||||
close(null);
|
||||
|
||||
if (pidfile)
|
||||
write_pidfile(pidfile);
|
||||
}
|
||||
|
||||
void usage(char *name)
|
||||
{
|
||||
printf("%s usage:\n", name);
|
||||
printf("\t[--daemon] [--tap <name>] [--serviceid <guid>] [--pid <file>]\n");
|
||||
printf("\t[--listen | --connect]\n\n");
|
||||
printf("where\n");
|
||||
printf("\t--daemonize: run as a background daemon\n");
|
||||
printf("\t--tap <name>: create a tap device with the given name\n");
|
||||
printf("\t (defaults to eth1)\n");
|
||||
printf("\t--serviceid <guid>: use <guid> as the well-known service GUID\n");
|
||||
printf("\t (defaults to %s)\n", default_sid);
|
||||
printf("\t--pid <file>: write a pid to the given file\n");
|
||||
printf("\t--listen: listen forever for incoming AF_HVSOCK connections\n");
|
||||
printf("\t--connect: connect to the parent partition\n");
|
||||
printf("%s usage:\n", name);
|
||||
printf("\t[--daemon] [--tap <name>] [--serviceid <guid>] [--pid <file>]\n");
|
||||
printf("\t[--listen | --connect]\n\n");
|
||||
printf("where\n");
|
||||
printf("\t--daemonize: run as a background daemon\n");
|
||||
printf("\t--tap <name>: create a tap device with the given name\n");
|
||||
printf("\t (defaults to eth1)\n");
|
||||
printf("\t--serviceid <guid>: use <guid> as the well-known service GUID\n");
|
||||
printf("\t (defaults to %s)\n", default_sid);
|
||||
printf("\t--pid <file>: write a pid to the given file\n");
|
||||
printf("\t--listen: listen forever for incoming AF_HVSOCK connections\n");
|
||||
printf("\t--connect: connect to the parent partition\n");
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int res = 0;
|
||||
GUID sid;
|
||||
int c;
|
||||
/* Defaults to a testing GUID */
|
||||
char *serviceid = default_sid;
|
||||
char *tap = "eth1";
|
||||
char *pidfile = NULL;
|
||||
char *serviceid = default_sid;
|
||||
struct connection connection;
|
||||
char *tap = "eth1";
|
||||
char *pidfile = NULL;
|
||||
int lsocket = -1;
|
||||
int sock = -1;
|
||||
int res = 0;
|
||||
int status;
|
||||
pid_t child;
|
||||
int tapfd;
|
||||
GUID sid;
|
||||
int c;
|
||||
|
||||
opterr = 0;
|
||||
while (1) {
|
||||
static struct option long_options[] = {
|
||||
/* These options set a flag. */
|
||||
{"daemon", no_argument, &daemon_flag, 1},
|
||||
{"serviceid", required_argument, NULL, 's'},
|
||||
{"tap", required_argument, NULL, 't'},
|
||||
{"pidfile", required_argument, NULL, 'p'},
|
||||
{"listen", no_argument, &listen_flag, 1},
|
||||
{"connect", no_argument, &connect_flag, 1},
|
||||
{0, 0, 0, 0}
|
||||
};
|
||||
int option_index = 0;
|
||||
int option_index;
|
||||
int log_flags = LOG_CONS | LOG_NDELAY;
|
||||
static struct option long_options[] = {
|
||||
/* These options set a flag. */
|
||||
{"daemon", no_argument, &daemon_flag, 1},
|
||||
{"serviceid", required_argument, NULL, 's'},
|
||||
{"tap", required_argument, NULL, 't'},
|
||||
{"pidfile", required_argument, NULL, 'p'},
|
||||
{"listen", no_argument, &listen_flag, 1},
|
||||
{"connect", no_argument, &connect_flag, 1},
|
||||
{0, 0, 0, 0}
|
||||
};
|
||||
|
||||
c = getopt_long (argc, argv, "ds:t:p:", long_options, &option_index);
|
||||
if (c == -1) break;
|
||||
opterr = 0;
|
||||
while (1) {
|
||||
option_index = 0;
|
||||
|
||||
switch (c) {
|
||||
case 'd':
|
||||
daemon_flag = 1;
|
||||
break;
|
||||
case 's':
|
||||
serviceid = optarg;
|
||||
break;
|
||||
case 't':
|
||||
tap = optarg;
|
||||
break;
|
||||
case 'p':
|
||||
pidfile = optarg;
|
||||
break;
|
||||
case 0:
|
||||
break;
|
||||
default:
|
||||
usage (argv[0]);
|
||||
exit (1);
|
||||
}
|
||||
}
|
||||
if ((listen_flag && connect_flag) || !(listen_flag || connect_flag)){
|
||||
fprintf(stderr, "Please supply either the --listen or --connect flag, but not both.\n");
|
||||
exit(1);
|
||||
}
|
||||
if (daemon_flag && !pidfile){
|
||||
fprintf(stderr, "For daemon mode, please supply a --pidfile argument.\n");
|
||||
exit(1);
|
||||
}
|
||||
res = parseguid(serviceid, &sid);
|
||||
if (res) {
|
||||
fprintf(stderr, "Failed to parse serviceid as GUID: %s\n", serviceid);
|
||||
usage(argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
c = getopt_long(argc, argv, "ds:t:p:",
|
||||
long_options, &option_index);
|
||||
if (c == -1)
|
||||
break;
|
||||
|
||||
int log_flags = LOG_CONS | LOG_NDELAY;
|
||||
if (!daemon_flag) {
|
||||
log_flags |= LOG_PERROR;
|
||||
}
|
||||
openlog(argv[0], log_flags, LOG_DAEMON);
|
||||
switch (c) {
|
||||
case 'd':
|
||||
daemon_flag = 1;
|
||||
break;
|
||||
case 's':
|
||||
serviceid = optarg;
|
||||
break;
|
||||
case 't':
|
||||
tap = optarg;
|
||||
break;
|
||||
case 'p':
|
||||
pidfile = optarg;
|
||||
break;
|
||||
case 0:
|
||||
break;
|
||||
default:
|
||||
usage(argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
int tapfd = alloc_tap(tap);
|
||||
if ((listen_flag && connect_flag) || !(listen_flag || connect_flag)) {
|
||||
fprintf(stderr, "Please supply either the --listen or --connect flag, but not both.\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
struct connection connection;
|
||||
connection.tapfd = tapfd;
|
||||
if (daemon_flag && !pidfile) {
|
||||
fprintf(stderr, "For daemon mode, please supply a --pidfile argument.\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
int sock = -1;
|
||||
int lsocket = -1;
|
||||
if (listen_flag) {
|
||||
syslog(LOG_INFO, "starting in listening mode with serviceid=%s and tap=%s", serviceid, tap);
|
||||
lsocket = create_listening_socket(sid);
|
||||
} else {
|
||||
syslog(LOG_INFO, "starting in connect mode with serviceid=%s and tap=%s", serviceid, tap);
|
||||
}
|
||||
res = parseguid(serviceid, &sid);
|
||||
if (res) {
|
||||
fprintf(stderr, "Failed to parse serviceid as GUID: %s\n", serviceid);
|
||||
usage(argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
if (sock != -1) {
|
||||
close(sock);
|
||||
sock = -1;
|
||||
}
|
||||
if (listen_flag) {
|
||||
sock = accept_socket(lsocket);
|
||||
} else {
|
||||
sock = connect_socket(sid);
|
||||
}
|
||||
if (!daemon_flag)
|
||||
log_flags |= LOG_PERROR;
|
||||
|
||||
connection.fd = sock;
|
||||
if (negotiate(sock, &connection.vif) != 0) {
|
||||
sleep(1);
|
||||
continue;
|
||||
}
|
||||
syslog(LOG_INFO, "VMNET VIF has MAC %02x:%02x:%02x:%02x:%02x:%02x",
|
||||
connection.vif.mac[0], connection.vif.mac[1], connection.vif.mac[2],
|
||||
connection.vif.mac[3], connection.vif.mac[4], connection.vif.mac[5]
|
||||
);
|
||||
set_macaddr(tap, &connection.vif.mac[0]);
|
||||
openlog(argv[0], log_flags, LOG_DAEMON);
|
||||
|
||||
/* Daemonize after we've made our first reliable connection */
|
||||
if (daemon_flag) {
|
||||
daemon_flag = 0;
|
||||
daemonize(pidfile);
|
||||
}
|
||||
/* Run the multithreaded part in a subprocess. On error the process will
|
||||
exit() which tears down all the threads */
|
||||
pid_t child = fork();
|
||||
if (child == 0) {
|
||||
handle(&connection);
|
||||
/* should never happen but just in case of a logic bug in handle */
|
||||
exit(1);
|
||||
}
|
||||
int status;
|
||||
while (waitpid(child, &status, 0) == -1) { }
|
||||
}
|
||||
tapfd = alloc_tap(tap);
|
||||
connection.tapfd = tapfd;
|
||||
|
||||
if (listen_flag) {
|
||||
syslog(LOG_INFO, "starting in listening mode with serviceid=%s and tap=%s", serviceid, tap);
|
||||
lsocket = create_listening_socket(sid);
|
||||
} else {
|
||||
syslog(LOG_INFO, "starting in connect mode with serviceid=%s and tap=%s", serviceid, tap);
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
if (sock != -1) {
|
||||
close(sock);
|
||||
sock = -1;
|
||||
}
|
||||
|
||||
if (listen_flag)
|
||||
sock = accept_socket(lsocket);
|
||||
else
|
||||
sock = connect_socket(sid);
|
||||
|
||||
connection.fd = sock;
|
||||
if (negotiate(sock, &connection.vif) != 0) {
|
||||
sleep(1);
|
||||
continue;
|
||||
}
|
||||
|
||||
syslog(LOG_INFO, "VMNET VIF has MAC %02x:%02x:%02x:%02x:%02x:%02x",
|
||||
connection.vif.mac[0], connection.vif.mac[1], connection.vif.mac[2],
|
||||
connection.vif.mac[3], connection.vif.mac[4], connection.vif.mac[5]
|
||||
);
|
||||
set_macaddr(tap, &connection.vif.mac[0]);
|
||||
|
||||
/* Daemonize after we've made our first reliable connection */
|
||||
if (daemon_flag) {
|
||||
daemon_flag = 0;
|
||||
daemonize(pidfile);
|
||||
}
|
||||
|
||||
/*
|
||||
* Run the multithreaded part in a subprocess. On error the
|
||||
* process will exit() which tears down all the threads
|
||||
*/
|
||||
child = fork();
|
||||
if (child == 0) {
|
||||
handle(&connection);
|
||||
/*
|
||||
* should never happen but just in case of a logic
|
||||
* bug in handle
|
||||
*/
|
||||
exit(1);
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
if (waitpid(child, &status, 0) != -1)
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,37 +1,9 @@
|
||||
#ifndef _TRANSFUSED_H_
|
||||
#define _TRANSFUSED_H_
|
||||
|
||||
#include <pthread.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
typedef struct {
|
||||
char * server;
|
||||
char * socket;
|
||||
char * fusermount;
|
||||
char * pidfile;
|
||||
char * logfile;
|
||||
int logfile_fd;
|
||||
int ctl_sock;
|
||||
int data_sock;
|
||||
pthread_mutex_t ctl_lock;
|
||||
} parameters;
|
||||
|
||||
typedef struct {
|
||||
parameters * params;
|
||||
char * type_descr;
|
||||
char * mount_point;
|
||||
struct sockaddr sa_client;
|
||||
socklen_t socklen_client;
|
||||
int sock;
|
||||
} connection_t;
|
||||
|
||||
pthread_attr_t detached;
|
||||
|
||||
void * must_malloc(char *const descr, size_t size);
|
||||
|
||||
void lock(char *const descr, pthread_mutex_t * mutex);
|
||||
|
||||
void unlock(char *const descr, pthread_mutex_t * mutex);
|
||||
|
||||
void write_exactly(char * descr, int fd, void * buf, size_t nbyte);
|
||||
|
||||
#define IN_BUFSZ ((1 << 20) + 16)
|
||||
#define OUT_BUFSZ ((1 << 20) + 64)
|
||||
#define EVENT_BUFSZ 4096
|
||||
@ -49,7 +21,7 @@ void write_exactly(char * descr, int fd, void * buf, size_t nbyte);
|
||||
#define TRUNCATE_SYSCALL 4
|
||||
#define CHMOD_SYSCALL 5
|
||||
#define MKNOD_REG_SYSCALL 6
|
||||
// these could be turned into an enum probably but... C standard nausea
|
||||
/* these could be turned into an enum probably but...C standard nausea */
|
||||
|
||||
#define MOUNT_SUITABILITY_REQUEST 1
|
||||
#define EXPORT_SUITABILITY_REQUEST 2
|
||||
@ -59,3 +31,33 @@ void write_exactly(char * descr, int fd, void * buf, size_t nbyte);
|
||||
#define PONG_REPLY 3
|
||||
#define MOUNT_SUITABILITY_REPLY 4
|
||||
#define TRANSFUSE_NOTIFY_CHANNEL 5
|
||||
|
||||
typedef struct {
|
||||
char *server;
|
||||
char *socket;
|
||||
char *fusermount;
|
||||
char *pidfile;
|
||||
char *logfile;
|
||||
int logfile_fd;
|
||||
int ctl_sock;
|
||||
int data_sock;
|
||||
pthread_mutex_t ctl_lock;
|
||||
} parameters;
|
||||
|
||||
typedef struct {
|
||||
parameters *params;
|
||||
char *type_descr;
|
||||
char *mount_point;
|
||||
struct sockaddr sa_client;
|
||||
socklen_t socklen_client;
|
||||
int sock;
|
||||
} connection_t;
|
||||
|
||||
pthread_attr_t detached;
|
||||
|
||||
void *must_malloc(char *const descr, size_t size);
|
||||
void lock(char *const descr, pthread_mutex_t *mutex);
|
||||
void unlock(char *const descr, pthread_mutex_t *mutex);
|
||||
void write_exactly(char *descr, int fd, void *buf, size_t nbyte);
|
||||
|
||||
#endif /* _TRANSFUSED_H_ */
|
||||
|
@ -15,232 +15,243 @@
|
||||
#include <inttypes.h>
|
||||
|
||||
#include "transfused.h"
|
||||
#include "transfused_log.h"
|
||||
|
||||
void log_timestamp(int fd) {
|
||||
char timestamp[26];
|
||||
int msec;
|
||||
struct tm* tm_info;
|
||||
struct timeval tv;
|
||||
|
||||
gettimeofday(&tv, NULL);
|
||||
|
||||
msec = lrint(tv.tv_usec/1000.0);
|
||||
if (msec >= 1000) {
|
||||
msec -= 1000;
|
||||
tv.tv_sec++;
|
||||
}
|
||||
|
||||
tm_info = localtime(&tv.tv_sec);
|
||||
|
||||
strftime(timestamp, 26, "%Y-%m-%d %H:%M:%S", tm_info);
|
||||
dprintf(fd, "%s.%03d ", timestamp, msec);
|
||||
}
|
||||
|
||||
void die
|
||||
(int exit_code, parameters * params, const char * parg, const char * fmt, ...);
|
||||
|
||||
void vlog_sock_locked
|
||||
(int fd, uint16_t msg_type, const char * fmt, va_list args) {
|
||||
int rc, len;
|
||||
va_list targs;
|
||||
char * fill;
|
||||
|
||||
va_copy(targs, args);
|
||||
len = vsnprintf(NULL, 0, fmt, targs);
|
||||
if (len < 0) die(1, NULL, NULL, "Couldn't log due to vsnprintf failure");
|
||||
va_end(targs);
|
||||
|
||||
rc = len + 4 + 2; // 4 for length itself and 2 for message type
|
||||
write_exactly("vlog_sock_locked", fd, (uint32_t *) &rc, sizeof(uint32_t));
|
||||
write_exactly("vlog_sock_locked", fd, &msg_type, sizeof(uint16_t));
|
||||
|
||||
va_copy(targs, args);
|
||||
rc = vdprintf(fd, fmt, targs);
|
||||
if (rc < 0) die(1, NULL, "Couldn't send log message with vdprintf", "");
|
||||
va_end(targs);
|
||||
|
||||
if (rc < len) { // we didn't write the whole message :-(
|
||||
rc = len - rc;
|
||||
fill = (char *) calloc(rc, 1);
|
||||
if (fill == NULL) die(1, NULL, "vlog_sock_locked fill", "");
|
||||
write_exactly("vlog_sock_locked fill", fd, fill, rc);
|
||||
}
|
||||
}
|
||||
|
||||
void log_sock_locked(int fd, uint16_t msg_type, const char * fmt, ...) {
|
||||
va_list args;
|
||||
|
||||
va_start(args, fmt);
|
||||
|
||||
vlog_sock_locked(fd, msg_type, fmt, args);
|
||||
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
void die
|
||||
(int exit_code, parameters * params, const char * parg, const char * fmt, ...)
|
||||
void log_timestamp(int fd)
|
||||
{
|
||||
va_list argp, targs;
|
||||
int in_errno = errno;
|
||||
int fd = 0;
|
||||
char timestamp[26];
|
||||
int msec;
|
||||
struct tm *tm_info;
|
||||
struct timeval tv;
|
||||
|
||||
if (params != NULL) {
|
||||
fd = params->ctl_sock;
|
||||
lock("die ctl_lock", ¶ms->ctl_lock);
|
||||
}
|
||||
gettimeofday(&tv, NULL);
|
||||
|
||||
va_start(argp, fmt);
|
||||
va_copy(targs, argp);
|
||||
vsyslog(LOG_CRIT, fmt, targs);
|
||||
va_end(targs);
|
||||
msec = lrint(tv.tv_usec / 1000.0);
|
||||
if (msec >= 1000) {
|
||||
msec -= 1000;
|
||||
tv.tv_sec++;
|
||||
}
|
||||
tm_info = localtime(&tv.tv_sec);
|
||||
|
||||
if (fd != 0) vlog_sock_locked(fd, TRANSFUSE_LOG_ERROR, fmt, argp);
|
||||
va_end(argp);
|
||||
|
||||
if (parg != NULL) {
|
||||
if (*parg != 0) {
|
||||
syslog(LOG_CRIT, "%s: %s", parg, strerror(in_errno));
|
||||
if (fd != 0)
|
||||
log_sock_locked(fd, TRANSFUSE_LOG_ERROR,
|
||||
"%s: %s", parg, strerror(in_errno));
|
||||
} else {
|
||||
syslog(LOG_CRIT, "%s", strerror(in_errno));
|
||||
if (fd != 0)
|
||||
log_sock_locked(fd, TRANSFUSE_LOG_ERROR, "%s", strerror(in_errno));
|
||||
}
|
||||
}
|
||||
|
||||
if (fd != 0) close(fd); // flush
|
||||
exit(exit_code);
|
||||
// Nobody else should die before we terminate everything
|
||||
unlock("die ctl_lock", ¶ms->ctl_lock);
|
||||
strftime(timestamp, 26, "%Y-%m-%d %H:%M:%S", tm_info);
|
||||
dprintf(fd, "%s.%03d ", timestamp, msec);
|
||||
}
|
||||
|
||||
void vlog_locked
|
||||
(parameters * params, uint16_t msg_type, const char * fmt, va_list args) {
|
||||
int rc;
|
||||
int fd = params->ctl_sock;
|
||||
va_list targs;
|
||||
void vlog_sock_locked(int fd, uint16_t msg_type, const char *fmt, va_list args)
|
||||
{
|
||||
int rc, len;
|
||||
va_list targs;
|
||||
char *fill;
|
||||
|
||||
if (fd != 0) vlog_sock_locked(fd, msg_type, fmt, args);
|
||||
else {
|
||||
va_copy(targs, args);
|
||||
// TODO: translate msg_type to syslog message type
|
||||
vsyslog(LOG_INFO, fmt, targs);
|
||||
va_end(targs);
|
||||
va_copy(targs, args);
|
||||
len = vsnprintf(NULL, 0, fmt, targs);
|
||||
if (len < 0)
|
||||
die(1, NULL, NULL, "Couldn't log due to vsnprintf failure");
|
||||
va_end(targs);
|
||||
|
||||
fd = params->logfile_fd;
|
||||
if (fd != 0) {
|
||||
va_copy(targs, args);
|
||||
// TODO: include message type?
|
||||
rc = vdprintf(fd, fmt, targs);
|
||||
if (rc < 0) die(1, NULL, "Couldn't write log message with vdprintf", "");
|
||||
va_end(targs);
|
||||
}
|
||||
}
|
||||
/* 4 for length itself and 2 for message type */
|
||||
rc = len + 4 + 2;
|
||||
write_exactly("vlog_sock_locked", fd,
|
||||
(uint32_t *)&rc, sizeof(uint32_t));
|
||||
write_exactly("vlog_sock_locked", fd, &msg_type, sizeof(uint16_t));
|
||||
|
||||
va_copy(targs, args);
|
||||
rc = vdprintf(fd, fmt, targs);
|
||||
if (rc < 0)
|
||||
die(1, NULL, "Couldn't send log message with vdprintf", "");
|
||||
va_end(targs);
|
||||
|
||||
if (rc < len) {
|
||||
/* we didn't write the whole message :-( */
|
||||
rc = len - rc;
|
||||
fill = (char *)calloc(rc, 1);
|
||||
if (fill == NULL)
|
||||
die(1, NULL, "vlog_sock_locked fill", "");
|
||||
write_exactly("vlog_sock_locked fill", fd, fill, rc);
|
||||
}
|
||||
}
|
||||
|
||||
void vlog_time_locked
|
||||
(parameters * params, uint16_t msg_type, const char * fmt, va_list args) {
|
||||
int fd = params->logfile_fd;
|
||||
void log_sock_locked(int fd, uint16_t msg_type, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
if (fd != 0 && params->ctl_sock == 0) log_timestamp(fd);
|
||||
vlog_locked(params, msg_type, fmt, args);
|
||||
va_start(args, fmt);
|
||||
vlog_sock_locked(fd, msg_type, fmt, args);
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
void log_time_locked
|
||||
(parameters * params, uint16_t msg_type, const char * fmt, ...) {
|
||||
va_list args;
|
||||
void die(int exit_code, parameters *params, const char *parg,
|
||||
const char *fmt, ...)
|
||||
{
|
||||
va_list argp, targs;
|
||||
int in_errno = errno;
|
||||
int fd = 0;
|
||||
|
||||
va_start(args, fmt);
|
||||
if (params != NULL) {
|
||||
fd = params->ctl_sock;
|
||||
lock("die ctl_lock", ¶ms->ctl_lock);
|
||||
}
|
||||
|
||||
vlog_time_locked(params, msg_type, fmt, args);
|
||||
va_start(argp, fmt);
|
||||
va_copy(targs, argp);
|
||||
vsyslog(LOG_CRIT, fmt, targs);
|
||||
va_end(targs);
|
||||
|
||||
va_end(args);
|
||||
if (fd != 0)
|
||||
vlog_sock_locked(fd, TRANSFUSE_LOG_ERROR, fmt, argp);
|
||||
va_end(argp);
|
||||
|
||||
if (parg != NULL) {
|
||||
if (*parg != 0) {
|
||||
syslog(LOG_CRIT, "%s: %s", parg, strerror(in_errno));
|
||||
if (fd != 0)
|
||||
log_sock_locked(fd, TRANSFUSE_LOG_ERROR,
|
||||
"%s: %s", parg, strerror(in_errno));
|
||||
} else {
|
||||
syslog(LOG_CRIT, "%s", strerror(in_errno));
|
||||
if (fd != 0)
|
||||
log_sock_locked(fd, TRANSFUSE_LOG_ERROR,
|
||||
"%s", strerror(in_errno));
|
||||
}
|
||||
}
|
||||
if (fd != 0)
|
||||
close(fd); /* flush */
|
||||
exit(exit_code);
|
||||
/* Nobody else should die before we terminate everything */
|
||||
unlock("die ctl_lock", ¶ms->ctl_lock);
|
||||
}
|
||||
|
||||
void log_time(parameters * params, const char * fmt, ...) {
|
||||
va_list args;
|
||||
void vlog_locked(parameters *params, uint16_t msg_type,
|
||||
const char *fmt, va_list args)
|
||||
{
|
||||
int rc;
|
||||
int fd = params->ctl_sock;
|
||||
va_list targs;
|
||||
|
||||
va_start(args, fmt);
|
||||
if (fd != 0) {
|
||||
vlog_sock_locked(fd, msg_type, fmt, args);
|
||||
} else {
|
||||
va_copy(targs, args);
|
||||
/* TODO: translate msg_type to syslog message type */
|
||||
vsyslog(LOG_INFO, fmt, targs);
|
||||
va_end(targs);
|
||||
|
||||
lock("log_time ctl_lock", ¶ms->ctl_lock);
|
||||
vlog_time_locked(params, TRANSFUSE_LOG_ERROR, fmt, args);
|
||||
unlock("log_time ctl_lock", ¶ms->ctl_lock);
|
||||
|
||||
va_end(args);
|
||||
fd = params->logfile_fd;
|
||||
if (fd != 0) {
|
||||
va_copy(targs, args);
|
||||
/* TODO: include message type? */
|
||||
rc = vdprintf(fd, fmt, targs);
|
||||
if (rc < 0)
|
||||
die(1, NULL,
|
||||
"Couldn't write log message with vdprintf", "");
|
||||
va_end(targs);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void log_notice_time(parameters * params, const char * fmt, ...) {
|
||||
va_list args;
|
||||
void vlog_time_locked(parameters *params, uint16_t msg_type,
|
||||
const char *fmt, va_list args)
|
||||
{
|
||||
int fd = params->logfile_fd;
|
||||
|
||||
va_start(args, fmt);
|
||||
if (fd != 0 && params->ctl_sock == 0)
|
||||
log_timestamp(fd);
|
||||
vlog_locked(params, msg_type, fmt, args);
|
||||
}
|
||||
|
||||
lock("log_time ctl_lock", ¶ms->ctl_lock);
|
||||
vlog_time_locked(params, TRANSFUSE_LOG_NOTICE, fmt, args);
|
||||
unlock("log_time ctl_lock", ¶ms->ctl_lock);
|
||||
void log_time_locked(parameters *params, uint16_t msg_type,
|
||||
const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
va_end(args);
|
||||
va_start(args, fmt);
|
||||
vlog_time_locked(params, msg_type, fmt, args);
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
void log_time(parameters *params, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
va_start(args, fmt);
|
||||
lock("log_time ctl_lock", ¶ms->ctl_lock);
|
||||
vlog_time_locked(params, TRANSFUSE_LOG_ERROR, fmt, args);
|
||||
unlock("log_time ctl_lock", ¶ms->ctl_lock);
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
void log_notice_time(parameters *params, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
va_start(args, fmt);
|
||||
lock("log_time ctl_lock", ¶ms->ctl_lock);
|
||||
vlog_time_locked(params, TRANSFUSE_LOG_NOTICE, fmt, args);
|
||||
unlock("log_time ctl_lock", ¶ms->ctl_lock);
|
||||
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
parameters * params;
|
||||
char * msg;
|
||||
parameters *params;
|
||||
char *msg;
|
||||
} log_thread_state;
|
||||
|
||||
void * log_time_thread(void * log_state_ptr) {
|
||||
log_thread_state * log_state = log_state_ptr;
|
||||
void *log_time_thread(void *log_state_ptr)
|
||||
{
|
||||
log_thread_state *log_state = log_state_ptr;
|
||||
|
||||
log_time(log_state->params, log_state->msg);
|
||||
log_time(log_state->params, log_state->msg);
|
||||
|
||||
free(log_state->msg);
|
||||
free(log_state);
|
||||
|
||||
return NULL;
|
||||
free(log_state->msg);
|
||||
free(log_state);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void thread_log_time(connection_t * conn, const char * fmt, ...) {
|
||||
pthread_t logger;
|
||||
va_list args;
|
||||
log_thread_state * log_state;
|
||||
void thread_log_time(connection_t *conn, const char *fmt, ...)
|
||||
{
|
||||
log_thread_state *log_state;
|
||||
pthread_t logger;
|
||||
va_list args;
|
||||
|
||||
log_state = must_malloc("thread_log_time log_state",
|
||||
sizeof(log_thread_state));
|
||||
log_state->params = conn->params;
|
||||
log_state = must_malloc("thread_log_time log_state",
|
||||
sizeof(log_thread_state));
|
||||
log_state->params = conn->params;
|
||||
|
||||
va_start(args, fmt);
|
||||
if (vasprintf(&log_state->msg, fmt, args) == -1)
|
||||
die(1, conn->params, "Couldn't allocate thread_log_time message", "");
|
||||
va_end(args);
|
||||
va_start(args, fmt);
|
||||
if (vasprintf(&log_state->msg, fmt, args) == -1)
|
||||
die(1, conn->params,
|
||||
"Couldn't allocate thread_log_time message", "");
|
||||
va_end(args);
|
||||
|
||||
// TODO: We currently spawn a new thread for every message. This is
|
||||
// far from ideal but fine for now as we anticipate thread-sensitive
|
||||
// log demand to be low.
|
||||
|
||||
if ((errno = pthread_create(&logger, &detached, log_time_thread, log_state)))
|
||||
die(1, conn->params, "",
|
||||
"Couldn't create log thread for %s connection %s: ",
|
||||
conn->type_descr, conn->mount_point);
|
||||
/* TODO: We currently spawn a new thread for every
|
||||
* message. This is far from ideal but fine for now as we
|
||||
* anticipate thread-sensitive log demand to be low. */
|
||||
errno = pthread_create(&logger, &detached, log_time_thread, log_state);
|
||||
if (errno)
|
||||
die(1, conn->params, "",
|
||||
"Couldn't create log thread for %s connection %s: ",
|
||||
conn->type_descr, conn->mount_point);
|
||||
}
|
||||
|
||||
void log_continue_locked(parameters * params, const char * fmt, ...) {
|
||||
va_list args;
|
||||
void log_continue_locked(parameters *params, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
va_start(args, fmt);
|
||||
|
||||
vlog_locked(params, TRANSFUSE_LOG_ERROR, fmt, args);
|
||||
|
||||
va_end(args);
|
||||
va_start(args, fmt);
|
||||
vlog_locked(params, TRANSFUSE_LOG_ERROR, fmt, args);
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
void log_continue(parameters * params, const char * fmt, ...) {
|
||||
va_list args;
|
||||
void log_continue(parameters *params, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
va_start(args, fmt);
|
||||
va_start(args, fmt);
|
||||
|
||||
lock("log_continue ctl_lock", ¶ms->ctl_lock);
|
||||
vlog_locked(params, TRANSFUSE_LOG_ERROR, fmt, args);
|
||||
unlock("log_continue ctl_lock", ¶ms->ctl_lock);
|
||||
lock("log_continue ctl_lock", ¶ms->ctl_lock);
|
||||
vlog_locked(params, TRANSFUSE_LOG_ERROR, fmt, args);
|
||||
unlock("log_continue ctl_lock", ¶ms->ctl_lock);
|
||||
|
||||
va_end(args);
|
||||
va_end(args);
|
||||
}
|
||||
|
@ -1,27 +1,26 @@
|
||||
#ifndef _TRANSFUSED_LOG_H_
|
||||
#define _TRANSFUSED_LOG_H_
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
#include "transfused.h"
|
||||
|
||||
void die
|
||||
(int exit_code, parameters * params, const char * perror_arg,
|
||||
const char * fmt, ...);
|
||||
void die(int exit_code, parameters *params, const char *perror_arg,
|
||||
const char *fmt, ...);
|
||||
|
||||
void vlog_locked
|
||||
(parameters * params, uint16_t msg_type, const char * fmt, va_list args);
|
||||
void vlog_locked(parameters *params, uint16_t msg_type,
|
||||
const char *fmt, va_list args);
|
||||
void vlog_time_locked(parameters *params, uint16_t msg_type,
|
||||
const char *fmt, va_list args);
|
||||
|
||||
void vlog_time_locked
|
||||
(parameters * params, uint16_t msg_type, const char * fmt, va_list args);
|
||||
void log_time_locked(parameters *params, uint16_t msg_type,
|
||||
const char *fmt, ...);
|
||||
|
||||
void log_time_locked
|
||||
(parameters * params, uint16_t msg_type, const char * fmt, ...);
|
||||
void log_time(parameters *params, const char *fmt, ...);
|
||||
void log_notice_time(parameters *params, const char *fmt, ...);
|
||||
void thread_log_time(connection_t *conn, const char *fmt, ...);
|
||||
void log_continue_locked(parameters *params, const char *fmt, ...);
|
||||
void log_continue(parameters *params, const char *fmt, ...);
|
||||
|
||||
void log_time(parameters * params, const char * fmt, ...);
|
||||
|
||||
void log_notice_time(parameters * params, const char * fmt, ...);
|
||||
|
||||
void thread_log_time(connection_t * conn, const char * fmt, ...);
|
||||
|
||||
void log_continue_locked(parameters * params, const char * fmt, ...);
|
||||
|
||||
void log_continue(parameters * params, const char * fmt, ...);
|
||||
#endif /* _TRANSFUSED_LOG_H_ */
|
||||
|
@ -7,93 +7,100 @@
|
||||
|
||||
#include "transfused_log.h"
|
||||
|
||||
long parse_cid(const char * address) {
|
||||
char * end = NULL;
|
||||
long cid = strtol(address, &end, 10);
|
||||
if (address == end || *end != ':') {
|
||||
*end = 0;
|
||||
die(2, NULL, NULL, "Invalid vsock cid: %s", address);
|
||||
}
|
||||
return cid;
|
||||
long parse_cid(const char *address)
|
||||
{
|
||||
char *end = NULL;
|
||||
long cid = strtol(address, &end, 10);
|
||||
|
||||
if (address == end || *end != ':') {
|
||||
*end = 0;
|
||||
die(2, NULL, NULL, "Invalid vsock cid: %s", address);
|
||||
}
|
||||
return cid;
|
||||
}
|
||||
|
||||
long parse_port(const char * port_str) {
|
||||
char * end = NULL;
|
||||
long port = strtol(port_str, &end, 10);
|
||||
if (port_str == end || *end != '\0') {
|
||||
*end = 0;
|
||||
die(2, NULL, NULL, "Invalid vsock port: %s", port_str);
|
||||
}
|
||||
return port;
|
||||
long parse_port(const char *port_str)
|
||||
{
|
||||
char *end = NULL;
|
||||
long port = strtol(port_str, &end, 10);
|
||||
|
||||
if (port_str == end || *end != '\0') {
|
||||
*end = 0;
|
||||
die(2, NULL, NULL, "Invalid vsock port: %s", port_str);
|
||||
}
|
||||
return port;
|
||||
}
|
||||
|
||||
int find_colon(const char * address) {
|
||||
int colon = 0;
|
||||
int find_colon(const char *address)
|
||||
{
|
||||
int colon = 0;
|
||||
|
||||
while (address[colon] != '\0')
|
||||
if (address[colon] == ':') break;
|
||||
else colon++;
|
||||
while (address[colon] != '\0')
|
||||
if (address[colon] == ':')
|
||||
break;
|
||||
else
|
||||
colon++;
|
||||
|
||||
if (address[colon] == '\0')
|
||||
die(2, NULL, NULL, "Missing port in vsock address %s", address);
|
||||
if (address[colon] == '\0')
|
||||
die(2, NULL, NULL, "Missing port in vsock address %s", address);
|
||||
|
||||
return colon;
|
||||
return colon;
|
||||
}
|
||||
|
||||
int bind_vsock(const char * address) {
|
||||
long cid, port;
|
||||
int colon;
|
||||
int bind_vsock(const char *address)
|
||||
{
|
||||
long cid, port;
|
||||
int colon;
|
||||
struct sockaddr_vm sa_listen = {
|
||||
.svm_family = AF_VSOCK,
|
||||
};
|
||||
int sock_fd;
|
||||
|
||||
struct sockaddr_vm sa_listen = {
|
||||
.svm_family = AF_VSOCK,
|
||||
};
|
||||
colon = find_colon(address);
|
||||
|
||||
int sock_fd;
|
||||
if (address[0] == '_' && colon == 1)
|
||||
cid = VMADDR_CID_ANY;
|
||||
else
|
||||
cid = parse_cid(address);
|
||||
|
||||
colon = find_colon(address);
|
||||
port = parse_port(address + colon + 1);
|
||||
|
||||
if (address[0] == '_' && colon == 1) cid = VMADDR_CID_ANY;
|
||||
else cid = parse_cid(address);
|
||||
sa_listen.svm_cid = cid;
|
||||
sa_listen.svm_port = port;
|
||||
|
||||
port = parse_port(address + colon + 1);
|
||||
sock_fd = socket(AF_VSOCK, SOCK_STREAM, 0);
|
||||
if (sock_fd < 0)
|
||||
die(1, NULL, "socket(AF_VSOCK)", "");
|
||||
|
||||
sa_listen.svm_cid = cid;
|
||||
sa_listen.svm_port = port;
|
||||
if (bind(sock_fd, (struct sockaddr *)&sa_listen, sizeof(sa_listen)))
|
||||
die(1, NULL, "bind(AF_VSOCK)", "");
|
||||
|
||||
sock_fd = socket(AF_VSOCK, SOCK_STREAM, 0);
|
||||
if (sock_fd < 0)
|
||||
die(1, NULL, "socket(AF_VSOCK)", "");
|
||||
|
||||
if (bind(sock_fd, (struct sockaddr *) &sa_listen, sizeof(sa_listen)))
|
||||
die(1, NULL, "bind(AF_VSOCK)", "");
|
||||
|
||||
return sock_fd;
|
||||
return sock_fd;
|
||||
}
|
||||
|
||||
int connect_vsock(const char * address) {
|
||||
long cid, port;
|
||||
int colon;
|
||||
int connect_vsock(const char *address)
|
||||
{
|
||||
long cid, port;
|
||||
int colon;
|
||||
struct sockaddr_vm sa_connect = {
|
||||
.svm_family = AF_VSOCK,
|
||||
};
|
||||
int sock_fd;
|
||||
|
||||
struct sockaddr_vm sa_connect = {
|
||||
.svm_family = AF_VSOCK,
|
||||
};
|
||||
colon = find_colon(address);
|
||||
|
||||
int sock_fd;
|
||||
cid = parse_cid(address);
|
||||
port = parse_port(address + colon + 1);
|
||||
|
||||
colon = find_colon(address);
|
||||
sa_connect.svm_cid = cid;
|
||||
sa_connect.svm_port = port;
|
||||
|
||||
cid = parse_cid(address);
|
||||
port = parse_port(address + colon + 1);
|
||||
sock_fd = socket(AF_VSOCK, SOCK_STREAM, 0);
|
||||
if (sock_fd < 0)
|
||||
die(1, NULL, "socket(AF_VSOCK)", "");
|
||||
|
||||
sa_connect.svm_cid = cid;
|
||||
sa_connect.svm_port = port;
|
||||
if (connect(sock_fd, (struct sockaddr *)&sa_connect, sizeof(sa_connect)))
|
||||
die(1, NULL, "connect(AF_VSOCK)", "");
|
||||
|
||||
sock_fd = socket(AF_VSOCK, SOCK_STREAM, 0);
|
||||
if (sock_fd < 0)
|
||||
die(1, NULL, "socket(AF_VSOCK)", "");
|
||||
|
||||
if (connect(sock_fd, (struct sockaddr *) &sa_connect, sizeof(sa_connect)))
|
||||
die(1, NULL, "connect(AF_VSOCK)", "");
|
||||
|
||||
return sock_fd;
|
||||
return sock_fd;
|
||||
}
|
||||
|
@ -1,2 +1,7 @@
|
||||
int bind_vsock(const char * address);
|
||||
int connect_vsock(const char * address);
|
||||
#ifndef _TRANSFUSED_VSOCK_H_
|
||||
#define _TRANSFUSED_VSOCK_H_
|
||||
|
||||
int bind_vsock(const char *address);
|
||||
int connect_vsock(const char *address);
|
||||
|
||||
#endif /* _TRANSFUSED_VSOCK_H_ */
|
||||
|
15
docs/coding-style.md
Normal file
15
docs/coding-style.md
Normal file
@ -0,0 +1,15 @@
|
||||
## Shell scripts
|
||||
Shell scripts should loosely follow the general Alpine style which is derived from the Linux Kernel guidelines, i.e. tabs for indentation etc.
|
||||
|
||||
It's also useful to run `shellcheck` on the scripts.
|
||||
|
||||
## Go code
|
||||
New Go code should be formatted with `gofmt`
|
||||
|
||||
## C code
|
||||
C code written from scratch should follow the
|
||||
[Linux kernel coding guidelines](https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/tree/Documentation/CodingStyle)
|
||||
as much as it makes sense for userspace code. You can check your code with [checkpatch.pl](https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/tree/scripts/checkpatch.pl) like this:
|
||||
```
|
||||
checkpatch.pl --no-tree --file <sourcefile>
|
||||
```
|
Loading…
Reference in New Issue
Block a user