proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-25 20:38:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2332 from donaldsharp/sa_42

Browse Source 
Sa 42
This commit is contained in:
Renato Westphal 2018-05-31 12:10:35 -03:00 committed by GitHub
commit 954b112276
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bgpd/bgp_pbr.c
View File

@ -240,9 +240,8 @@ static int bgp_pbr_validate_policy_route(struct bgp_pbr_entry_main *api)
* - combination src/dst => drop * - combination src/dst => drop
* - combination srcport + @IP * - combination srcport + @IP
*/ */
if (api->match_icmp_type_num || api->match_icmp_type_num if (api->match_icmp_type_num || api->match_packet_length_num
|| api->match_packet_length_num || api->match_dscp_num || api->match_dscp_num || api->match_tcpflags_num) {
|| api->match_tcpflags_num) {
if (BGP_DEBUG(pbr, PBR)) { if (BGP_DEBUG(pbr, PBR)) {
bgp_pbr_print_policy_route(api); bgp_pbr_print_policy_route(api);
zlog_debug("BGP: some SET actions not supported by Zebra. ignoring."); zlog_debug("BGP: some SET actions not supported by Zebra. ignoring.");

2
bgpd/bgp_rd.c
View File

@ -210,5 +210,5 @@ void form_auto_rd(struct in_addr router_id,
prd->family = AF_UNSPEC; prd->family = AF_UNSPEC;
prd->prefixlen = 64; prd->prefixlen = 64;
sprintf(buf, "%s:%hu", inet_ntoa(router_id), rd_id); sprintf(buf, "%s:%hu", inet_ntoa(router_id), rd_id);
str2prefix_rd(buf, prd); (void)str2prefix_rd(buf, prd);
} }

4
bgpd/bgp_route.c
View File

@ -2551,7 +2551,9 @@ static int bgp_maximum_prefix_restart_timer(struct thread *thread)
"%s Maximum-prefix restart timer expired, restore peering", "%s Maximum-prefix restart timer expired, restore peering",
peer->host); 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; return 0;
} }

5
pimd/pim_msdp.c
View File

@ -254,11 +254,6 @@ static struct pim_msdp_sa *pim_msdp_sa_new(struct pim_instance *pim,
/* insert into misc tables for easy access */ /* insert into misc tables for easy access */
sa = hash_get(pim->msdp.sa_hash, sa, hash_alloc_intern); 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); listnode_add_sort(pim->msdp.sa_list, sa);
if (PIM_DEBUG_MSDP_EVENTS) { if (PIM_DEBUG_MSDP_EVENTS) {