Restore compilation flags.

[apps/pfixtools.git] / pfix-srsd / main-srsd.c

diff --git a/pfix-srsd/main-srsd.c b/pfix-srsd/main-srsd.c
index 9f1bdd3..440e56f 100644 (file)
--- a/pfix-srsd/main-srsd.c
+++ b/pfix-srsd/main-srsd.c
@@ -38,12 +38,12 @@
 
 #include <srs2.h>
 
-#include "epoll.h"
 #include "mem.h"
 #include "buffer.h"
 #include "server.h"
 
 #define DAEMON_NAME             "pfix-srsd"
+#define DAEMON_VERSION          "0.1"
 #define DEFAULT_ENCODER_PORT    10001
 #define DEFAULT_DECODER_PORT    10002
 #define RUNAS_USER              "nobody"
@@ -126,7 +126,7 @@ int process_srs(server_t *srsd, void* vconfig)
                 return -1;
             }
             if (srsd->obuf.len) {
-              epoll_modify(srsd->fd, EPOLLIN | EPOLLOUT, srsd);
+                server_rw(srsd);
             }
             return 0;
         }
@@ -174,7 +174,7 @@ int process_srs(server_t *srsd, void* vconfig)
         buffer_consume(&srsd->ibuf, nl - srsd->ibuf.data);
     }
     if (srsd->obuf.len) {
-      epoll_modify(srsd->fd, EPOLLIN | EPOLLOUT, srsd);
+        server_rw(srsd);
     }
     return 0;
 }
@@ -307,11 +307,17 @@ int main(int argc, char *argv[])
         }
     }
 
+    if (!daemonize) {
+        log_syslog = false;
+    }
+
     if (argc - optind != 2) {
         usage();
         return EXIT_FAILURE;
     }
 
+    info("starting %s v%s...", DAEMON_NAME, DAEMON_VERSION);
+
     config.domain = argv[optind];
     config.srs = srs_read_secrets(argv[optind + 1]);
     if (!config.srs