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_oil.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_oil.c')
| -rw-r--r-- | pimd/pim_oil.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c index 8c7beeb97..d3895ea28 100644 --- a/pimd/pim_oil.c +++ b/pimd/pim_oil.c @@ -51,7 +51,7 @@ pim_del_channel_oil (struct channel_oil *c_oil) } static struct channel_oil * -pim_add_channel_oil (struct prefix *sg, +pim_add_channel_oil (struct prefix_sg *sg, int input_vif_index) { struct channel_oil *c_oil; @@ -71,8 +71,8 @@ pim_add_channel_oil (struct prefix *sg, return NULL; } - c_oil->oil.mfcc_mcastgrp = sg->u.sg.grp; - c_oil->oil.mfcc_origin = sg->u.sg.src; + c_oil->oil.mfcc_mcastgrp = sg->grp; + c_oil->oil.mfcc_origin = sg->src; c_oil->oil.mfcc_parent = input_vif_index; c_oil->oil_ref_count = 1; c_oil->installed = 0; @@ -82,21 +82,21 @@ pim_add_channel_oil (struct prefix *sg, return c_oil; } -static struct channel_oil *pim_find_channel_oil(struct prefix *sg) +static struct channel_oil *pim_find_channel_oil(struct prefix_sg *sg) { struct listnode *node; struct channel_oil *c_oil; for (ALL_LIST_ELEMENTS_RO(qpim_channel_oil_list, node, c_oil)) { - if ((sg->u.sg.grp.s_addr == c_oil->oil.mfcc_mcastgrp.s_addr) && - (sg->u.sg.src.s_addr == c_oil->oil.mfcc_origin.s_addr)) + if ((sg->grp.s_addr == c_oil->oil.mfcc_mcastgrp.s_addr) && + (sg->src.s_addr == c_oil->oil.mfcc_origin.s_addr)) return c_oil; } return 0; } -struct channel_oil *pim_channel_oil_add(struct prefix *sg, +struct channel_oil *pim_channel_oil_add(struct prefix_sg *sg, int input_vif_index) { struct channel_oil *c_oil; |