proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 13:27:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* bgpd.c: Fix obvious (routeserver patch) merge error. This makes "no

Browse Source 
neighbor x.x.x.x routemap [export|import] commands work again.

	Fixes bugzilla #184. [backport candidate]
This commit is contained in:
hasso 2005-05-25 21:00:28 +00:00
parent 92c9f2229f
commit b5f2960339
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bgpd/ChangeLog
View File

@ -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

12
bgpd/bgpd.c
View File

@ -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];