diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-08-02 10:38:11 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-12-22 02:26:05 +0100 |
| commit | 4ed0af7013a8885e7c18d7ed532b16c5be5f2df9 (patch) | |
| tree | fe7784732eff1c51ae06c5e52ebde044d489c516 /pimd/pim_zebra.c | |
| parent | pimd: Add rs_timer display (diff) | |
| download | frr-4ed0af7013a8885e7c18d7ed532b16c5be5f2df9.tar.xz frr-4ed0af7013a8885e7c18d7ed532b16c5be5f2df9.zip | |
lib, pimd: Fix borked up prefix code
Fix the struct prefix to be an actual struct prefix_sg.
This cleans up a bunch of code to make it look nicer.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_zebra.c')
| -rw-r--r-- | pimd/pim_zebra.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index 66550d9cb..b4fb07044 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -948,12 +948,12 @@ static int del_oif(struct channel_oil *channel_oil, void igmp_source_forward_start(struct igmp_source *source) { struct igmp_group *group; - struct prefix sg; + struct prefix_sg sg; int result; memset (&sg, 0, sizeof (struct prefix)); - sg.u.sg.src = source->source_addr; - sg.u.sg.grp = source->source_group->group_addr; + sg.src = source->source_addr; + sg.grp = source->source_group->group_addr; if (PIM_DEBUG_IGMP_TRACE) { zlog_debug("%s: (S,G)=%s igmp_sock=%d oif=%s fwd=%d", @@ -1056,12 +1056,12 @@ void igmp_source_forward_start(struct igmp_source *source) void igmp_source_forward_stop(struct igmp_source *source) { struct igmp_group *group; - struct prefix sg; + struct prefix_sg sg; int result; memset (&sg, 0, sizeof (struct prefix)); - sg.u.sg.src = source->source_addr; - sg.u.sg.grp = source->source_group->group_addr; + sg.src = source->source_addr; + sg.grp = source->source_group->group_addr; if (PIM_DEBUG_IGMP_TRACE) { zlog_debug("%s: (S,G)=%s igmp_sock=%d oif=%s fwd=%d", @@ -1119,8 +1119,8 @@ void pim_forward_start(struct pim_ifchannel *ch) char group_str[100]; char upstream_str[100]; - pim_inet4_dump("<source?>", ch->sg.u.sg.src, source_str, sizeof(source_str)); - pim_inet4_dump("<group?>", ch->sg.u.sg.grp, group_str, sizeof(group_str)); + pim_inet4_dump("<source?>", ch->sg.src, source_str, sizeof(source_str)); + pim_inet4_dump("<group?>", ch->sg.grp, group_str, sizeof(group_str)); pim_inet4_dump("<upstream?>", up->upstream_addr, upstream_str, sizeof(upstream_str)); zlog_debug("%s: (S,G)=(%s,%s) oif=%s(%s)", __PRETTY_FUNCTION__, @@ -1131,7 +1131,7 @@ void pim_forward_start(struct pim_ifchannel *ch) int input_iface_vif_index = fib_lookup_if_vif_index(up->upstream_addr); if (input_iface_vif_index < 1) { char source_str[100]; - pim_inet4_dump("<source?>", up->sg.u.sg.src, source_str, sizeof(source_str)); + pim_inet4_dump("<source?>", up->sg.src, source_str, sizeof(source_str)); zlog_warn("%s %s: could not find input interface for source %s", __FILE__, __PRETTY_FUNCTION__, source_str); |