summaryrefslogtreecommitdiff
path: root/pimd/pim_join.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2016-11-07 15:45:40 -0500
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-12-21 20:26:14 -0500
commita7762e076597867bb75c8a60fb184f924035ed2e (patch)
treec0800948f074b9f33974f8ad8ac16147094ad698 /pimd/pim_join.c
parentbce0e645214306808047f3ffd321abaa844c3e97 (diff)
pimd: Modify pim_parse_addr_source to use 'struct prefix_sg'
Modify the pim_parse_addr_source function to take a 'struct prefix_sg' and to fill in the src data. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_join.c')
-rw-r--r--pimd/pim_join.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/pimd/pim_join.c b/pimd/pim_join.c
index 15d73fd1bd..3185b60108 100644
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@ -302,7 +302,6 @@ int pim_joinprune_recv(struct interface *ifp,
/* Scan groups */
for (group = 0; group < msg_num_groups; ++group) {
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;
@@ -348,7 +347,7 @@ int pim_joinprune_recv(struct interface *ifp,
/* Scan joined sources */
for (source = 0; source < msg_num_joined_sources; ++source) {
- addr_offset = pim_parse_addr_source (&msg_source_addr,
+ addr_offset = pim_parse_addr_source (&sg,
&msg_source_flags,
buf, pastend - buf);
if (addr_offset < 1) {
@@ -360,13 +359,13 @@ int pim_joinprune_recv(struct interface *ifp,
recv_join(ifp, neigh, msg_holdtime,
msg_upstream_addr.u.prefix4,
sg.grp,
- msg_source_addr.u.prefix4,
+ sg.src,
msg_source_flags);
}
/* Scan pruned sources */
for (source = 0; source < msg_num_pruned_sources; ++source) {
- addr_offset = pim_parse_addr_source (&msg_source_addr,
+ addr_offset = pim_parse_addr_source (&sg,
&msg_source_flags,
buf, pastend - buf);
if (addr_offset < 1) {
@@ -378,7 +377,7 @@ int pim_joinprune_recv(struct interface *ifp,
recv_prune(ifp, neigh, msg_holdtime,
msg_upstream_addr.u.prefix4,
sg.grp,
- msg_source_addr.u.prefix4,
+ sg.src,
msg_source_flags);
}