Ensure "tinc start" knows if the daemon really started succesfully.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index fb2a155..b62c8c1 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -363,6 +363,14 @@ int main(int argc, char **argv) {
                logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
                return 1;
        }
+#else
+       // Check if we got an umbilical fd from the process that started us
+       char *umbstr = getenv("TINC_UMBILICAL");
+       if(umbstr) {
+               umbilical = atoi(umbstr);
+               if(fcntl(umbilical, F_GETFL) < 0)
+                       umbilical = 0;
+       }
 #endif
 
        openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR);
@@ -466,6 +474,12 @@ int main2(int argc, char **argv) {
 
        logger(DEBUG_ALWAYS, LOG_NOTICE, "Ready");
 
+       if(umbilical) { // snip!
+               write(umbilical, "", 1);
+               close(umbilical);
+               umbilical = 0;
+       }
+
        try_outgoing_connections();
 
        status = main_loop();