projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix issue 11: Typo
[umurmur.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index cce178a1ffe458d90de0efd9fcb64aabc4ce580a..70358e61ad88ebb71215f4f3041760e546044515 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-37,9
+37,12
@@
#include <sys/utsname.h>
#include <fcntl.h>
#include <signal.h>
#include <sys/utsname.h>
#include <fcntl.h>
#include <signal.h>
-#include <sched.h>
#include <errno.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 "server.h"
#include "ssl.h"
#include "channel.h"
@@
-49,6
+52,8
@@
#include "version.h"
char system_string[64], version_string[64];
#include "version.h"
char system_string[64], version_string[64];
+int bindport;
+char *bindaddr;
void lockfile(const char *pidfile)
{
void lockfile(const char *pidfile)
{
@@
-59,7
+64,7
@@
void lockfile(const char *pidfile)
if (lfp < 0)
Log_fatal("Cannot open PID-file %s for writing", pidfile);
if (lfp < 0)
Log_fatal("Cannot open PID-file %s for writing", pidfile);
- s
printf(str
,"%d\n", getpid());
+ s
nprintf(str,16
,"%d\n", getpid());
write(lfp, str, strlen(str)); /* record pid to lockfile */
Log_info("PID-file: %s", pidfile);
}
write(lfp, str, strlen(str)); /* record pid to lockfile */
Log_info("PID-file: %s", pidfile);
}
@@
-107,6
+112,7
@@
void daemonize()
}
}
+#ifdef _POSIX_PRIORITY_SCHEDULING
void setscheduler()
{
int rc;
void setscheduler()
{
int rc;
@@
-118,15
+124,20
@@
void setscheduler()
if (rc < 0)
Log_warn("Failed to set scheduler: %s", strerror(errno));
}
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");
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 d
ea
monize\n");
+ printf(" -d - Do not d
ae
monize\n");
printf(" -p <pidfile> - Write PID to this file\n");
printf(" -c <conf file> - Specify configuration file\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");
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);
}
printf(" -h - Print this help\n");
exit(0);
}
@@
-134,13
+145,19
@@
void printhelp()
int main(int argc, char **argv)
{
bool_t nodaemon = false;
int main(int argc, char **argv)
{
bool_t nodaemon = false;
+#ifdef _POSIX_PRIORITY_SCHEDULING
bool_t realtime = false;
bool_t realtime = false;
+#endif
char *conffile = NULL, *pidfile = NULL;
int c;
struct utsname utsbuf;
/* Arguments */
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;
switch(c) {
case 'c':
conffile = optarg;
@@
-148,15
+165,23
@@
int main(int argc, char **argv)
case 'p':
pidfile = optarg;
break;
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;
case 'd':
nodaemon = true;
break;
case 'h':
printhelp();
break;
+#ifdef _POSIX_PRIORITY_SCHEDULING
case 'r':
realtime = true;
break;
case 'r':
realtime = true;
break;
+#endif
default:
fprintf(stderr, "Unrecognized option\n");
printhelp();
default:
fprintf(stderr, "Unrecognized option\n");
printhelp();
@@
-182,6
+207,7
@@
int main(int argc, char **argv)
signal(SIGTSTP, SIG_IGN); /* ignore tty signals */
signal(SIGTTOU, SIG_IGN);
signal(SIGTTIN, SIG_IGN);
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 */
signal(SIGHUP, signal_handler); /* catch hangup signal */
signal(SIGTERM, signal_handler); /* catch kill signal */
@@
-196,16
+222,18
@@
int main(int argc, char **argv)
}
/* Initializing */
}
/* Initializing */
- SSL_init();
+ SSL
i
_init();
Chan_init();
Client_init();
Chan_init();
Client_init();
+#ifdef _POSIX_PRIORITY_SCHEDULING
if (realtime)
setscheduler();
if (realtime)
setscheduler();
+#endif
Server_run();
Server_run();
- SSL_deinit();
+ SSL
i
_deinit();
Chan_free();
Log_free();
Conf_deinit();
Chan_free();
Log_free();
Conf_deinit();