Stop trunctating netmask sockaddr

diff --git a/if-bsd.c b/if-bsd.c
index 420715e7453234d63f0e2ae67ddae51c29e55891..65a761d9797b73a007f953aa2ebf9bd7fe07cc1e 100644 (file)
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -195,7 +195,7 @@ if_route(const struct interface *iface, const struct in_addr *dest,
                struct rt_msghdr hdr;
                char buffer[sizeof(su) * 4];
        } rtm;
-       char *bp = rtm.buffer, *p;
+       char *bp = rtm.buffer;
        size_t l;
        int retval = 0;
 
@@ -250,20 +250,8 @@ if_route(const struct interface *iface, const struct in_addr *dest,
        } else
                ADDADDR(gate);
 
-       if (rtm.hdr.rtm_addrs & RTA_NETMASK) {
-               /* Ensure that netmask is set correctly */
-               memset(&su, 0, sizeof(su));
-               su.sin.sin_family = AF_INET;
-               su.sin.sin_len = sizeof(su.sin);
-               memcpy(&su.sin.sin_addr, &net->s_addr, sizeof(su.sin.sin_addr));
-               p = su.sa.sa_len + (char *)&su;
-               for (su.sa.sa_len = 0; p > (char *)&su;)
-                       if (*--p != 0) {
-                               su.sa.sa_len = 1 + p - (char *)&su;
-                               break;
-                       }
-               ADDSU(su);
-       }
+       if (rtm.hdr.rtm_addrs & RTA_NETMASK)
+               ADDADDR(net);
 
        if (rtm.hdr.rtm_addrs & RTA_IFA)
                ADDADDR(&iface->addr);