diff options
| author | hrs <hrs@FreeBSD.org> | 2014-10-09 23:23:12 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2014-10-09 23:23:12 +0000 |
| commit | afd3460b013c46ed54db05663919efeff08de40c (patch) | |
| tree | 3846619bbe22b583495978e29ee5ffbbc4b1f2d5 | |
| parent | 5500c83bb6f1a11a88e41099ddf76cfdfd6c0e02 (diff) | |
| download | FreeBSD-src-afd3460b013c46ed54db05663919efeff08de40c.zip FreeBSD-src-afd3460b013c46ed54db05663919efeff08de40c.tar.gz | |
MFC r266177:
- Do not override sin6_scope_id in LLA when it is already set to non-zero.
This fixes destination list in output of netstat -r.
- Plug a memory leak.
- Add RTM_VERSION check.
| -rw-r--r-- | usr.bin/netstat/route.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index 3ddb17b..efcab5b 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -604,6 +604,8 @@ p_rtable_sysctl(int fibnum, int af) lim = buf + needed; for (next = buf; next < lim; next += rtm->rtm_msglen) { rtm = (struct rt_msghdr *)next; + if (rtm->rtm_version != RTM_VERSION) + continue; /* * Peek inside header to determine AF */ @@ -616,6 +618,7 @@ p_rtable_sysctl(int fibnum, int af) } p_rtentry_sysctl(rtm); } + free(buf); } static void @@ -993,9 +996,9 @@ in6_fillscopeid(struct sockaddr_in6 *sa6) if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr) || IN6_IS_ADDR_MC_NODELOCAL(&sa6->sin6_addr) || IN6_IS_ADDR_MC_LINKLOCAL(&sa6->sin6_addr)) { - /* XXX: override is ok? */ - sa6->sin6_scope_id = - ntohs(*(u_int16_t *)&sa6->sin6_addr.s6_addr[2]); + if (sa6->sin6_scope_id == 0) + sa6->sin6_scope_id = + ntohs(*(u_int16_t *)&sa6->sin6_addr.s6_addr[2]); sa6->sin6_addr.s6_addr[2] = sa6->sin6_addr.s6_addr[3] = 0; } #endif |
