diff options
| author | glebius <glebius@FreeBSD.org> | 2013-01-31 08:55:21 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2013-01-31 08:55:21 +0000 |
| commit | 7f832c3059b3b2f864f0b1f3fac0c4ed8e268b27 (patch) | |
| tree | e3ea2bc458475248ba21882d2e6ebd842532550e /sys/netinet/in.c | |
| parent | e33dc79d8ee6e651f229bdeddaa7109185cb20db (diff) | |
| download | FreeBSD-src-7f832c3059b3b2f864f0b1f3fac0c4ed8e268b27.zip FreeBSD-src-7f832c3059b3b2f864f0b1f3fac0c4ed8e268b27.tar.gz | |
Retire struct sockaddr_inarp.
Since ARP and routing are separated, "proxy only" entries
don't have any meaning, thus we don't need additional field
in sockaddr to pass SIN_PROXY flag.
New kernel is binary compatible with old tools, since sizes
of sockaddr_inarp and sockaddr_in match, and sa_family are
filled with same value.
The structure declaration is left for compatibility with
third party software, but in tree code no longer use it.
Reviewed by: ru, andre, net@
Diffstat (limited to 'sys/netinet/in.c')
| -rw-r--r-- | sys/netinet/in.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 2b805c6..3ddb46c 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1494,7 +1494,7 @@ in_lltable_dump(struct lltable *llt, struct sysctl_req *wr) /* XXX stack use */ struct { struct rt_msghdr rtm; - struct sockaddr_inarp sin; + struct sockaddr_in sin; struct sockaddr_dl sdl; } arpc; int error, i; @@ -1515,7 +1515,7 @@ in_lltable_dump(struct lltable *llt, struct sysctl_req *wr) /* * produce a msg made of: * struct rt_msghdr; - * struct sockaddr_inarp; (IPv4) + * struct sockaddr_in; (IPv4) * struct sockaddr_dl; */ bzero(&arpc, sizeof(arpc)); @@ -1529,12 +1529,8 @@ in_lltable_dump(struct lltable *llt, struct sysctl_req *wr) arpc.sin.sin_addr.s_addr = SIN(lle)->sin_addr.s_addr; /* publish */ - if (lle->la_flags & LLE_PUB) { + if (lle->la_flags & LLE_PUB) arpc.rtm.rtm_flags |= RTF_ANNOUNCE; - /* proxy only */ - if (lle->la_flags & LLE_PROXY) - arpc.sin.sin_other = SIN_PROXY; - } sdl = &arpc.sdl; sdl->sdl_family = AF_LINK; |
