summaryrefslogtreecommitdiff
path: root/pimd/pim_assert.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2016-11-07 15:40:08 -0500
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-12-21 20:26:14 -0500
commitbce0e645214306808047f3ffd321abaa844c3e97 (patch)
tree1bfdbed0e6a583f146c80345f624552f4534750c /pimd/pim_assert.c
parent3fdfd9433ec8c6162043ffd6fe82085cf0fc1d8f (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_assert.c')
-rw-r--r--pimd/pim_assert.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c
index fced5dcd47..ca21786aea 100644
--- a/pimd/pim_assert.c
+++ b/pimd/pim_assert.c
@@ -226,7 +226,7 @@ int pim_assert_recv(struct interface *ifp,
struct in_addr src_addr,
uint8_t *buf, int buf_size)
{
- struct prefix msg_group_addr;
+ struct prefix_sg sg;
struct prefix msg_source_addr;
struct pim_assert_metric msg_metric;
int offset;
@@ -241,7 +241,7 @@ int pim_assert_recv(struct interface *ifp,
/*
Parse assert group addr
*/
- offset = pim_parse_addr_group (&msg_group_addr, curr, curr_size);
+ offset = pim_parse_addr_group (&sg, curr, curr_size);
if (offset < 1) {
char src_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", src_addr, src_str, sizeof(src_str));
@@ -301,7 +301,7 @@ int pim_assert_recv(struct interface *ifp,
char group_str[INET_ADDRSTRLEN];
pim_inet4_dump("<neigh?>", src_addr, neigh_str, sizeof(neigh_str));
pim_inet4_dump("<src?>", msg_source_addr.u.prefix4, source_str, sizeof(source_str));
- pim_inet4_dump("<grp?>", msg_group_addr.u.prefix4, group_str, sizeof(group_str));
+ pim_inet4_dump("<grp?>", sg.grp, group_str, sizeof(group_str));
zlog_debug("%s: from %s on %s: (S,G)=(%s,%s) pref=%u metric=%u rpt_bit=%u",
__PRETTY_FUNCTION__, neigh_str, ifp->name,
source_str, group_str,
@@ -314,7 +314,7 @@ int pim_assert_recv(struct interface *ifp,
return dispatch_assert(ifp,
msg_source_addr.u.prefix4,
- msg_group_addr.u.prefix4,
+ sg.grp,
msg_metric);
}