Reduce log verbosity at level 3, with a focus on removing excessive log verbosity generated by port-share activity.

Version 2.1.3k

git-svn-id: http://svn.openvpn.net/projects/branches/BETA21@7033 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 19 insertions, 15 deletions

diff --git a/socket.c b/socket.c
index 8153209..8e58250 100644
--- a/socket.c
+++ b/socket.c
@@ -1551,21 +1551,25 @@ link_socket_init_phase2 (struct link_socket *sock,
 #endif
 
   /* print local address */
-  if (sock->inetd)
-    msg (M_INFO, "%s link local: [inetd]", proto2ascii (sock->info.proto, true));
-  else
-    msg (M_INFO, "%s link local%s: %s",
+  {
+    const int msglevel = (sock->mode == LS_MODE_TCP_ACCEPT_FROM) ? D_INIT_MEDIUM : M_INFO;
+
+    if (sock->inetd)
+      msg (msglevel, "%s link local: [inetd]", proto2ascii (sock->info.proto, true));
+    else
+      msg (msglevel, "%s link local%s: %s",
+	   proto2ascii (sock->info.proto, true),
+	   (sock->bind_local ? " (bound)" : ""),
+	   print_sockaddr_ex (&sock->info.lsa->local, ":", sock->bind_local ? PS_SHOW_PORT : 0, &gc));
+
+    /* print active remote address */
+    msg (msglevel, "%s link remote: %s",
 	 proto2ascii (sock->info.proto, true),
-	 (sock->bind_local ? " (bound)" : ""),
-	 print_sockaddr_ex (&sock->info.lsa->local, ":", sock->bind_local ? PS_SHOW_PORT : 0, &gc));
-
-  /* print active remote address */
-  msg (M_INFO, "%s link remote: %s",
-       proto2ascii (sock->info.proto, true),
-       print_link_socket_actual_ex (&sock->info.lsa->actual,
-				    ":",
-				    PS_SHOW_PORT_IF_DEFINED,
-				    &gc));
+	 print_link_socket_actual_ex (&sock->info.lsa->actual,
+				      ":",
+				      PS_SHOW_PORT_IF_DEFINED,
+				      &gc));
+  }
 
  done:
   if (sig_save && signal_received)
@@ -1594,7 +1598,7 @@ link_socket_close (struct link_socket *sock)
 #endif
 	  if (!gremlin)
 	    {
-	      msg (D_CLOSE, "TCP/UDP: Closing socket");
+	      msg (D_LOW, "TCP/UDP: Closing socket");
 	      if (openvpn_close_socket (sock->sd))
 		msg (M_WARN | M_ERRNO_SOCK, "TCP/UDP: Close Socket failed");
 	    }