-/* 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.
#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"
#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)
{
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);
}
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");
bool_t realtime = false;
char *conffile = NULL, *pidfile = NULL;
int c;
+ struct utsname utsbuf;
/* Arguments */
while ((c = getopt(argc, argv, "drp:c:h")) != EOF) {
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();
Server_run();
- SSL_deinit();
+ SSLi_deinit();
Chan_free();
Log_free();
Conf_deinit();