diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2013-02-08 16:10:16 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2013-02-08 16:10:16 +0000 |
| commit | d9a447559bc04121f7c6682e64abe67efa154864 (patch) | |
| tree | b2f038222ff8a70f687652441df00d2b564c8abe /usr.sbin/rarpd | |
| parent | 3cbf5f97aafc2b249c509ee1162c47c9b28e591e (diff) | |
| parent | fbda3d5daeeb730a49d025b614b35a32f0319718 (diff) | |
| download | src-d9a447559bc04121f7c6682e64abe67efa154864.tar.gz src-d9a447559bc04121f7c6682e64abe67efa154864.zip | |
Sync with HEAD.
Notes
Notes:
svn path=/projects/bmake/; revision=246555
Diffstat (limited to 'usr.sbin/rarpd')
| -rw-r--r-- | usr.sbin/rarpd/rarpd.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index f10a7da527f1..5386185485df 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -692,11 +692,10 @@ rarp_process(struct if_info *ii, u_char *pkt, u_int len) * host (i.e. the guy running rarpd), won't try to ARP for the hardware * address of the guy being booted (he cannot answer the ARP). */ -struct sockaddr_inarp sin_inarp = { - sizeof(struct sockaddr_inarp), AF_INET, 0, +struct sockaddr_in sin_inarp = { + sizeof(struct sockaddr_in), AF_INET, 0, {0}, {0}, - 0, 0 }; struct sockaddr_dl sin_dl = { sizeof(struct sockaddr_dl), AF_LINK, 0, IFT_ETHER, 0, 6, @@ -712,7 +711,7 @@ update_arptab(u_char *ep, in_addr_t ipaddr) { struct timespec tp; int cc; - struct sockaddr_inarp *ar, *ar2; + struct sockaddr_in *ar, *ar2; struct sockaddr_dl *ll, *ll2; struct rt_msghdr *rt; int xtype, xindex; @@ -740,7 +739,7 @@ update_arptab(u_char *ep, in_addr_t ipaddr) rt->rtm_addrs = RTA_DST; rt->rtm_type = RTM_GET; rt->rtm_seq = ++seq; - ar2 = (struct sockaddr_inarp *)rtmsg.rtspace; + ar2 = (struct sockaddr_in *)rtmsg.rtspace; bcopy(ar, ar2, sizeof(*ar)); rt->rtm_msglen = sizeof(*rt) + sizeof(*ar); errno = 0; |