diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-11-07 15:40:08 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-12-21 20:26:14 -0500 |
| commit | bce0e645214306808047f3ffd321abaa844c3e97 (patch) | |
| tree | 1bfdbed0e6a583f146c80345f624552f4534750c /pimd/pim_join.c | |
| parent | 3fdfd9433ec8c6162043ffd6fe82085cf0fc1d8f (diff) | |
pimd: Modify pim_parse_addr_group to use 'struct prefix_sg'
Modify the pim_parse_addr_group to use 'struct prefix_sg sg'.
This is the first of 2 commits to clean up this parsing to
be a bit better.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
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 2dc9d91529..15d73fd1bd 100644 --- a/pimd/pim_join.c +++ b/pimd/pim_join.c @@ -301,14 +301,14 @@ int pim_joinprune_recv(struct interface *ifp, /* Scan groups */ for (group = 0; group < msg_num_groups; ++group) { - struct prefix msg_group_addr; + struct prefix_sg sg; struct prefix msg_source_addr; uint8_t msg_source_flags; uint16_t msg_num_joined_sources; uint16_t msg_num_pruned_sources; int source; - addr_offset = pim_parse_addr_group (&msg_group_addr, + addr_offset = pim_parse_addr_group (&sg, buf, pastend - buf); if (addr_offset < 1) { return -5; @@ -337,11 +337,11 @@ int pim_joinprune_recv(struct interface *ifp, pim_inet4_dump("<src?>", src_addr, src_str, sizeof(src_str)); pim_inet4_dump("<addr?>", msg_upstream_addr.u.prefix4, upstream_str, sizeof(upstream_str)); - pim_inet4_dump("<grp?>", msg_group_addr.u.prefix4, + pim_inet4_dump("<grp?>", sg.grp, group_str, sizeof(group_str)); - zlog_warn("%s: join/prune upstream=%s group=%s/%d join_src=%d prune_src=%d from %s on %s", + zlog_warn("%s: join/prune upstream=%s group=%s/32 join_src=%d prune_src=%d from %s on %s", __PRETTY_FUNCTION__, - upstream_str, group_str, msg_group_addr.prefixlen, + upstream_str, group_str, msg_num_joined_sources, msg_num_pruned_sources, src_str, ifp->name); } @@ -359,7 +359,7 @@ int pim_joinprune_recv(struct interface *ifp, recv_join(ifp, neigh, msg_holdtime, msg_upstream_addr.u.prefix4, - msg_group_addr.u.prefix4, + sg.grp, msg_source_addr.u.prefix4, msg_source_flags); } @@ -377,7 +377,7 @@ int pim_joinprune_recv(struct interface *ifp, recv_prune(ifp, neigh, msg_holdtime, msg_upstream_addr.u.prefix4, - msg_group_addr.u.prefix4, + sg.grp, msg_source_addr.u.prefix4, msg_source_flags); } |