diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/IPXrouted/startup.c | 8 | ||||
| -rw-r--r-- | usr.sbin/arp/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/arp/arp.c | 12 | ||||
| -rw-r--r-- | usr.sbin/rwhod/rwhod.c | 6 |
4 files changed, 9 insertions, 19 deletions
diff --git a/usr.sbin/IPXrouted/startup.c b/usr.sbin/IPXrouted/startup.c index 5c87de00acbc3..2b9ccfac3658b 100644 --- a/usr.sbin/IPXrouted/startup.c +++ b/usr.sbin/IPXrouted/startup.c @@ -81,15 +81,11 @@ quit(s) } struct rt_addrinfo info; -/* Sleazy use of local variables throughout file, warning!!!! */ +/* XXX Sleazy use of local variables throughout file, warning!!!! */ #define netmask info.rti_info[RTAX_NETMASK] #define ifaaddr info.rti_info[RTAX_IFA] #define brdaddr info.rti_info[RTAX_BRD] -#define ROUNDUP(a) \ - ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) -#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) - void rt_xaddrs(cp, cplim, rtinfo) register caddr_t cp, cplim; @@ -103,7 +99,7 @@ rt_xaddrs(cp, cplim, rtinfo) if ((rtinfo->rti_addrs & (1 << i)) == 0) continue; rtinfo->rti_info[i] = sa = (struct sockaddr *)cp; - ADVANCE(cp, sa); + cp += SA_SIZE(sa); } } diff --git a/usr.sbin/arp/Makefile b/usr.sbin/arp/Makefile index 6ca9dd204ffd4..faa0ab998a02d 100644 --- a/usr.sbin/arp/Makefile +++ b/usr.sbin/arp/Makefile @@ -4,6 +4,6 @@ PROG= arp MAN= arp.4 arp.8 -WARNS?= 3 +WARNS?= 5 .include <bsd.prog.mk> diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index 4934cce0d1b1c..eb49ee2ad963f 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -113,8 +113,6 @@ static int expire_time, flags, doing_proxy, proxy_only; #define F_REPLACE 4 #define F_DELETE 5 -#define ROUNDUP(a) \ - ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) #define SETFUNC(f) { if (func) usage(); func = (f); } int @@ -319,7 +317,7 @@ tryagain: return (1); } addr = (struct sockaddr_inarp *)(rtm + 1); - sdl = (struct sockaddr_dl *)(ROUNDUP(addr->sin_len) + (char *)addr); + sdl = (struct sockaddr_dl *)(SA_SIZE(addr) + (char *)addr); if (addr->sin_addr.s_addr == sin_m.sin_addr.s_addr) { if (sdl->sdl_family == AF_LINK && (rtm->rtm_flags & RTF_LLINFO) && @@ -417,7 +415,7 @@ tryagain: return (1); } addr = (struct sockaddr_inarp *)(rtm + 1); - sdl = (struct sockaddr_dl *)(ROUNDUP(addr->sin_len) + (char *)addr); + sdl = (struct sockaddr_dl *)(SA_SIZE(addr) + (char *)addr); if (addr->sin_addr.s_addr == sin_m.sin_addr.s_addr) { if (sdl->sdl_family == AF_LINK && (rtm->rtm_flags & RTF_LLINFO) && @@ -484,7 +482,7 @@ search(u_long addr, action_fn *action) for (next = buf; next < lim; next += rtm->rtm_msglen) { rtm = (struct rt_msghdr *)next; sin2 = (struct sockaddr_inarp *)(rtm + 1); - (char *)sdl = (char *)sin2 + ROUNDUP(sin2->sin_len); + (char *)sdl = (char *)sin2 + SA_SIZE(sin2); if (rifname && if_indextoname(sdl->sdl_index, ifname) && strcmp(ifname, rifname)) continue; @@ -537,7 +535,7 @@ print_entry(struct sockaddr_dl *sdl, printf(" published (proxy only)"); if (rtm->rtm_addrs & RTA_NETMASK) { addr = (struct sockaddr_inarp *) - (ROUNDUP(sdl->sdl_len) + (char *)sdl); + (SA_SIZE(sdl) + (char *)sdl); if (addr->sin_addr.s_addr == 0xffffffff) printf(" published"); if (addr->sin_len != 8) @@ -673,7 +671,7 @@ rtmsg(int cmd) } #define NEXTADDR(w, s) \ if (rtm->rtm_addrs & (w)) { \ - bcopy((char *)&s, cp, sizeof(s)); cp += ROUNDUP(sizeof(s));} + bcopy((char *)&s, cp, sizeof(s)); cp += SA_SIZE(&s);} NEXTADDR(RTA_DST, sin_m); NEXTADDR(RTA_GATEWAY, sdl_m); diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c index 96514becbf81e..ab06d97e263e6 100644 --- a/usr.sbin/rwhod/rwhod.c +++ b/usr.sbin/rwhod/rwhod.c @@ -525,10 +525,6 @@ quit(msg) exit(1); } -#define ROUNDUP(a) \ - ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) -#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) - void rt_xaddrs(cp, cplim, rtinfo) register caddr_t cp, cplim; @@ -542,7 +538,7 @@ rt_xaddrs(cp, cplim, rtinfo) if ((rtinfo->rti_addrs & (1 << i)) == 0) continue; rtinfo->rti_info[i] = sa = (struct sockaddr *)cp; - ADVANCE(cp, sa); + cp += SA_SIZE(sa); } } |