From: Martin Johansson <martin@fatbob.nu>
Date: Wed, 13 Apr 2011 19:01:20 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/Diaoul/umurmur into Diaoul/master
X-Git-Url: http://git.code-monkey.de/?a=commitdiff_plain;h=1e4dd9a7812a66b0574df3c0af28dcf95008c5d3;hp=7e3d859ed53b6e53f6ec778cadd592c6284cd271;p=umurmur.git

Merge branch 'master' of git://github.com/Diaoul/umurmur into Diaoul/master
---

diff --git a/src/client.c b/src/client.c
index e304f35..e190a0b 100644
--- a/src/client.c
+++ b/src/client.c
@@ -690,7 +690,6 @@ int Client_read_udp()
 					memcpy(&itr->remote_udp, &from, sizeof(struct sockaddr_in));
 					break;
 				}
-				else Log_warn("Bad cryptstate from peer");
 			}
 		} /* while */
 	}
diff --git a/src/conf.c b/src/conf.c
index e3d417c..38b3285 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -40,7 +40,6 @@
 
 static config_t configuration;
 
-#define DEFAULT_CONFIG "/etc/umurmur.conf"
 #define DEFAULT_WELCOME "Welcome to uMurmur!"
 #define DEFAULT_MAX_CLIENTS 10
 #define DEFAULT_MAX_BANDWIDTH 48000
diff --git a/src/conf.h b/src/conf.h
index 0655446..32531f8 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -33,6 +33,8 @@
 
 #include "messages.h"
 
+#define DEFAULT_CONFIG "/etc/umurmur.conf"
+
 typedef enum param {
 	CERTIFICATE,
 	KEY,
diff --git a/src/main.c b/src/main.c
index fce997a..1e22885 100644
--- a/src/main.c
+++ b/src/main.c
@@ -217,16 +217,16 @@ void setscheduler()
 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 daemonize\n");
-	printf("       -p <pidfile>   - Write PID to this file\n");
-	printf("       -c <conf file> - Specify configuration file\n");
+	printf("Usage: umurmurd [-d] [-r] [-h] [-p <pidfile>] [-c <conf file>] [-a <addr>] [-b <port>]\n");
+	printf("       -d             - Do not daemonize - run in foreground.\n");
 #ifdef _POSIX_PRIORITY_SCHEDULING
 	printf("       -r             - Run with realtime priority\n");
 #endif
+	printf("       -h             - Print this help\n");
+	printf("       -p <pidfile>   - Write PID to this file\n");
+	printf("       -c <conf file> - Specify configuration file (default %s)\n", DEFAULT_CONFIG);
 	printf("       -a <address>   - Bind to IP address\n");
 	printf("       -b <port>      - Bind to port\n");
-	printf("       -h             - Print this help\n");
 	exit(0);
 }
 
diff --git a/src/version.h b/src/version.h
index f556d1f..606e5be 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,7 +1,7 @@
 #ifndef VERSION_H_989876
 #define VERSION_H_989876
 
-#define UMURMUR_VERSION "0.2.6"
+#define UMURMUR_VERSION "0.2.7"
 
 #endif