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

pimd: Modify in_addr to pim_addr in pim_assert_metric

Browse Source 
This change is to accomodate IPv6 and IPv4 in the same code.
Based on pimd or pim6d, this will be compiled.
Reviewed-by: Sarita Patra <saritap@vmware.com>
Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
This commit is contained in:
Mobashshera Rasool 2021-12-13 22:28:46 -08:00
parent b85201d5cd
commit 95d516622b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pimd/pim_assert.c
View File

@ -65,9 +65,9 @@ void pim_ifassert_winner_set(struct pim_ifchannel *ch,
char was_str[INET_ADDRSTRLEN]; char was_str[INET_ADDRSTRLEN];
char winner_str[INET_ADDRSTRLEN]; char winner_str[INET_ADDRSTRLEN];
pim_inet4_dump("<was?>", ch->ifassert_winner, was_str, pim_inet4_dump("<was?>", ch->ifassert_winner, was_str,
sizeof(was_str)); sizeof(was_str));
pim_inet4_dump("<winner?>", winner, winner_str, pim_inet4_dump("<winner?>", winner, winner_str,
sizeof(winner_str)); sizeof(winner_str));
zlog_debug( zlog_debug(
"%s: (S,G)=%s assert winner changed from %s to %s on interface %s", "%s: (S,G)=%s assert winner changed from %s to %s on interface %s",
__func__, ch->sg_str, was_str, winner_str, __func__, ch->sg_str, was_str, winner_str,
@ -339,7 +339,7 @@ int pim_assert_metric_better(const struct pim_assert_metric *m1,
if (m1->route_metric > m2->route_metric) if (m1->route_metric > m2->route_metric)
return 0; return 0;
return ntohl(m1->ip_address.s_addr) > ntohl(m2->ip_address.s_addr); return pim_addr_cmp(m1->ip_address, m2->ip_address) > 0;
} }
int pim_assert_metric_match(const struct pim_assert_metric *m1, int pim_assert_metric_match(const struct pim_assert_metric *m1,
@ -352,7 +352,7 @@ int pim_assert_metric_match(const struct pim_assert_metric *m1,
if (m1->route_metric != m2->route_metric) if (m1->route_metric != m2->route_metric)
return 0; return 0;
return m1->ip_address.s_addr == m2->ip_address.s_addr; return !pim_addr_cmp(m1->ip_address, m2->ip_address);
} }
int pim_assert_build_msg(uint8_t *pim_msg, int buf_size, struct interface *ifp, int pim_assert_build_msg(uint8_t *pim_msg, int buf_size, struct interface *ifp,

2
pimd/pim_assert.h
View File

@ -37,7 +37,7 @@ struct pim_assert_metric {
uint32_t rpt_bit_flag; uint32_t rpt_bit_flag;
uint32_t metric_preference; uint32_t metric_preference;
uint32_t route_metric; uint32_t route_metric;
struct in_addr ip_address; /* neighbor router that sourced the Assert pim_addr ip_address; /* neighbor router that sourced the Assert
message */ message */
}; };