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/output.c | |
| parent | 5f91d2827b0e159f290b14dfc001cedaeed3ba0b (diff) | |
| download | FreeBSD-src-cb57b94ee39b660cfc6b617c2551208cf58317b5.zip FreeBSD-src-cb57b94ee39b660cfc6b617c2551208cf58317b5.tar.gz | |
Resolve conflicts from vendor merge.
Diffstat (limited to 'sbin/routed/output.c')
| -rw-r--r-- | sbin/routed/output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/routed/output.c b/sbin/routed/output.c index 0545c34..013edd2 100644 --- a/sbin/routed/output.c +++ b/sbin/routed/output.c @@ -463,7 +463,7 @@ walk_supply(struct radix_node *rn, */ if ((RT->rt_state & RS_IF) && RT->rt_ifp != 0 - && (RT->rt_ifp->int_if_flags & IS_PASSIVE) + && (RT->rt_ifp->int_state & IS_PASSIVE) && !(RT->rt_state & RS_MHOME)) return 0; @@ -818,7 +818,7 @@ void rip_bcast(int flash) { #ifdef _HAVE_SIN_LEN - static struct sockaddr_in dst = {sizeof(dst), AF_INET}; + static struct sockaddr_in dst = {sizeof(dst), AF_INET, 0, {0}, {0}}; #else static struct sockaddr_in dst = {AF_INET}; #endif @@ -894,7 +894,7 @@ void rip_query(void) { #ifdef _HAVE_SIN_LEN - static struct sockaddr_in dst = {sizeof(dst), AF_INET}; + static struct sockaddr_in dst = {sizeof(dst), AF_INET, 0, {0}, {0}}; #else static struct sockaddr_in dst = {AF_INET}; #endif |
