tinc-gui: Reformat codebase according to PEP8

[tinc] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index 46bf5bd..abc5c09 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -89,7 +89,7 @@ static struct option const long_options[] = {
 static void version(void) {
        printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
                   BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
-       printf("Copyright (C) 1998-2014 Ivo Timmermans, Guus Sliepen and others.\n"
+       printf("Copyright (C) 1998-2015 Ivo Timmermans, Guus Sliepen and others.\n"
                        "See the AUTHORS file for a complete list.\n\n"
                        "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
                        "and you are welcome to redistribute it under certain conditions;\n"
@@ -233,6 +233,12 @@ FILE *fopenmask(const char *filename, const char *mode, mode_t perms) {
        perms &= ~mask;
        umask(~perms);
        FILE *f = fopen(filename, mode);
+
+       if(!f) {
+               fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
+               return NULL;
+       }
+
 #ifdef HAVE_FCHMOD
        if((perms & 0444) && f)
                fchmod(fileno(f), perms);
@@ -411,6 +417,7 @@ static bool ed25519_keygen(bool ask) {
 
        char *pubkey = ecdsa_get_base64_public_key(key);
        fprintf(f, "Ed25519PublicKey = %s\n", pubkey);
+       free(pubkey);
 
        fclose(f);
        ecdsa_free(key);
@@ -853,6 +860,13 @@ static int cmd_start(int argc, char *argv[]) {
        }
        return status;
 #else
+       int pfd[2] = {-1, -1};
+       if(socketpair(AF_UNIX, SOCK_STREAM, 0, pfd)) {
+               fprintf(stderr, "Could not create umbilical socket: %s\n", strerror(errno));
+               free(nargv);
+               return 1;
+       }
+
        pid_t pid = fork();
        if(pid == -1) {
                fprintf(stderr, "Could not fork: %s\n", strerror(errno));
@@ -860,8 +874,15 @@ static int cmd_start(int argc, char *argv[]) {
                return 1;
        }
 
-       if(!pid)
+       if(!pid) {
+               close(pfd[0]);
+               char buf[100] = "";
+               snprintf(buf, sizeof buf, "%d", pfd[1]);
+               setenv("TINC_UMBILICAL", buf, true);
                exit(execvp(c, nargv));
+       } else {
+               close(pfd[1]);
+       }
 
        free(nargv);
 
@@ -869,12 +890,33 @@ static int cmd_start(int argc, char *argv[]) {
 #ifdef SIGINT
        signal(SIGINT, SIG_IGN);
 #endif
+
+       // Pass all log messages from the umbilical to stderr.
+       // A nul-byte right before closure means tincd started succesfully.
+       bool failure = true;
+       char buf[1024];
+       ssize_t len;
+
+       while((len = read(pfd[0], buf, sizeof buf)) > 0) {
+               failure = buf[len - 1];
+               if(!failure)
+                       len--;
+               write(2, buf, len);
+       }
+
+       if(len)
+               failure = true;
+
+       close(pfd[0]);
+
+       // Make sure the child process is really gone.
        result = waitpid(pid, &status, 0);
+
 #ifdef SIGINT
        signal(SIGINT, SIG_DFL);
 #endif
 
-       if(result != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
+       if(failure || result != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
                fprintf(stderr, "Error starting %s\n", c);
                return 1;
        }
@@ -1763,7 +1805,7 @@ static int cmd_config(int argc, char *argv[]) {
 }
 
 static bool try_bind(int port) {
-       struct addrinfo *ai = NULL;
+       struct addrinfo *ai = NULL, *aip;
        struct addrinfo hint = {
                .ai_flags = AI_PASSIVE,
                .ai_family = AF_UNSPEC,
@@ -1771,24 +1813,30 @@ static bool try_bind(int port) {
                .ai_protocol = IPPROTO_TCP,
        };
 
+       bool success = true;
        char portstr[16];
        snprintf(portstr, sizeof portstr, "%d", port);
 
        if(getaddrinfo(NULL, portstr, &hint, &ai) || !ai)
                return false;
 
-       while(ai) {
+       for(aip = ai; aip; aip = aip->ai_next) {
                int fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
-               if(!fd)
-                       return false;
+               if(!fd) {
+                       success = false;
+                       break;
+               }
+
                int result = bind(fd, ai->ai_addr, ai->ai_addrlen);
                closesocket(fd);
-               if(result)
-                       return false;
-               ai = ai->ai_next;
+               if(result) {
+                       success = false;
+                       break;
+               }
        }
 
-       return true;
+       freeaddrinfo(ai);
+       return success;
 }
 
 int check_port(char *name) {