diff options
| author | hasso <hasso> | 2004-10-19 19:44:43 +0000 |
|---|---|---|
| committer | hasso <hasso> | 2004-10-19 19:44:43 +0000 |
| commit | 3fb9cd6ef456959b6eff939d5c316f6785c2dda4 (patch) | |
| tree | e350cb3ef7b20b8bbccfb1aa9309152311e845bd /bgpd | |
| parent | 5ae35f45f1292dce3a01f241accafeb2e59b10cc (diff) | |
OK. Here it is - PtP patch from Andrew J. Schorr. No problems with ospfd,
ripd might need some more testing though.
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/ChangeLog | 6 | ||||
| -rw-r--r-- | bgpd/bgp_nexthop.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog index 37ab163b..e82843be 100644 --- a/bgpd/ChangeLog +++ b/bgpd/ChangeLog @@ -1,3 +1,9 @@ +2004-10-19 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * bgp_nexthop.c: (bgp_connected_add) Connected destination pointer + may be NULL. + (bgp_connected_delete) ditto. + 2004-10-14 Hasso Tepper <hasso at quagga.net> * bgp_dump.c: Make dump configuration appear in vtysh. diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c index 4100e3df..c50eeedd 100644 --- a/bgpd/bgp_nexthop.c +++ b/bgpd/bgp_nexthop.c @@ -666,7 +666,7 @@ bgp_connected_add (struct connected *ifc) p.family = AF_INET; p.prefixlen = addr->prefixlen; - if (if_is_pointopoint (ifp)) + if (CONNECTED_POINTOPOINT_HOST(ifc)) p.u.prefix4 = dest->u.prefix4; else p.u.prefix4 = addr->u.prefix4; @@ -697,7 +697,7 @@ bgp_connected_add (struct connected *ifc) p.family = AF_INET6; p.prefixlen = addr->prefixlen; - if (if_is_pointopoint (ifp)) + if (if_is_pointopoint (ifp) && dest) p.u.prefix6 = dest->u.prefix6; else p.u.prefix6 = addr->u.prefix6; @@ -751,7 +751,7 @@ bgp_connected_delete (struct connected *ifc) p.family = AF_INET; p.prefixlen = addr->prefixlen; - if (if_is_pointopoint (ifp)) + if (CONNECTED_POINTOPOINT_HOST(ifc)) p.u.prefix4 = dest->u.prefix4; else p.u.prefix4 = addr->u.prefix4; @@ -782,7 +782,7 @@ bgp_connected_delete (struct connected *ifc) p.family = AF_INET6; p.prefixlen = addr->prefixlen; - if (if_is_pointopoint (ifp)) + if (if_is_pointopoint (ifp) && dest) p.u.prefix6 = dest->u.prefix6; else p.u.prefix6 = addr->u.prefix6; |