diff options
| -rw-r--r-- | bgpd/bgp_pbr.c | 5 | ||||
| -rw-r--r-- | bgpd/bgp_rd.c | 2 | ||||
| -rw-r--r-- | bgpd/bgp_route.c | 4 | ||||
| -rw-r--r-- | pimd/pim_msdp.c | 5 |
4 files changed, 6 insertions, 10 deletions
diff --git a/bgpd/bgp_pbr.c b/bgpd/bgp_pbr.c index 1054ea4027..5e36f91750 100644 --- a/bgpd/bgp_pbr.c +++ b/bgpd/bgp_pbr.c @@ -240,9 +240,8 @@ static int bgp_pbr_validate_policy_route(struct bgp_pbr_entry_main *api) * - combination src/dst => drop * - combination srcport + @IP */ - if (api->match_icmp_type_num || api->match_icmp_type_num - || api->match_packet_length_num || api->match_dscp_num - || api->match_tcpflags_num) { + if (api->match_icmp_type_num || api->match_packet_length_num + || api->match_dscp_num || api->match_tcpflags_num) { if (BGP_DEBUG(pbr, PBR)) { bgp_pbr_print_policy_route(api); zlog_debug("BGP: some SET actions not supported by Zebra. ignoring."); diff --git a/bgpd/bgp_rd.c b/bgpd/bgp_rd.c index 3f7ea16045..356a949d69 100644 --- a/bgpd/bgp_rd.c +++ b/bgpd/bgp_rd.c @@ -210,5 +210,5 @@ void form_auto_rd(struct in_addr router_id, prd->family = AF_UNSPEC; prd->prefixlen = 64; sprintf(buf, "%s:%hu", inet_ntoa(router_id), rd_id); - str2prefix_rd(buf, prd); + (void)str2prefix_rd(buf, prd); } diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 132fa5fc9d..390bdaeca3 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -2551,7 +2551,9 @@ static int bgp_maximum_prefix_restart_timer(struct thread *thread) "%s Maximum-prefix restart timer expired, restore peering", peer->host); - peer_clear(peer, NULL); + if ((peer_clear(peer, NULL) < 0) && bgp_debug_neighbor_events(peer)) + zlog_debug("%s: %s peer_clear failed", + __PRETTY_FUNCTION__, peer->host); return 0; } diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c index 7afc37a28e..e798d70a51 100644 --- a/pimd/pim_msdp.c +++ b/pimd/pim_msdp.c @@ -254,11 +254,6 @@ static struct pim_msdp_sa *pim_msdp_sa_new(struct pim_instance *pim, /* insert into misc tables for easy access */ sa = hash_get(pim->msdp.sa_hash, sa, hash_alloc_intern); - if (!sa) { - zlog_err("%s: PIM hash get failure", __PRETTY_FUNCTION__); - pim_msdp_sa_free(sa); - return NULL; - } listnode_add_sort(pim->msdp.sa_list, sa); if (PIM_DEBUG_MSDP_EVENTS) { |