Small fix: tcp_table(5) should not end with \r\n but \n.

[apps/pfixtools.git] / srsd.c

diff --git a/srsd.c b/srsd.c
index cd5c125..aa953fc 100644 (file)
--- a/srsd.c
+++ b/srsd.c
@@ -45,6 +45,7 @@
 #include "mem.h"
 #include "buffer.h"
 
+#define DAEMON_NAME             "srsd"
 #define DEFAULT_ENCODER_PORT    10000
 #define DEFAULT_DECODER_PORT    10001
 #define __tostr(x)  #x
@@ -111,7 +112,6 @@ int process_srs(srs_t *srs, const char *domain, srsd_t *srsd)
         if (err == 0) {
             buffer_addstr(&srsd->obuf, "200 ");
             buffer_addstr(&srsd->obuf, buf);
-            buffer_addstr(&srsd->obuf, "\r\n");
         } else {
             switch (SRS_ERROR_TYPE(err)) {
               case SRS_ERRTYPE_SRS:
@@ -123,8 +123,8 @@ int process_srs(srs_t *srs, const char *domain, srsd_t *srsd)
                 break;
             }
             buffer_addstr(&srsd->obuf, srs_strerror(err));
-            buffer_addstr(&srsd->obuf, "\r\n");
         }
+        buffer_addch(&srsd->obuf, '\n');
 
       skip:
         buffer_consume(&srsd->ibuf, nl - srsd->ibuf.data);
@@ -165,7 +165,7 @@ int start_listener(int epollfd, int port, bool decoder)
 
 static int main_initialize(void)
 {
-    openlog("srsd", LOG_PID, LOG_MAIL);
+    openlog(DAEMON_NAME, LOG_PID, LOG_MAIL);
     signal(SIGPIPE, SIG_IGN);
     signal(SIGINT,  &common_sighandler);
     signal(SIGTERM, &common_sighandler);
@@ -185,7 +185,7 @@ module_exit(main_shutdown);
 
 void usage(void)
 {
-    fputs("usage: srsd [ -e <port> ] [ -d <port> ] domain secrets\n"
+    fputs("usage: "DAEMON_NAME" [ -e <port> ] [ -d <port> ] domain secrets\n"
           "\n"
           "    -e <port>    port to listen to for encoding requests\n"
           "                 (default: "STR(DEFAULT_ENCODER_PORT)")\n"