diff options
| author | sheldonh <sheldonh@FreeBSD.org> | 2000-08-02 11:38:20 +0000 |
|---|---|---|
| committer | sheldonh <sheldonh@FreeBSD.org> | 2000-08-02 11:38:20 +0000 |
| commit | cb57b94ee39b660cfc6b617c2551208cf58317b5 (patch) | |
| tree | fb36327bc743d30e739b5789da2091cd8d482bb4 /sbin/routed/table.c | |
| parent | 5f91d2827b0e159f290b14dfc001cedaeed3ba0b (diff) | |
| download | FreeBSD-src-cb57b94ee39b660cfc6b617c2551208cf58317b5.zip FreeBSD-src-cb57b94ee39b660cfc6b617c2551208cf58317b5.tar.gz | |
Resolve conflicts from vendor merge.
Diffstat (limited to 'sbin/routed/table.c')
| -rw-r--r-- | sbin/routed/table.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sbin/routed/table.c b/sbin/routed/table.c index 2258e1b..650d01f 100644 --- a/sbin/routed/table.c +++ b/sbin/routed/table.c @@ -60,7 +60,7 @@ int need_flash = 1; /* flash update needed struct timeval age_timer; /* next check of old routes */ struct timeval need_kern = { /* need to update kernel table */ - EPOCH+MIN_WAITTIME-1 + EPOCH+MIN_WAITTIME-1, 0 }; int stopint; @@ -352,7 +352,7 @@ ag_check(naddr dst, * then mark the suppressor redundant. */ if (AG_IS_REDUN(ag->ag_state) - && ag_cors->ag_mask==ag->ag_mask<<1) { + && ag_cors->ag_mask == ag->ag_mask<<1) { if (ag_cors->ag_dst_h == dst) ag_cors->ag_state |= AGS_REDUN0; else @@ -1627,8 +1627,8 @@ rtinit(void) #ifdef _HAVE_SIN_LEN -static struct sockaddr_in dst_sock = {sizeof(dst_sock), AF_INET}; -static struct sockaddr_in mask_sock = {sizeof(mask_sock), AF_INET}; +static struct sockaddr_in dst_sock = {sizeof(dst_sock), AF_INET, 0, {0}, {0}}; +static struct sockaddr_in mask_sock = {sizeof(mask_sock), AF_INET, 0, {0}, {0}}; #else static struct sockaddr_in_new dst_sock = {_SIN_ADDR_SIZE, AF_INET}; static struct sockaddr_in_new mask_sock = {_SIN_ADDR_SIZE, AF_INET}; @@ -1656,7 +1656,7 @@ rtget(naddr dst, naddr mask) struct rt_entry *rt; dst_sock.sin_addr.s_addr = dst; - mask_sock.sin_addr.s_addr = mask; + mask_sock.sin_addr.s_addr = htonl(mask); masktrim(&mask_sock); rt = (struct rt_entry *)rhead->rnh_lookup(&dst_sock,&mask_sock,rhead); if (!rt @@ -1707,7 +1707,7 @@ rtadd(naddr dst, if ((smask & ~mask) == 0 && mask > smask) state |= RS_SUBNET; } - mask_sock.sin_addr.s_addr = mask; + mask_sock.sin_addr.s_addr = htonl(mask); masktrim(&mask_sock); rt->rt_mask = mask; rt->rt_state = state; @@ -1847,7 +1847,7 @@ rtdelete(struct rt_entry *rt) } dst_sock.sin_addr.s_addr = rt->rt_dst; - mask_sock.sin_addr.s_addr = rt->rt_mask; + mask_sock.sin_addr.s_addr = htonl(rt->rt_mask); masktrim(&mask_sock); if (rt != (struct rt_entry *)rhead->rnh_deladdr(&dst_sock, &mask_sock, rhead)) { |
