fixed bug where not all of the ack was compared in the ipc module

diff --git a/src/ipc/ipc.c b/src/ipc/ipc.c
index c23af9ac011c5551d5ccdf7ffdf515ea9f151e2a..73adb321bd2ba2102975320e0b3e652b314f31eb 100755 (executable)
--- a/src/ipc/ipc.c
+++ b/src/ipc/ipc.c
@@ -91,7 +91,7 @@ int send_ipc_message(int to, ipc_type type, str msg){
                log_error("Receiving ACK from listener");
                return 1;
        }
                log_error("Receiving ACK from listener");
                return 1;
        }

-       if(strncmp(ack, "ACK", 2) != 0){
+       if(strncmp(ack, "ACK", 3) != 0){

                log_error("Received '%.3s' from listener instead of 'ACK'", ack);
                return 1;
        }
                log_error("Received '%.3s' from listener instead of 'ACK'", ack);
                return 1;
        }

diff --git a/src/worker.c b/src/worker.c
index 51ff976d111246b5d36199258a1ffdccc9be699d..c6384d0772eb5971daef90b594157f0a2d1d5be3 100755 (executable)
--- a/src/worker.c
+++ b/src/worker.c
@@ -14,6 +14,7 @@ str certfile;
 str keyfile;
 
 
 str keyfile;
 
 

+// make int for errors?

 void handle_message(ipc_msg im){
        switch(im.type){
                case NONE: break;
 void handle_message(ipc_msg im){
        switch(im.type){
                case NONE: break;


@@ -35,10 +36,10 @@ void handle_message(ipc_msg im){
                        keyfile = dup_str(im.msg);
                        break;
                case RESTART:
                        keyfile = dup_str(im.msg);
                        break;
                case RESTART:

-                       char *args[] = {"./worker.exe", listener.saddr.ptr, NULL};
+                       char *args[] = {"./worker.exe", listener->saddr.ptr, NULL};

                        execv("./worker.exe", args);
                        log_error("Cannot restart worker: %s", strerror(errno));
                        execv("./worker.exe", args);
                        log_error("Cannot restart worker: %s", strerror(errno));

-                       return 1;
+                       return;

                        break;
                case RELOAD:
                        // re-reads config
                        break;
                case RELOAD:
                        // re-reads config