diff options
| author | paul <paul> | 2005-05-19 01:50:11 +0000 |
|---|---|---|
| committer | paul <paul> | 2005-05-19 01:50:11 +0000 |
| commit | 22db9dec63766cdf6dcd3ecb4b48177fb0e48143 (patch) | |
| tree | 3de4512bd147a2822c3af46aacc8822ea1083e78 /bgpd/bgp_routemap.c | |
| parent | 2ba9a37add807b1fbd103424b1365fac8fb2b78f (diff) | |
| download | quagga-22db9dec63766cdf6dcd3ecb4b48177fb0e48143.tar.bz2 quagga-22db9dec63766cdf6dcd3ecb4b48177fb0e48143.tar.xz | |
2005-05-19 Paul Jakma <paul@dishone.st>
* bgp_fsm.c: (bgp_stop) use sockunion_free, not XFREE..
* bgp_network.c: (bgp_getsockname) ditto
* bgp_routemap.c: (route_match_peer) ditto, als use a ret value and
remove one sockunion_free.
* bgpd.c: (peer_delete) ditto
Diffstat (limited to 'bgpd/bgp_routemap.c')
| -rw-r--r-- | bgpd/bgp_routemap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index 060c68c0..a9de457d 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -124,19 +124,19 @@ route_match_peer (void *rule, struct prefix *prefix, route_map_object_t type, su2 = sockunion_str2su ("0.0.0.0"); if ( sockunion_same (su, su2) ) { + int ret; if ( CHECK_FLAG (peer->rmap_type, PEER_RMAP_TYPE_NETWORK) || CHECK_FLAG (peer->rmap_type, PEER_RMAP_TYPE_REDISTRIBUTE) || CHECK_FLAG (peer->rmap_type, PEER_RMAP_TYPE_DEFAULT)) - { - XFREE (MTYPE_SOCKUNION, su2); - - return RMAP_MATCH; - } + ret = RMAP_MATCH; else - return RMAP_NOMATCH; + ret = RMAP_NOMATCH; + + sockunion_free (su2); + return ret; } - XFREE (MTYPE_SOCKUNION, su2); - + sockunion_free (su2); + if (! CHECK_FLAG (peer->sflags, PEER_STATUS_GROUP)) { if (sockunion_same (su, &peer->su)) |