Ticket #587: route.c.2.patch

route.c

@@ -2644 +2644 @@
   seq = 0;
   rtm_addrs = RTA_DST | RTA_NETMASK;
 
-  bzero(&so_dst, sizeof(so_dst));
-  bzero(&so_mask, sizeof(so_mask));
-  bzero(&rtm, sizeof(struct rt_msghdr));
+  memset(&so_dst, 0, sizeof(so_dst));
+  memset(&so_mask, 0, sizeof(so_mask));
+  memset(&rtm, 0, sizeof(struct rt_msghdr));
 
   rtm.rtm_type = RTM_GET;
   rtm.rtm_flags = RTF_UP | RTF_GATEWAY;
@@ -2665 +2665 @@
   rtm.rtm_msglen = l = cp - (char *)&m_rtmsg;
 
   s = socket(PF_ROUTE, SOCK_RAW, 0);
+  if (s < 0)
+    {
+      msg(M_WARN|M_ERRNO, "Unable to open default gateway from route socket:");
+      gc_free (&gc);
+      close(s);
+      return;
+    }
 
   if (write(s, (char *)&m_rtmsg, l) < 0)
     {
@@ -2758 +2765 @@
   seq = 0;
   rtm_addrs = RTA_DST | RTA_NETMASK | RTA_IFP;
 
-  bzero(&m_rtmsg, sizeof(m_rtmsg));
-  bzero(&so_dst, sizeof(so_dst));
-  bzero(&so_mask, sizeof(so_mask));
-  bzero(&rtm, sizeof(struct rt_msghdr));
+  memset(&m_rtmsg, 0, sizeof(m_rtmsg));
+  memset(&so_dst, 0, sizeof(so_dst));
+  memset(&so_mask, 0, sizeof(so_mask));
+  memset(&rtm, 0, sizeof(struct rt_msghdr));
 
   rtm.rtm_type = RTM_GET;
   rtm.rtm_flags = RTF_UP | RTF_GATEWAY;
@@ -2965 +2972 @@
   seq = 0;
   rtm_addrs = RTA_DST | RTA_NETMASK;
 
-  bzero(&so_dst, sizeof(so_dst));
-  bzero(&so_mask, sizeof(so_mask));
-  bzero(&rtm, sizeof(struct rt_msghdr));
+  memset(&so_dat, 0, sizeof(so_dat));
+  memset(&so_mask, 0, sizeof(so_mask));
+  memset(&rtm, 0, sizeof(struct rt_msghdr));
 
   rtm.rtm_type = RTM_GET;
   rtm.rtm_flags = RTF_UP | RTF_GATEWAY;