diff options
Diffstat (limited to 'pimd/pim_join.c')
| -rw-r--r-- | pimd/pim_join.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pimd/pim_join.c b/pimd/pim_join.c index b2e1b1a28a..5e96d39e8f 100644 --- a/pimd/pim_join.c +++ b/pimd/pim_join.c @@ -55,7 +55,7 @@ static void on_trace(const char *label, struct interface *ifp, static void recv_join(struct interface *ifp, struct pim_neighbor *neigh, uint16_t holdtime, struct in_addr upstream, - struct prefix_sg *sg, uint8_t source_flags) + pim_sgaddr *sg, uint8_t source_flags) { struct pim_interface *pim_ifp = NULL; @@ -87,8 +87,8 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh, struct pim_rpf *rp = RP(pim_ifp->pim, sg->grp); if (!rp) { - zlog_warn("%s: Lookup of RP failed for %pPSG4", - __func__, sg); + zlog_warn("%s: Lookup of RP failed for %pSG", __func__, + sg); return; } /* @@ -125,7 +125,7 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh, static void recv_prune(struct interface *ifp, struct pim_neighbor *neigh, uint16_t holdtime, struct in_addr upstream, - struct prefix_sg *sg, uint8_t source_flags) + pim_sgaddr *sg, uint8_t source_flags) { struct pim_interface *pim_ifp = NULL; @@ -160,7 +160,7 @@ static void recv_prune(struct interface *ifp, struct pim_neighbor *neigh, pim_inet4_dump("<received?>", sg->src, received_rp, sizeof(received_rp)); - zlog_debug("%s: Prune received with RP(%s) for %pPSG4", + zlog_debug("%s: Prune received with RP(%s) for %pSG", __func__, received_rp, sg); } @@ -247,7 +247,7 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh, /* Scan groups */ for (group = 0; group < msg_num_groups; ++group) { - struct prefix_sg sg; + pim_sgaddr sg; uint8_t msg_source_flags; uint16_t msg_num_joined_sources; uint16_t msg_num_pruned_sources; @@ -255,7 +255,7 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh, struct pim_ifchannel *starg_ch = NULL, *sg_ch = NULL; bool filtered = false; - memset(&sg, 0, sizeof(struct prefix_sg)); + memset(&sg, 0, sizeof(sg)); addr_offset = pim_parse_addr_group(&sg, buf, pastend - buf); if (addr_offset < 1) { return -5; |