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: support reconnection

Browse Source 
If the server side crashes and is restarted, this patch makes
tap-vsockd reconnect so the network is restored.

Signed-off-by: David Scott <dave.scott@docker.com>
This commit is contained in:
David Scott 2016-08-18 11:01:02 +01:00
parent 893386c012
commit 000ca4806f
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/wait.h>
#include <ifaddrs.h> #include <ifaddrs.h>
@ -395,6 +396,13 @@ int main(int argc, char **argv)
connection.tapfd = tapfd; connection.tapfd = tapfd;
int sock = -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);
}
for (;;) { for (;;) {
if (sock != -1) { if (sock != -1) {
@ -402,12 +410,8 @@ int main(int argc, char **argv)
sock = -1; sock = -1;
} }
if (listen_flag) { if (listen_flag) {
syslog(LOG_INFO, "starting in listening mode with serviceid=%s and tap=%s", serviceid, tap);
int lsocket = create_listening_socket(sid);
sock = accept_socket(lsocket); sock = accept_socket(lsocket);
close(lsocket);
} else { } else {
syslog(LOG_INFO, "starting in connect mode with serviceid=%s and tap=%s", serviceid, tap);
sock = connect_socket(sid); sock = connect_socket(sid);
} }
@ -427,6 +431,15 @@ int main(int argc, char **argv)
daemon_flag = 0; daemon_flag = 0;
daemonize(pidfile); daemonize(pidfile);
} }
handle(&connection); /* 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) { }
} }
} }