diff options
| author | hasso <hasso> | 2005-05-25 21:00:28 +0000 |
|---|---|---|
| committer | hasso <hasso> | 2005-05-25 21:00:28 +0000 |
| commit | b5f29603399070041289729e175fbec085e8e904 (patch) | |
| tree | 320e22b39f6e0ff1f689f089898cb7b2ffc1cbf9 | |
| parent | 92c9f2229fea8fdef31a701d36d7df91f3e9905d (diff) | |
* bgpd.c: Fix obvious (routeserver patch) merge error. This makes "no
neighbor x.x.x.x routemap [export|import] commands work again.
Fixes bugzilla #184. [backport candidate]
| -rw-r--r-- | bgpd/ChangeLog | 5 | ||||
| -rw-r--r-- | bgpd/bgpd.c | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog index 686a6424..826b930f 100644 --- a/bgpd/ChangeLog +++ b/bgpd/ChangeLog @@ -1,3 +1,8 @@ +2005-05-25 Hasso Tepper <hasso at quagga.net> + + * bgpd.c: Fix obvious (routeserver patch) merge error. This makes "no + neighbor x.x.x.x routemap [export|import] commands work again. + 2005-05-23 Paul Jakma <paul@dishone.st> * bgp_routemap.c: add semi-colons to VTY_GET_* to match vty.h change diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 881a3c7b..c1995682 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -3642,12 +3642,10 @@ peer_aslist_unset (struct peer *peer,afi_t afi, safi_t safi, int direct) if (! peer->afc[afi][safi]) return BGP_ERR_PEER_INACTIVE; - if (direct != RMAP_IN && direct != RMAP_OUT && - direct != RMAP_IMPORT && direct != RMAP_EXPORT) + if (direct != FILTER_IN && direct != FILTER_OUT) return BGP_ERR_INVALID_VALUE; - if ( (direct == RMAP_OUT || direct == RMAP_IMPORT) - && peer_is_group_member (peer, afi, safi)) + if (direct == FILTER_OUT && peer_is_group_member (peer, afi, safi)) return BGP_ERR_INVALID_FOR_PEER_GROUP_MEMBER; filter = &peer->filter[afi][safi]; @@ -3803,10 +3801,12 @@ peer_route_map_unset (struct peer *peer, afi_t afi, safi_t safi, int direct) if (! peer->afc[afi][safi]) return BGP_ERR_PEER_INACTIVE; - if (direct != FILTER_IN && direct != FILTER_OUT) + if (direct != RMAP_IN && direct != RMAP_OUT && + direct != RMAP_IMPORT && direct != RMAP_EXPORT) return BGP_ERR_INVALID_VALUE; - if (direct == FILTER_OUT && peer_is_group_member (peer, afi, safi)) + if ( (direct == RMAP_OUT || direct == RMAP_IMPORT) + && peer_is_group_member (peer, afi, safi)) return BGP_ERR_INVALID_FOR_PEER_GROUP_MEMBER; filter = &peer->filter[afi][safi]; |