proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-29 16:24:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15100 from donaldsharp/SA_problems_local

Browse Source 
Sa problems local
This commit is contained in:
Donatas Abraitis 2024-01-10 12:17:19 +02:00 committed by GitHub
commit 26be39c2f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_packet.c
View File

@ -3349,7 +3349,7 @@ static void bgp_dynamic_capability_fqdn(uint8_t *pnt, int action,
memcpy(&str, data, len); memcpy(&str, data, len);
str[len] = '\0'; str[len] = '\0';
} }
data += len; /* data += len; In case new code is ever added */
if (len) { if (len) {
XFREE(MTYPE_BGP_PEER_HOST, peer->domainname); XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);

8
bgpd/bgp_snmp_bgp4v2.c
View File

@ -436,7 +436,6 @@ bgp4v2PathAttrLookup(struct variable *v, oid name[], size_t *length,
struct bgp_path_info *path, *min; struct bgp_path_info *path, *min;
struct bgp_dest *dest; struct bgp_dest *dest;
union sockunion su; union sockunion su;
unsigned int len;
struct ipaddr paddr = {}; struct ipaddr paddr = {};
size_t namelen = v ? v->namelen : BGP4V2_NLRI_ENTRY_OFFSET; size_t namelen = v ? v->namelen : BGP4V2_NLRI_ENTRY_OFFSET;
sa_family_t family; sa_family_t family;
@ -544,11 +543,9 @@ bgp4v2PathAttrLookup(struct variable *v, oid name[], size_t *length,
/* Set OID offset for prefix type */ /* Set OID offset for prefix type */
offset = name + namelen; offset = name + namelen;
offsetlen = *length - namelen; offsetlen = *length - namelen;
len = offsetlen;
if (offsetlen == 0) { if (offsetlen == 0) {
dest = bgp_table_top(bgp->rib[afi][SAFI_UNICAST]); dest = bgp_table_top(bgp->rib[afi][SAFI_UNICAST]);
safi = SAFI_UNICAST;
} else { } else {
/* bgp4V2NlriAfi is already get */ /* bgp4V2NlriAfi is already get */
@ -595,11 +592,6 @@ bgp4v2PathAttrLookup(struct variable *v, oid name[], size_t *length,
return NULL; return NULL;
if (offsetlen > 0) { if (offsetlen > 0) {
len = offsetlen;
if (len > afi_len)
len = afi_len;
/* get bgp4V2PeerRemoteAddrType */ /* get bgp4V2PeerRemoteAddrType */
peer_addr_type = *offset; peer_addr_type = *offset;
if (peer_addr_type == IANA_AFI_IPV4) if (peer_addr_type == IANA_AFI_IPV4)

2
ospf6d/ospf6_neighbor.c
View File

@ -741,7 +741,7 @@ DEFPY(ipv6_ospf6_p2xp_neigh, ipv6_ospf6_p2xp_neigh_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
p2xp_cfg = ospf6_if_p2xp_get(oi, &neighbor); (void)ospf6_if_p2xp_get(oi, &neighbor);
return CMD_SUCCESS; return CMD_SUCCESS;
} }

2
pimd/pim_upstream.c
View File

@ -909,7 +909,7 @@ static struct pim_upstream *pim_upstream_new(struct pim_instance *pim,
* Set the right RPF so that future changes will * Set the right RPF so that future changes will
* be right * be right
*/ */
rpf_result = pim_rpf_update(pim, up, NULL, __func__); (void)pim_rpf_update(pim, up, NULL, __func__);
pim_upstream_keep_alive_timer_start( pim_upstream_keep_alive_timer_start(
up, pim->keep_alive_time); up, pim->keep_alive_time);
} }

8
zebra/redistribute.c
View File

@ -332,6 +332,14 @@ void redistribute_delete(const struct route_node *rn,
/* Send a delete for the 'old' re to any subscribed client. */ /* Send a delete for the 'old' re to any subscribed client. */
if (zebra_redistribute_check(rn, old_re, client)) { if (zebra_redistribute_check(rn, old_re, client)) {
/*
* SA is complaining that old_re could be false
* SA is wrong because old_re is checked for NULL
* in zebra_redistribute_check and false is
* returned in that case. Let's just make SA
* happy.
*/
assert(old_re);
is_table_direct = zebra_redistribute_is_table_direct(old_re); is_table_direct = zebra_redistribute_is_table_direct(old_re);
zsend_redistribute_route(ZEBRA_REDISTRIBUTE_ROUTE_DEL, zsend_redistribute_route(ZEBRA_REDISTRIBUTE_ROUTE_DEL,
client, rn, old_re, client, rn, old_re,