github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-27 04:28:20 +00:00
Code Issues Projects Releases Wiki Activity

tap-vsockd: Use Linux coding style (mostly)

Browse Source 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2016-09-02 12:52:35 +01:00
parent 6df7fae1a9
commit 1a289d04e5
5 changed files with 608 additions and 515 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alpine/packages/tap-vsockd/hvsock.c
View File

@ -12,6 +12,7 @@ int parseguid(const char *s, GUID *g)
&p0, &p1, &p2, &p3, &p4, &p5, &p6, &p7); &p0, &p1, &p2, &p3, &p4, &p5, &p6, &p7);
if (res != 11) if (res != 11)
return 1; return 1;
g->Data4[0] = p0; g->Data4[0] = p0;
g->Data4[1] = p1; g->Data4[1] = p1;
g->Data4[2] = p2; g->Data4[2] = p2;
@ -20,6 +21,7 @@ int parseguid(const char *s, GUID *g)
g->Data4[5] = p5; g->Data4[5] = p5;
g->Data4[6] = p6; g->Data4[6] = p6;
g->Data4[7] = p7; g->Data4[7] = p7;
return 0; return 0;
} }

3
alpine/packages/tap-vsockd/hvsock.h
View File

@ -33,8 +33,7 @@ extern int parseguid(const char *s, GUID *g);
#define AF_HYPERV 43 #define AF_HYPERV 43
#define HV_PROTOCOL_RAW 1 #define HV_PROTOCOL_RAW 1
typedef struct _SOCKADDR_HV typedef struct _SOCKADDR_HV {
{
unsigned short Family; unsigned short Family;
unsigned short Reserved; unsigned short Reserved;
GUID VmId; GUID VmId;

101
alpine/packages/tap-vsockd/protocol.c
View File

@ -15,9 +15,11 @@ char expected_hello_old[5] = { 'V', 'M', 'N', 'E', 'T' };
/* Version 1 and later of the protocol used this */ /* 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){ int really_read(int fd, uint8_t *buffer, size_t total)
{
size_t remaining = total; size_t remaining = total;
ssize_t n; ssize_t n;
while (remaining > 0) { while (remaining > 0) {
n = read(fd, buffer, remaining); n = read(fd, buffer, remaining);
if (n == 0) { if (n == 0) {
@ -25,7 +27,9 @@ int really_read(int fd, uint8_t *buffer, size_t total){
goto err; goto err;
} }
if (n < 0) { if (n < 0) {
syslog(LOG_CRIT, "Failure reading from socket: closing: %s", strerror(errno)); syslog(LOG_CRIT,
"Failure reading from socket: closing: %s",
strerror(errno));
goto err; goto err;
} }
remaining -= (size_t) n; remaining -= (size_t) n;
@ -33,14 +37,19 @@ int really_read(int fd, uint8_t *buffer, size_t total){
} }
return 0; return 0;
err: err:
/* On error: stop reading from the socket and trigger a clean shutdown */ /*
* On error: stop reading from the socket and trigger a clean
* shutdown
*/
shutdown(fd, SHUT_RD); shutdown(fd, SHUT_RD);
return -1; return -1;
} }
int really_write(int fd, uint8_t *buffer, size_t total){ int really_write(int fd, uint8_t *buffer, size_t total)
{
size_t remaining = total; size_t remaining = total;
ssize_t n; ssize_t n;
while (remaining > 0) { while (remaining > 0) {
n = write(fd, buffer, remaining); n = write(fd, buffer, remaining);
if (n == 0) { if (n == 0) {
@ -48,7 +57,9 @@ int really_write(int fd, uint8_t *buffer, size_t total){
goto err; goto err;
} }
if (n < 0) { if (n < 0) {
syslog(LOG_CRIT, "Failure writing to socket: closing: %s", strerror(errno)); syslog(LOG_CRIT,
"Failure writing to socket: closing: %s",
strerror(errno));
goto err; goto err;
} }
remaining -= (size_t) n; remaining -= (size_t) n;
@ -61,21 +72,29 @@ err:
return -1; return -1;
} }
struct init_message *create_init_message(){ struct init_message *create_init_message()
struct init_message *m = (struct init_message*) malloc(sizeof(struct init_message)); {
struct init_message *m =
(struct init_message *)malloc(sizeof(struct init_message));
bzero(m, sizeof(struct init_message)); bzero(m, sizeof(struct init_message));
memcpy(&m->hello[0], &expected_hello[0], sizeof(m->hello)); memcpy(&m->hello[0], &expected_hello[0], sizeof(m->hello));
m->version = CURRENT_VERSION; m->version = CURRENT_VERSION;
memset(&m->commit[0], 0, sizeof(m->commit)); memset(&m->commit[0], 0, sizeof(m->commit));
return m; return m;
} }
char *print_init_message(struct init_message *m) { char *print_init_message(struct init_message *m)
{
char tmp[41]; char tmp[41];
memcpy(&tmp[0], &m->commit[0], 40); memcpy(&tmp[0], &m->commit[0], 40);
tmp[40] = '\000'; tmp[40] = '\000';
char *buffer = (char *)malloc(80); char *buffer = (char *)malloc(80);
int n = snprintf(buffer, 80, "version %d, commit %s", m->version, tmp); int n;
n = snprintf(buffer, 80, "version %d, commit %s", m->version, tmp);
if (n < 0) { if (n < 0) {
perror("Failed to format init_message"); perror("Failed to format init_message");
exit(1); exit(1);
@ -83,55 +102,83 @@ char *print_init_message(struct init_message *m) {
return buffer; return buffer;
} }
int read_init_message(int fd, struct init_message *ci) { int read_init_message(int fd, struct init_message *ci)
{
int res;
bzero(ci, sizeof(struct init_message)); bzero(ci, sizeof(struct init_message));
if (really_read(fd, (uint8_t*) &ci->hello[0], sizeof(ci->hello)) == -1){
res = really_read(fd, (uint8_t *)&ci->hello[0], sizeof(ci->hello));
if (res == -1) {
syslog(LOG_CRIT, "Failed to read hello from client"); syslog(LOG_CRIT, "Failed to read hello from client");
return -1; return -1;
} }
if (memcmp(&ci->hello[0], &expected_hello_old[0], sizeof(expected_hello_old)) == 0) {
res = memcmp(&ci->hello[0],
&expected_hello_old[0], sizeof(expected_hello_old));
if (res == 0) {
ci->version = 0; ci->version = 0;
return 0; return 0;
} }
if (memcmp(&ci->hello[0], &expected_hello[0], sizeof(expected_hello)) != 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"); syslog(LOG_CRIT, "Failed to read header magic from client");
return -1; return -1;
} }
if (really_read(fd, (uint8_t*) &ci->version, sizeof(ci->version)) == -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"); syslog(LOG_CRIT, "Failed to read header version from client");
return -1; return -1;
} }
if (really_read(fd, (uint8_t*) &ci->commit[0], sizeof(ci->commit)) == -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"); syslog(LOG_CRIT, "Failed to read header hash from client");
return -1; return -1;
} }
return 0; return 0;
} }
int write_init_message(int fd, struct init_message *ci) { int write_init_message(int fd, struct init_message *ci)
if (really_write(fd, (uint8_t*) &ci->hello[0], sizeof(ci->hello)) == -1){ {
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"); syslog(LOG_CRIT, "Failed to write hello to client");
return -1; return -1;
} }
if (ci->version > 0) { if (ci->version > 0) {
if (really_write(fd, (uint8_t*) &ci->version, sizeof(ci->version)) == -1){ res = really_write(fd, (uint8_t *)&ci->version,
sizeof(ci->version));
if (res == -1) {
syslog(LOG_CRIT, "Failed to write version to client"); syslog(LOG_CRIT, "Failed to write version to client");
return -1; return -1;
} }
if (really_write(fd, (uint8_t*) &ci->commit[0], sizeof(ci->commit)) == -1){ res = really_write(fd, (uint8_t *)&ci->commit[0],
syslog(LOG_CRIT, "Failed to write header hash to client"); sizeof(ci->commit));
if (res == -1) {
syslog(LOG_CRIT,
"Failed to write header hash to client");
return -1; return -1;
} }
} }
return 0; return 0;
} }
int read_vif_info(int fd, struct vif_info *vif) { int read_vif_info(int fd, struct vif_info *vif)
{
uint8_t buffer[10]; uint8_t buffer[10];
if (really_read(fd, &buffer[0], sizeof(buffer)) == -1) { if (really_read(fd, &buffer[0], sizeof(buffer)) == -1) {
syslog(LOG_CRIT, "Failed to read vif info from client"); syslog(LOG_CRIT, "Failed to read vif info from client");
return -1; return -1;
} }
vif->mtu = (size_t)(buffer[0] | (buffer[1] << 8)); vif->mtu = (size_t)(buffer[0] | (buffer[1] << 8));
vif->max_packet_size = (size_t)(buffer[2] | (buffer[3] << 8)); vif->max_packet_size = (size_t)(buffer[2] | (buffer[3] << 8));
memcpy(vif->mac, &buffer[4], 6); memcpy(vif->mac, &buffer[4], 6);
@ -139,13 +186,16 @@ int read_vif_info(int fd, struct vif_info *vif) {
} }
int write_vif_info(int fd, struct vif_info *vif) { int write_vif_info(int fd, struct vif_info *vif)
{
uint8_t buffer[10]; uint8_t buffer[10];
buffer[0] = (uint8_t) ((vif->mtu >> 0) & 0xff); buffer[0] = (uint8_t) ((vif->mtu >> 0) & 0xff);
buffer[1] = (uint8_t) ((vif->mtu >> 8) & 0xff); buffer[1] = (uint8_t) ((vif->mtu >> 8) & 0xff);
buffer[2] = (uint8_t) ((vif->max_packet_size >> 0) & 0xff); buffer[2] = (uint8_t) ((vif->max_packet_size >> 0) & 0xff);
buffer[3] = (uint8_t) ((vif->max_packet_size >> 8) & 0xff); buffer[3] = (uint8_t) ((vif->max_packet_size >> 8) & 0xff);
memcpy(&buffer[0] + 4, &(vif->mac)[0], 6); memcpy(&buffer[0] + 4, &(vif->mac)[0], 6);
if (really_write(fd, &buffer[0], sizeof(buffer)) == -1) { if (really_write(fd, &buffer[0], sizeof(buffer)) == -1) {
syslog(LOG_CRIT, "Failed to write vif into to client"); syslog(LOG_CRIT, "Failed to write vif into to client");
return -1; return -1;
@ -153,8 +203,10 @@ int write_vif_info(int fd, struct vif_info *vif) {
return 0; return 0;
} }
int write_command(int fd, enum command *c) { int write_command(int fd, enum command *c)
{
uint8_t command = *c; uint8_t command = *c;
if (really_write(fd, (uint8_t *)&command, sizeof(command)) == -1) { if (really_write(fd, (uint8_t *)&command, sizeof(command)) == -1) {
syslog(LOG_CRIT, "Failed to write command to client"); syslog(LOG_CRIT, "Failed to write command to client");
return -1; return -1;
@ -162,7 +214,8 @@ int write_command(int fd, enum command *c) {
return 0; return 0;
} }
int write_ethernet_args(int fd, struct ethernet_args *args){ int write_ethernet_args(int fd, struct ethernet_args *args)
{
if (really_write(fd, (uint8_t *)&args->uuid_string[0], 36) == -1) { if (really_write(fd, (uint8_t *)&args->uuid_string[0], 36) == -1) {
syslog(LOG_CRIT, "Failed to write ethernet args to client"); syslog(LOG_CRIT, "Failed to write ethernet args to client");
return -1; return -1;

7
alpine/packages/tap-vsockd/protocol.h
View File

@ -13,8 +13,11 @@ struct init_message {
char commit[40]; /* git sha of the compiled commit */ 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 #define CURRENT_VERSION 13
extern struct init_message *create_init_message(void); extern struct init_message *create_init_message(void);

276
alpine/packages/tap-vsockd/tap-vsockd.c
View File

@ -1,6 +1,3 @@
/*
*/
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -25,13 +22,12 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <ifaddrs.h> #include <ifaddrs.h>
#include "hvsock.h" #include "hvsock.h"
#include "protocol.h" #include "protocol.h"
int daemon_flag = 0; int daemon_flag;
int listen_flag = 0; int listen_flag;
int connect_flag = 0; int connect_flag;
char *default_sid = "30D48B34-7D27-4B0B-AAAF-BBBED334DD59"; char *default_sid = "30D48B34-7D27-4B0B-AAAF-BBBED334DD59";
@ -41,39 +37,42 @@ void fatal(const char *msg)
exit(1); exit(1);
} }
int alloc_tap(const char *dev) { int alloc_tap(const char *dev)
int fd; {
struct ifreq ifr;
const char *clonedev = "/dev/net/tun"; const char *clonedev = "/dev/net/tun";
if ((fd = open(clonedev, O_RDWR)) == -1) { struct ifreq ifr;
int persist = 1;
int fd;
fd = open(clonedev, O_RDWR);
if (fd == -1)
fatal("Failed to open /dev/net/tun"); fatal("Failed to open /dev/net/tun");
}
memset(&ifr, 0, sizeof(ifr)); memset(&ifr, 0, sizeof(ifr));
ifr.ifr_flags = IFF_TAP | IFF_NO_PI; ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
strncpy(ifr.ifr_name, dev, IFNAMSIZ); strncpy(ifr.ifr_name, dev, IFNAMSIZ);
if (ioctl(fd, TUNSETIFF, (void*) &ifr) < 0) { if (ioctl(fd, TUNSETIFF, (void *)&ifr) < 0)
fatal("TUNSETIFF failed"); fatal("TUNSETIFF failed");
}
int persist = 1; if (ioctl(fd, TUNSETPERSIST, persist) < 0)
if (ioctl(fd, TUNSETPERSIST, persist) < 0) {
fatal("TUNSETPERSIST failed"); fatal("TUNSETPERSIST failed");
}
syslog(LOG_INFO, "successfully created TAP device %s", dev); syslog(LOG_INFO, "successfully created TAP device %s", dev);
return fd; return fd;
} }
void set_macaddr(const char *dev, uint8_t *mac) { void set_macaddr(const char *dev, uint8_t *mac)
int fd; {
struct ifreq ifq; struct ifreq ifq;
int fd;
fd = socket(PF_INET, SOCK_DGRAM, 0); fd = socket(PF_INET, SOCK_DGRAM, 0);
strcpy(ifq.ifr_name, dev); strcpy(ifq.ifr_name, dev);
memcpy(&ifq.ifr_hwaddr.sa_data[0], mac, 6); memcpy(&ifq.ifr_hwaddr.sa_data[0], mac, 6);
ifq.ifr_hwaddr.sa_family = ARPHRD_ETHER; ifq.ifr_hwaddr.sa_family = ARPHRD_ETHER;
if (ioctl(fd, SIOCSIFHWADDR, &ifq) == -1) { if (ioctl(fd, SIOCSIFHWADDR, &ifq) == -1)
fatal("SIOCSIFHWADDR failed"); fatal("SIOCSIFHWADDR failed");
}
close(fd); close(fd);
} }
@ -83,29 +82,32 @@ int negotiate(int fd, struct vif_info *vif)
{ {
/* Negotiate with com.docker.slirp */ /* Negotiate with com.docker.slirp */
struct init_message *me = create_init_message(); struct init_message *me = create_init_message();
if (write_init_message(fd, me) == -1) { enum command command = ethernet;
goto err; struct ethernet_args args;
}
struct init_message you; struct init_message you;
if (read_init_message(fd, &you) == -1) { char *txt;
if (write_init_message(fd, me) == -1)
goto err; goto err;
}
char *txt = print_init_message(&you); if (read_init_message(fd, &you) == -1)
goto err;
txt = print_init_message(&you);
syslog(LOG_INFO, "Server reports %s", txt); syslog(LOG_INFO, "Server reports %s", txt);
free(txt); free(txt);
enum command command = ethernet;
if (write_command(fd, &command) == -1) { if (write_command(fd, &command) == -1)
goto err; goto err;
}
struct ethernet_args args;
/* We don't need a uuid */ /* We don't need a uuid */
memset(&args.uuid_string[0], 0, sizeof(args.uuid_string)); memset(&args.uuid_string[0], 0, sizeof(args.uuid_string));
if (write_ethernet_args(fd, &args) == -1) { if (write_ethernet_args(fd, &args) == -1)
goto err; goto err;
}
if (read_vif_info(fd, vif) == -1) { if (read_vif_info(fd, vif) == -1)
goto err; goto err;
}
return 0; return 0;
err: err:
syslog(LOG_CRIT, "Failed to negotiate vmnet connection"); syslog(LOG_CRIT, "Failed to negotiate vmnet connection");
@ -117,32 +119,38 @@ err:
struct connection { struct connection {
int fd; /* Hyper-V socket with vmnet protocol */ int fd; /* Hyper-V socket with vmnet protocol */
int tapfd; /* TAP device with ethernet frames */ int tapfd; /* TAP device with ethernet frames */
struct vif_info vif; /* Contains VIF MAC, MTU etc, received from server */ 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; struct connection *connection = (struct connection *)arg;
uint8_t header[2];
uint8_t buffer[2048]; uint8_t buffer[2048];
uint8_t header[2];
int length, n;
for (;;) { for (;;) {
if (really_read(connection->fd, &header[0], 2) == -1){ if (really_read(connection->fd, &header[0], 2) == -1)
fatal("Failed to read a packet header from host"); fatal("Failed to read a packet header from host");
}
length = (header[0] & 0xff) | ((header[1] & 0xff) << 8); length = (header[0] & 0xff) | ((header[1] & 0xff) << 8);
if (length > sizeof(buffer)) { if (length > sizeof(buffer)) {
syslog(LOG_CRIT, "Received an over-large packet: %d > %ld", length, sizeof(buffer)); syslog(LOG_CRIT,
"Received an over-large packet: %d > %ld",
length, sizeof(buffer));
exit(1); exit(1);
} }
if (really_read(connection->fd, &buffer[0], length) == -1) { if (really_read(connection->fd, &buffer[0], length) == -1) {
syslog(LOG_CRIT, "Failed to read packet contents from host"); syslog(LOG_CRIT,
"Failed to read packet contents from host");
exit(1); exit(1);
} }
n = write(connection->tapfd, &buffer[0], length); n = write(connection->tapfd, &buffer[0], length);
if (n != length) { if (n != length) {
syslog(LOG_CRIT, "Failed to write %d bytes to tap device (wrote %d)", length, n); syslog(LOG_CRIT,
"Failed to write %d bytes to tap device (wrote %d)", length, n);
exit(1); exit(1);
} }
} }
@ -150,62 +158,66 @@ static void* vmnet_to_tap(void *arg)
static void *tap_to_vmnet(void *arg) static void *tap_to_vmnet(void *arg)
{ {
int length;
struct connection *connection = (struct connection *)arg; struct connection *connection = (struct connection *)arg;
uint8_t header[2];
uint8_t buffer[2048]; uint8_t buffer[2048];
uint8_t header[2];
int length;
for (;;) { for (;;) {
length = read(connection->tapfd, &buffer[0], sizeof(buffer)); length = read(connection->tapfd, &buffer[0], sizeof(buffer));
if (length == -1) { if (length == -1) {
if (errno == ENXIO) { if (errno == ENXIO)
fatal("tap device has gone down"); fatal("tap device has gone down");
}
syslog(LOG_WARNING, "ignoring error %d", errno); syslog(LOG_WARNING, "ignoring error %d", errno);
/* This is what mirage-net-unix does. Is it a good idea really? */ /*
* This is what mirage-net-unix does. Is it a good
* idea really?
*/
continue; continue;
} }
header[0] = (length >> 0) & 0xff; header[0] = (length >> 0) & 0xff;
header[1] = (length >> 8) & 0xff; header[1] = (length >> 8) & 0xff;
if (really_write(connection->fd, &header[0], 2) == -1){ if (really_write(connection->fd, &header[0], 2) == -1)
fatal("Failed to write packet header"); fatal("Failed to write packet header");
}
if (really_write(connection->fd, &buffer[0], length) == -1) { if (really_write(connection->fd, &buffer[0], length) == -1)
fatal("Failed to write packet body"); fatal("Failed to write packet body");
} }
}
return NULL; return NULL;
} }
/* Handle a connection by exchanging ethernet frames forever. /*
* Handle a connection by exchanging ethernet frames forever.
*/ */
static void handle(struct connection *connection) static void handle(struct connection *connection)
{ {
pthread_t v2t, t2v; pthread_t v2t, t2v;
if (pthread_create(&v2t, NULL, vmnet_to_tap, connection) != 0){ if (pthread_create(&v2t, NULL, vmnet_to_tap, connection) != 0)
fatal("Failed to create the vmnet_to_tap thread"); fatal("Failed to create the vmnet_to_tap thread");
}
if (pthread_create(&t2v, NULL, tap_to_vmnet, connection) != 0){ if (pthread_create(&t2v, NULL, tap_to_vmnet, connection) != 0)
fatal("Failed to create the tap_to_vmnet thread"); fatal("Failed to create the tap_to_vmnet thread");
}
if (pthread_join(v2t, NULL) != 0){ if (pthread_join(v2t, NULL) != 0)
fatal("Failed to join the vmnet_to_tap thread"); fatal("Failed to join the vmnet_to_tap thread");
}
if (pthread_join(t2v, NULL) != 0){ if (pthread_join(t2v, NULL) != 0)
fatal("Failed to join the tap_to_vmnet thread"); fatal("Failed to join the tap_to_vmnet thread");
} }
}
static int create_listening_socket(GUID serviceid) { static int create_listening_socket(GUID serviceid)
int lsock = -1; {
SOCKADDR_HV sa; SOCKADDR_HV sa;
int lsock = -1;
int res; int res;
lsock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW); lsock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW);
if (lsock == -1) { if (lsock == -1)
fatal("socket()"); fatal("socket()");
}
sa.Family = AF_HYPERV; sa.Family = AF_HYPERV;
sa.Reserved = 0; sa.Reserved = 0;
@ -213,26 +225,25 @@ static int create_listening_socket(GUID serviceid) {
sa.ServiceId = serviceid; sa.ServiceId = serviceid;
res = bind(lsock, (const struct sockaddr *)&sa, sizeof(sa)); res = bind(lsock, (const struct sockaddr *)&sa, sizeof(sa));
if (res == -1) { if (res == -1)
fatal("bind()"); fatal("bind()");
}
res = listen(lsock, SOMAXCONN); res = listen(lsock, SOMAXCONN);
if (res == -1) { if (res == -1)
fatal("listen()"); fatal("listen()");
}
return lsock; return lsock;
} }
static int connect_socket(GUID serviceid) { static int connect_socket(GUID serviceid)
int sock = -1; {
SOCKADDR_HV sa; SOCKADDR_HV sa;
int sock = -1;
int res; int res;
sock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW); sock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW);
if (sock == -1) { if (sock == -1)
fatal("socket()"); fatal("socket()");
}
sa.Family = AF_HYPERV; sa.Family = AF_HYPERV;
sa.Reserved = 0; sa.Reserved = 0;
@ -240,37 +251,38 @@ static int connect_socket(GUID serviceid) {
sa.ServiceId = serviceid; sa.ServiceId = serviceid;
res = connect(sock, (const struct sockaddr *)&sa, sizeof(sa)); res = connect(sock, (const struct sockaddr *)&sa, sizeof(sa));
if (res == -1) { if (res == -1)
fatal("connect()"); fatal("connect()");
}
return sock; return sock;
} }
static int accept_socket(int lsock) { static int accept_socket(int lsock)
int csock = -1; {
SOCKADDR_HV sac; SOCKADDR_HV sac;
socklen_t socklen = sizeof(sac); socklen_t socklen = sizeof(sac);
int csock = -1;
csock = accept(lsock, (struct sockaddr *)&sac, &socklen); csock = accept(lsock, (struct sockaddr *)&sac, &socklen);
if (csock == -1) { if (csock == -1)
fatal("accept()"); fatal("accept()");
}
syslog(LOG_INFO, "Connect from: " GUID_FMT ":" GUID_FMT "\n", syslog(LOG_INFO, "Connect from: " GUID_FMT ":" GUID_FMT "\n",
GUID_ARGS(sac.VmId), GUID_ARGS(sac.ServiceId)); GUID_ARGS(sac.VmId), GUID_ARGS(sac.ServiceId));
return csock; return csock;
} }
void write_pidfile(const char *pidfile) { void write_pidfile(const char *pidfile)
{
pid_t pid = getpid(); pid_t pid = getpid();
char *pid_s; char *pid_s;
FILE *file; FILE *file;
int len; int len;
if (asprintf(&pid_s, "%lld", (long long) pid) == -1) { if (asprintf(&pid_s, "%lld", (long long)pid) == -1)
fatal("Failed to allocate pidfile string"); fatal("Failed to allocate pidfile string");
}
len = strlen(pid_s); len = strlen(pid_s);
file = fopen(pidfile, "w"); file = fopen(pidfile, "w");
if (file == NULL) { if (file == NULL) {
@ -278,32 +290,38 @@ void write_pidfile(const char *pidfile) {
exit(1); exit(1);
} }
if (fwrite(pid_s, 1, len, file) != len) { if (fwrite(pid_s, 1, len, file) != len)
fatal("Failed to write pid to pidfile"); fatal("Failed to write pid to pidfile");
}
fclose(file); fclose(file);
free(pid_s); free(pid_s);
} }
void daemonize(const char *pidfile){ void daemonize(const char *pidfile)
pid_t pid = fork (); {
if (pid == -1) { pid_t pid;
int null;
pid = fork();
if (pid == -1)
fatal("Failed to fork()"); fatal("Failed to fork()");
}
else if (pid != 0) else if (pid != 0)
exit(0); exit(0);
if (setsid () == -1) {
if (setsid() == -1)
fatal("Failed to setsid()"); fatal("Failed to setsid()");
}
if (chdir ("/") == -1) { if (chdir("/") == -1)
fatal("Failed to chdir()"); fatal("Failed to chdir()");
}
int null = open("/dev/null", O_RDWR); null = open("/dev/null", O_RDWR);
dup2(null, STDIN_FILENO); dup2(null, STDIN_FILENO);
dup2(null, STDOUT_FILENO); dup2(null, STDOUT_FILENO);
dup2(null, STDERR_FILENO); dup2(null, STDERR_FILENO);
close(null); close(null);
if (pidfile) write_pidfile(pidfile);
if (pidfile)
write_pidfile(pidfile);
} }
void usage(char *name) void usage(char *name)
@ -324,16 +342,21 @@ void usage(char *name)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int res = 0;
GUID sid;
int c;
/* Defaults to a testing GUID */
char *serviceid = default_sid; char *serviceid = default_sid;
struct connection connection;
char *tap = "eth1"; char *tap = "eth1";
char *pidfile = NULL; 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; int option_index;
while (1) { int log_flags = LOG_CONS | LOG_NDELAY;
static struct option long_options[] = { static struct option long_options[] = {
/* These options set a flag. */ /* These options set a flag. */
{"daemon", no_argument, &daemon_flag, 1}, {"daemon", no_argument, &daemon_flag, 1},
@ -344,10 +367,15 @@ int main(int argc, char **argv)
{"connect", no_argument, &connect_flag, 1}, {"connect", no_argument, &connect_flag, 1},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
int option_index = 0;
c = getopt_long (argc, argv, "ds:t:p:", long_options, &option_index); opterr = 0;
if (c == -1) break; while (1) {
option_index = 0;
c = getopt_long(argc, argv, "ds:t:p:",
long_options, &option_index);
if (c == -1)
break;
switch (c) { switch (c) {
case 'd': case 'd':
@ -369,14 +397,17 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
} }
if ((listen_flag && connect_flag) || !(listen_flag || connect_flag)) { if ((listen_flag && connect_flag) || !(listen_flag || connect_flag)) {
fprintf(stderr, "Please supply either the --listen or --connect flag, but not both.\n"); fprintf(stderr, "Please supply either the --listen or --connect flag, but not both.\n");
exit(1); exit(1);
} }
if (daemon_flag && !pidfile) { if (daemon_flag && !pidfile) {
fprintf(stderr, "For daemon mode, please supply a --pidfile argument.\n"); fprintf(stderr, "For daemon mode, please supply a --pidfile argument.\n");
exit(1); exit(1);
} }
res = parseguid(serviceid, &sid); res = parseguid(serviceid, &sid);
if (res) { if (res) {
fprintf(stderr, "Failed to parse serviceid as GUID: %s\n", serviceid); fprintf(stderr, "Failed to parse serviceid as GUID: %s\n", serviceid);
@ -384,19 +415,14 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
int log_flags = LOG_CONS | LOG_NDELAY; if (!daemon_flag)
if (!daemon_flag) {
log_flags |= LOG_PERROR; log_flags |= LOG_PERROR;
}
openlog(argv[0], log_flags, LOG_DAEMON); openlog(argv[0], log_flags, LOG_DAEMON);
int tapfd = alloc_tap(tap); tapfd = alloc_tap(tap);
struct connection connection;
connection.tapfd = tapfd; connection.tapfd = tapfd;
int sock = -1;
int lsocket = -1;
if (listen_flag) { if (listen_flag) {
syslog(LOG_INFO, "starting in listening mode with serviceid=%s and tap=%s", serviceid, tap); syslog(LOG_INFO, "starting in listening mode with serviceid=%s and tap=%s", serviceid, tap);
lsocket = create_listening_socket(sid); lsocket = create_listening_socket(sid);
@ -409,17 +435,18 @@ int main(int argc, char **argv)
close(sock); close(sock);
sock = -1; sock = -1;
} }
if (listen_flag) {
if (listen_flag)
sock = accept_socket(lsocket); sock = accept_socket(lsocket);
} else { else
sock = connect_socket(sid); sock = connect_socket(sid);
}
connection.fd = sock; connection.fd = sock;
if (negotiate(sock, &connection.vif) != 0) { if (negotiate(sock, &connection.vif) != 0) {
sleep(1); sleep(1);
continue; continue;
} }
syslog(LOG_INFO, "VMNET VIF has MAC %02x:%02x:%02x:%02x:%02x:%02x", 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[0], connection.vif.mac[1], connection.vif.mac[2],
connection.vif.mac[3], connection.vif.mac[4], connection.vif.mac[5] connection.vif.mac[3], connection.vif.mac[4], connection.vif.mac[5]
@ -431,15 +458,24 @@ int main(int argc, char **argv)
daemon_flag = 0; daemon_flag = 0;
daemonize(pidfile); 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(); * Run the multithreaded part in a subprocess. On error the
* process will exit() which tears down all the threads
*/
child = fork();
if (child == 0) { if (child == 0) {
handle(&connection); handle(&connection);
/* should never happen but just in case of a logic bug in handle */ /*
* should never happen but just in case of a logic
* bug in handle
*/
exit(1); exit(1);
} }
int status;
while (waitpid(child, &status, 0) == -1) { } for (;;) {
if (waitpid(child, &status, 0) != -1)
break;
}
} }
} }