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 /usr.sbin/ppp | |
| 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 'usr.sbin/ppp')
| -rw-r--r-- | usr.sbin/ppp/arp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c index e67f89b..b38b97a 100644 --- a/usr.sbin/ppp/arp.c +++ b/usr.sbin/ppp/arp.c @@ -91,7 +91,7 @@ */ static struct { struct rt_msghdr hdr; - struct sockaddr_inarp dst; + struct sockaddr_in dst; struct sockaddr_dl hwa; char extra[128]; } arpmsg; @@ -124,10 +124,9 @@ arp_ProxySub(struct bundle *bundle, struct in_addr addr, int add) arpmsg.hdr.rtm_seq = ++bundle->routing_seq; arpmsg.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY; arpmsg.hdr.rtm_inits = RTV_EXPIRE; - arpmsg.dst.sin_len = sizeof(struct sockaddr_inarp); + arpmsg.dst.sin_len = sizeof(struct sockaddr_in); arpmsg.dst.sin_family = AF_INET; arpmsg.dst.sin_addr.s_addr = addr.s_addr; - arpmsg.dst.sin_other = SIN_PROXY; arpmsg.hdr.rtm_msglen = (char *) &arpmsg.hwa - (char *) &arpmsg + arpmsg.hwa.sdl_len; |
