Fix issue 11: Typo

[umurmur.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 6892907142cf9eaceeb64882c501567e212a3d94..70358e61ad88ebb71215f4f3041760e546044515 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -34,19 +34,26 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/utsname.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <sched.h>
 #include <errno.h>
-
+#include <string.h>
+#include <stdlib.h>
+#ifdef _POSIX_PRIORITY_SCHEDULING
+#include <sched.h>
+#endif
 #include "server.h"
 #include "ssl.h"
 #include "channel.h"
 #include "log.h"
 #include "client.h"
 #include "conf.h"
+#include "version.h"
 
-#define UMURMUR_VERSION "0.1.0"
+char system_string[64], version_string[64];
+int bindport;
+char *bindaddr;
 
 void lockfile(const char *pidfile)
 {
@@ -57,7 +64,7 @@ void lockfile(const char *pidfile)
        
        if (lfp < 0)
                Log_fatal("Cannot open PID-file %s for writing", pidfile);
-       sprintf(str,"%d\n",getpid());
+       snprintf(str,16,"%d\n", getpid());
        write(lfp, str, strlen(str)); /* record pid to lockfile */
        Log_info("PID-file: %s", pidfile);
 }
@@ -105,6 +112,7 @@ void daemonize()
                
 }
 
+#ifdef _POSIX_PRIORITY_SCHEDULING
 void setscheduler()
 {
        int rc;
@@ -116,14 +124,20 @@ void setscheduler()
        if (rc < 0)
                Log_warn("Failed to set scheduler: %s", strerror(errno));
 }
+#endif
 
 void printhelp()
 {
-       printf("uMurmur version %s. Mumble protocol %d\n", UMURMUR_VERSION, MESSAGE_STREAM_VERSION);
+       printf("uMurmur version %s. Mumble protocol %d.%d.%d\n", UMURMUR_VERSION, PROTVER_MAJOR, PROTVER_MINOR, PROTVER_PATCH);
        printf("Usage: umurmurd [-d] [-p <pidfile>] [-c <conf file>] [-h]\n");
-       printf("       -d             - Do not deamonize\n");
+       printf("       -d             - Do not daemonize\n");
        printf("       -p <pidfile>   - Write PID to this file\n");
        printf("       -c <conf file> - Specify configuration file\n");
+#ifdef _POSIX_PRIORITY_SCHEDULING
+       printf("       -r             - Run with realtime priority\n");
+#endif
+       printf("       -a <address>   - Bind to IP address\n");
+       printf("       -b <port>      - Bind to port\n");
        printf("       -h             - Print this help\n");
        exit(0);
 }
@@ -131,11 +145,19 @@ void printhelp()
 int main(int argc, char **argv)
 {
        bool_t nodaemon = false;
+#ifdef _POSIX_PRIORITY_SCHEDULING
+       bool_t realtime = false;
+#endif
        char *conffile = NULL, *pidfile = NULL;
        int c;
+       struct utsname utsbuf;
        
        /* Arguments */
-       while ((c = getopt(argc, argv, "dp:c:h")) != EOF) {
+#ifdef _POSIX_PRIORITY_SCHEDULING
+       while ((c = getopt(argc, argv, "drp:c:a:b:h")) != EOF) {
+#else
+       while ((c = getopt(argc, argv, "dp:c:a:b:h")) != EOF) {
+#endif
                switch(c) {
                case 'c':
                        conffile = optarg;
@@ -143,12 +165,23 @@ int main(int argc, char **argv)
                case 'p':
                        pidfile = optarg;
                        break;
+               case 'a':
+                       bindaddr = optarg;
+                       break;
+               case 'b':
+                       bindport = atoi(optarg);
+                       break;
                case 'd':
                        nodaemon = true;
                        break;
                case 'h':
                        printhelp();
                        break;
+#ifdef _POSIX_PRIORITY_SCHEDULING
+               case 'r':
+                       realtime = true;
+                       break;
+#endif
                default:
                        fprintf(stderr, "Unrecognized option\n");
                        printhelp();
@@ -174,18 +207,33 @@ int main(int argc, char **argv)
        signal(SIGTSTP, SIG_IGN); /* ignore tty signals */
        signal(SIGTTOU, SIG_IGN);
        signal(SIGTTIN, SIG_IGN);
+       signal(SIGPIPE, SIG_IGN);
        signal(SIGHUP, signal_handler); /* catch hangup signal */
        signal(SIGTERM, signal_handler); /* catch kill signal */
-
+       
+       /* Build system string */
+       if (uname(&utsbuf) == 0) {
+               snprintf(system_string, 64, "%s %s", utsbuf.sysname, utsbuf.machine);
+               snprintf(version_string, 64, "%s", utsbuf.release);
+       }
+       else {
+               snprintf(system_string, 64, "unknown unknown");
+               snprintf(version_string, 64, "unknown");
+       }
+       
        /* Initializing */
-       SSL_init();
+       SSLi_init();
        Chan_init();
        Client_init();
 
-       setscheduler();
+#ifdef _POSIX_PRIORITY_SCHEDULING
+       if (realtime)
+               setscheduler();
+#endif
+       
        Server_run();
        
-       SSL_deinit();
+       SSLi_deinit();
        Chan_free();
        Log_free();
        Conf_deinit();