X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmain.c;h=a4c1c12b3182045174f8af9e8ee0c106d6e8bcc9;hb=f1a666fa49ec318684c76148912a734a01e194a7;hp=8aa6c8d4ce37fd1bbde854fa7f2cd9b4d73b9e2a;hpb=0d0a9ec38247be23ea741dd0d510e3980919af54;p=umurmur.git

diff --git a/src/main.c b/src/main.c
index 8aa6c8d..a4c1c12 100644
--- 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,10 +34,13 @@
 #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>
 
 #include "server.h"
 #include "ssl.h"
@@ -45,8 +48,9 @@
 #include "log.h"
 #include "client.h"
 #include "conf.h"
+#include "version.h"
 
-#define UMURMUR_VERSION "0.1.3"
+char system_string[64], version_string[64];
 
 void lockfile(const char *pidfile)
 {
@@ -57,7 +61,7 @@ void lockfile(const char *pidfile)
 	
 	if (lfp < 0)
 		Log_fatal("Cannot open PID-file %s for writing", pidfile);
-	sprintf(str,"%d\n",getpid());
+	sprintf(str,"%d\n", getpid());
 	write(lfp, str, strlen(str)); /* record pid to lockfile */
 	Log_info("PID-file: %s", pidfile);
 }
@@ -119,7 +123,7 @@ void setscheduler()
 
 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("       -p <pidfile>   - Write PID to this file\n");
@@ -135,6 +139,7 @@ int main(int argc, char **argv)
 	bool_t realtime = false;
 	char *conffile = NULL, *pidfile = NULL;
 	int c;
+	struct utsname utsbuf;
 	
 	/* Arguments */
 	while ((c = getopt(argc, argv, "drp:c:h")) != EOF) {
@@ -179,11 +184,22 @@ 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();
 
@@ -192,7 +208,7 @@ int main(int argc, char **argv)
 	
 	Server_run();
 	
-	SSL_deinit();
+	SSLi_deinit();
 	Chan_free();
 	Log_free();
 	Conf_deinit();