X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmain.c;h=215049fedc08c1a16f4d81166389de9598d9d6ec;hb=0a60e8a7073f32e64073b17f35be0c9f34becbfa;hp=bcefa1d95382d32254d5ddb8fab2f6d247904f59;hpb=dd6d8317ca192df88c3503c1743dacf67c42600a;p=umurmur.git

diff --git a/src/main.c b/src/main.c
index bcefa1d..215049f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -42,8 +42,11 @@
 #include <string.h>
 #include <stdlib.h>
 #ifdef _POSIX_PRIORITY_SCHEDULING
+#if (_POSIX_PRIORITY_SCHEDULING > 0)
+#define POSIX_PRIORITY_SCHEDULING
 #include <sched.h>
 #endif
+#endif
 #include "server.h"
 #include "ssl.h"
 #include "channel.h"
@@ -200,7 +203,7 @@ void daemonize()
 		
 }
 
-#ifdef _POSIX_PRIORITY_SCHEDULING
+#ifdef POSIX_PRIORITY_SCHEDULING
 void setscheduler()
 {
 	int rc;
@@ -216,10 +219,11 @@ void setscheduler()
 
 void printhelp()
 {
-	printf("uMurmur version %s. Mumble protocol %d.%d.%d\n", UMURMUR_VERSION, PROTVER_MAJOR, PROTVER_MINOR, PROTVER_PATCH);
+	printf("uMurmur version %s ('%s'). Mumble protocol %d.%d.%d\n", UMURMUR_VERSION,
+	       UMURMUR_CODENAME, PROTVER_MAJOR, PROTVER_MINOR, PROTVER_PATCH);
 	printf("Usage: umurmurd [-d] [-r] [-h] [-p <pidfile>] [-t] [-c <conf file>] [-a <addr>] [-b <port>]\n");
 	printf("       -d             - Do not daemonize - run in foreground.\n");
-#ifdef _POSIX_PRIORITY_SCHEDULING
+#ifdef POSIX_PRIORITY_SCHEDULING
 	printf("       -r             - Run with realtime priority\n");
 #endif
 	printf("       -p <pidfile>   - Write PID to this file\n");
@@ -234,7 +238,7 @@ void printhelp()
 int main(int argc, char **argv)
 {
 	bool_t nodaemon = false;
-#ifdef _POSIX_PRIORITY_SCHEDULING
+#ifdef POSIX_PRIORITY_SCHEDULING
 	bool_t realtime = false;
 #endif
 	bool_t testconfig = false;
@@ -243,7 +247,7 @@ int main(int argc, char **argv)
 	struct utsname utsbuf;
 	
 	/* Arguments */
-#ifdef _POSIX_PRIORITY_SCHEDULING
+#ifdef POSIX_PRIORITY_SCHEDULING
 	while ((c = getopt(argc, argv, "drp:c:a:b:ht")) != EOF) {
 #else
 	while ((c = getopt(argc, argv, "dp:c:a:b:ht")) != EOF) {
@@ -270,7 +274,7 @@ int main(int argc, char **argv)
 		case 't':
 			testconfig = true;
 			break;
-#ifdef _POSIX_PRIORITY_SCHEDULING
+#ifdef POSIX_PRIORITY_SCHEDULING
 		case 'r':
 			realtime = true;
 			break;
@@ -333,14 +337,16 @@ int main(int argc, char **argv)
 	SSLi_init();
 	Chan_init();
 	Client_init();
+	Ban_init();
 
-#ifdef _POSIX_PRIORITY_SCHEDULING
+#ifdef POSIX_PRIORITY_SCHEDULING
 	if (realtime)
 		setscheduler();
 #endif
 	
 	Server_run();
 	
+	Ban_deinit();
 	SSLi_deinit();
 	Chan_free();
 	Log_free();