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

diff --git a/src/client.c b/src/client.c
index e304f35b25fea204e5d225d7d11cd9f24982803a..e190a0b9f67fa30f94ebed2fc8a6951dd8f9a765 100644 (file)
--- 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 e3d417c262b6c5004720d5c66ac5a4b18d1b2e4a..38b32852775c1727ffbd4c045515294a42c4f611 100644 (file)
--- 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 065544654b3f73ad4dfa08495d08f877dcbf73e8..32531f8653ed2874322a36802fc09f826aae0d9f 100644 (file)
--- 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 fce997a77a471f4201d3706e107f0e51ac1fee58..1e22885389947ed03be9ea01508c7d36d236f0b4 100644 (file)
--- 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 f556d1f3133f3550d33558d4f0715fdc97c7a58b..606e5bebc8611cad98e750189fa8440396b5f2a2 100644 (file)
--- 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