Merge remote-tracking branch 'origin/master' into pim_lib_work2

1 files changed, 1 insertions, 43 deletions

diff --git a/lib/smux.c b/lib/smux.c
index 82bf64f1c8..3abfadcd28 100644
--- a/lib/smux.c
+++ b/lib/smux.c
@@ -154,16 +154,10 @@ static int
 smux_socket (void)
 {
   int ret;
-#ifdef HAVE_IPV6
   struct addrinfo hints, *res0, *res;
   int gai;
-#else
-  struct sockaddr_in serv;
-  struct servent *sp;
-#endif
   int sock = 0;
 
-#ifdef HAVE_IPV6
   memset(&hints, 0, sizeof(hints));
   hints.ai_family = PF_UNSPEC;
   hints.ai_socktype = SOCK_STREAM;
@@ -183,9 +177,7 @@ smux_socket (void)
   for(res=res0; res; res=res->ai_next)
     {
       if (res->ai_family != AF_INET 
-#ifdef HAVE_IPV6
 	  && res->ai_family != AF_INET6
-#endif /* HAVE_IPV6 */
 	  )
 	continue;
 
@@ -206,40 +198,6 @@ smux_socket (void)
   freeaddrinfo(res0);
   if (sock < 0)
     zlog_warn ("Can't connect to SNMP agent with SMUX");
-#else
-  sock = socket (AF_INET, SOCK_STREAM, 0);
-  if (sock < 0)
-    {
-      zlog_warn ("Can't make socket for SNMP");
-      return -1;
-    }
-
-  memset (&serv, 0, sizeof (struct sockaddr_in));
-  serv.sin_family = AF_INET;
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-  serv.sin_len = sizeof (struct sockaddr_in);
-#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
-
-  sp = getservbyname ("smux", "tcp");
-  if (sp != NULL) 
-    serv.sin_port = sp->s_port;
-  else
-    serv.sin_port = htons (SMUX_PORT_DEFAULT);
-
-  serv.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-
-  sockopt_reuseaddr (sock);
-  sockopt_reuseport (sock);
-
-  ret = connect (sock, (struct sockaddr *) &serv, sizeof (struct sockaddr_in));
-  if (ret < 0)
-    {
-      close (sock);
-      smux_sock = -1;
-      zlog_warn ("Can't connect to SNMP agent with SMUX");
-      return -1;
-    }
-#endif
   return sock;
 }
 
@@ -922,7 +880,7 @@ smux_open (int sock)
   u_char *ptr;
   size_t len;
   long version;
-  const char progname[] = QUAGGA_PROGNAME "-" QUAGGA_VERSION;
+  const char progname[] = FRR_SMUX_NAME "-" FRR_VERSION;
 
   if (debug_smux)
     {