From fcd5dc86a545f6c40652b58873a1d95468cf4a1c Mon Sep 17 00:00:00 2001
From: Luca Deri <deri@ntop.org>
Date: Wed, 8 Aug 2018 17:46:39 +0200
Subject: [PATCH] Fixed #32 Minor help fixes

---
 CMakeLists.txt | 12 ++++++------
 edge.c         |  5 ++---
 n2n.c          |  8 ++------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e23268..e3087d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,25 +102,25 @@ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/doc/supernode.1.gz
                    DEPENDS ${PROJECT_SOURCE_DIR}/supernode.1
                   )
 
-add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/doc/n2n_v2.7.gz
-                   COMMAND gzip -c ${PROJECT_SOURCE_DIR}/n2n_v2.7 > ${PROJECT_BINARY_DIR}/doc/n2n_v2.7.gz
-                   DEPENDS ${PROJECT_SOURCE_DIR}/n2n_v2.7
+add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/doc/n2n.7.gz
+                   COMMAND gzip -c ${PROJECT_SOURCE_DIR}/n2n.7 > ${PROJECT_BINARY_DIR}/doc/n2n.7.gz
+                   DEPENDS ${PROJECT_SOURCE_DIR}/n2n.7
                   )
 
 add_custom_target(doc DEPENDS ${PROJECT_BINARY_DIR}/doc/edge.8.gz
                               ${PROJECT_BINARY_DIR}/doc/supernode.1.gz
-                              ${PROJECT_BINARY_DIR}/doc/n2n_v2.7.gz
+                              ${PROJECT_BINARY_DIR}/doc/n2n.7.gz
                  )
 
 set_source_files_properties(${PROJECT_BINARY_DIR}/doc/edge.8.gz
                             ${PROJECT_BINARY_DIR}/doc/supernode.1.gz
-                            ${PROJECT_BINARY_DIR}/doc/n2n_v2.7.gz
+                            ${PROJECT_BINARY_DIR}/doc/n2n.7.gz
                             PROPERTIES GENERATED 1)
 
 install(FILES ${PROJECT_BINARY_DIR}/doc/edge.8.gz
         DESTINATION /usr/share/man8)
 install(FILES ${PROJECT_BINARY_DIR}/doc/supernode.1.gz
         DESTINATION /usr/share/man1)
-install(FILES ${PROJECT_BINARY_DIR}/doc/n2n_v2.7.gz
+install(FILES ${PROJECT_BINARY_DIR}/doc/n2n.7.gz
         DESTINATION /usr/share/man7)
 endif(DEFINED UNIX)
diff --git a/edge.c b/edge.c
index d4b30eb..dc1aa8e 100644
--- a/edge.c
+++ b/edge.c
@@ -212,7 +212,7 @@ static void help() {
   printf("-r                       | Enable packet forwarding through n2n community.\n");
   printf("-E                       | Accept multicast MAC addresses (default=drop).\n");
   printf("-v                       | Make more verbose. Repeat as required.\n");
-  printf("-t                       | Management UDP Port (for multiple edges on a machine).\n");
+  printf("-t <port>                | Management UDP Port (for multiple edges on a machine).\n");
 
   printf("\nEnvironment variables:\n");
   printf("  N2N_KEY                | Encryption key (ASCII). Not with -K or -k.\n");
@@ -736,8 +736,7 @@ int main(int argc, char* argv[]) {
   eee.udp_mgmt_sock = open_socket(mgmt_port, 0 /* bind LOOPBACK */);
   
   if(eee.udp_mgmt_sock < 0) {
-    traceEvent(TRACE_ERROR, "Failed to bind management UDP port %u",
-	       (unsigned int)N2N_EDGE_MGMT_PORT);
+    traceEvent(TRACE_ERROR, "Failed to bind management UDP port %u", mgmt_port);
     return(-1);
   }
   
diff --git a/n2n.c b/n2n.c
index 443b212..bbda9e5 100644
--- a/n2n.c
+++ b/n2n.c
@@ -57,19 +57,15 @@ SOCKET open_socket(int local_port, int bind_any) {
   memset(&local_address, 0, sizeof(local_address));
   local_address.sin_family = AF_INET;
   local_address.sin_port = htons(local_port);
-  local_address.sin_addr.s_addr = htonl(bind_any?INADDR_ANY:INADDR_LOOPBACK);
+  local_address.sin_addr.s_addr = htonl(bind_any ? INADDR_ANY : INADDR_LOOPBACK);
   if(bind(sock_fd,(struct sockaddr*) &local_address, sizeof(local_address)) == -1) {
-    traceEvent(TRACE_ERROR, "Bind error [%s]\n", strerror(errno));
+    traceEvent(TRACE_ERROR, "Bind error on local port %u [%s]\n", local_port, strerror(errno));
     return(-1);
   }
 
   return(sock_fd);
 }
 
-
-
-
-
 int traceLevel = 2 /* NORMAL */;
 int useSyslog = 0, syslog_opened = 0;