X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmain.c;h=8a0573ab41eaccdd7e2cb3345bbf0b2a85f3520a;hb=63c7b082aa8fd8f7323e25fa1337cc8de5c2d8d6;hp=cce178a1ffe458d90de0efd9fcb64aabc4ce580a;hpb=e5078110436f4461a1f70c364bab84e8b82b155d;p=umurmur.git

diff --git a/src/main.c b/src/main.c
index cce178a..8a0573a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -37,9 +37,12 @@
 #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"
@@ -49,18 +52,21 @@
 #include "version.h"
 
 char system_string[64], version_string[64];
+int bindport;
+char *bindaddr;
 
 void lockfile(const char *pidfile)
 {
 	int lfp;
 	char str[16];
 	
-	lfp = open(pidfile, O_RDWR|O_CREAT, 0640);
+	lfp = open(pidfile, O_RDWR|O_CREAT|O_EXCL, 0640);
 	
 	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 */
+	close(lfp);
 	Log_info("PID-file: %s", pidfile);
 }
 
@@ -107,6 +113,7 @@ void daemonize()
 		
 }
 
+#ifdef _POSIX_PRIORITY_SCHEDULING
 void setscheduler()
 {
 	int rc;
@@ -118,15 +125,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.%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);
 }
@@ -134,13 +146,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, "drp: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;
@@ -148,15 +166,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();
@@ -182,6 +208,7 @@ 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 */
 	
@@ -196,16 +223,18 @@ int main(int argc, char **argv)
 	}
 	
 	/* Initializing */
-	SSL_init();
+	SSLi_init();
 	Chan_init();
 	Client_init();
 
+#ifdef _POSIX_PRIORITY_SCHEDULING
 	if (realtime)
 		setscheduler();
+#endif
 	
 	Server_run();
 	
-	SSL_deinit();
+	SSLi_deinit();
 	Chan_free();
 	Log_free();
 	Conf_deinit();