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

Merge pull request #9980 from donaldsharp/pim_compile

Browse Source 
pimd: remove usage of inet_ntop
This commit is contained in:
Christian Hopps 2021-11-06 07:12:26 -04:00 committed by GitHub
commit 70eb6c94e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pimd/pim_join.c
View File

@ -1,3 +1,5 @@
/* /*
* PIM for Quagga * PIM for Quagga
* Copyright (C) 2008 Everton da Silva Marques * Copyright (C) 2008 Everton da Silva Marques
@ -56,7 +58,6 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh,
struct prefix_sg *sg, uint8_t source_flags) struct prefix_sg *sg, uint8_t source_flags)
{ {
struct pim_interface *pim_ifp = NULL; struct pim_interface *pim_ifp = NULL;
char buf[PREFIX_STRLEN];
if (PIM_DEBUG_PIM_TRACE) { if (PIM_DEBUG_PIM_TRACE) {
char up_str[INET_ADDRSTRLEN]; char up_str[INET_ADDRSTRLEN];
@ -109,9 +110,8 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh,
if (pim_is_grp_ssm(pim_ifp->pim, sg->grp)) { if (pim_is_grp_ssm(pim_ifp->pim, sg->grp)) {
zlog_warn( zlog_warn(
"%s: Specified Group(%s) in join is now in SSM, not allowed to create PIM state", "%s: Specified Group(%pI4) in join is now in SSM, not allowed to create PIM state",
__func__, __func__, &sg->grp);
inet_ntop(AF_INET, &sg->grp, buf, sizeof(buf)));
return; return;
} }

6
pimd/pim_register.c
View File

@ -323,7 +323,6 @@ int pim_register_recv(struct interface *ifp, struct in_addr dest_addr,
int i_am_rp = 0; int i_am_rp = 0;
struct pim_interface *pim_ifp = ifp->info; struct pim_interface *pim_ifp = ifp->info;
struct pim_instance *pim = pim_ifp->pim; struct pim_instance *pim = pim_ifp->pim;
char buf[PREFIX_STRLEN];
#define PIM_MSG_REGISTER_BIT_RESERVED_LEN 4 #define PIM_MSG_REGISTER_BIT_RESERVED_LEN 4
ip_hdr = (struct ip *)(tlv_buf + PIM_MSG_REGISTER_BIT_RESERVED_LEN); ip_hdr = (struct ip *)(tlv_buf + PIM_MSG_REGISTER_BIT_RESERVED_LEN);
@ -385,9 +384,8 @@ int pim_register_recv(struct interface *ifp, struct in_addr dest_addr,
if (pim_is_grp_ssm(pim_ifp->pim, sg.grp)) { if (pim_is_grp_ssm(pim_ifp->pim, sg.grp)) {
if (sg.src.s_addr == INADDR_ANY) { if (sg.src.s_addr == INADDR_ANY) {
zlog_warn( zlog_warn(
"%s: Received Register message for Group(%s) is now in SSM, dropping the packet", "%s: Received Register message for Group(%pI4) is now in SSM, dropping the packet",
__func__, __func__, &sg.grp);
inet_ntop(AF_INET, &sg.grp, buf, sizeof(buf)));
/* Drop Packet Silently */ /* Drop Packet Silently */
return 0; return 0;
} }