diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-08-02 04:38:11 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-12-21 20:26:05 -0500 |
| commit | 4ed0af7013a8885e7c18d7ed532b16c5be5f2df9 (patch) | |
| tree | fe7784732eff1c51ae06c5e52ebde044d489c516 /pimd/pim_br.c | |
| parent | ad6ec47b81a362ff1a2ef0a0c16d69401c2cc376 (diff) | |
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_br.c')
| -rw-r--r-- | pimd/pim_br.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pimd/pim_br.c b/pimd/pim_br.c index ceee40e716..3f84de79c8 100644 --- a/pimd/pim_br.c +++ b/pimd/pim_br.c @@ -30,7 +30,7 @@ #include "linklist.h" struct pim_br { - struct prefix sg; + struct prefix_sg sg; struct in_addr pmbr; }; @@ -39,14 +39,14 @@ struct in_addr pim_br_unknown = { .s_addr = 0 }; static struct list *pim_br_list = NULL; struct in_addr -pim_br_get_pmbr (struct prefix *sg) +pim_br_get_pmbr (struct prefix_sg *sg) { struct listnode *node; struct pim_br *pim_br; for (ALL_LIST_ELEMENTS_RO (pim_br_list, node, pim_br)) { - if (sg->u.sg.src.s_addr == pim_br->sg.u.sg.src.s_addr && - sg->u.sg.grp.s_addr == pim_br->sg.u.sg.grp.s_addr) + if (sg->src.s_addr == pim_br->sg.src.s_addr && + sg->grp.s_addr == pim_br->sg.grp.s_addr) return pim_br->pmbr; } @@ -54,14 +54,14 @@ pim_br_get_pmbr (struct prefix *sg) } void -pim_br_set_pmbr (struct prefix *sg, struct in_addr br) +pim_br_set_pmbr (struct prefix_sg *sg, struct in_addr br) { struct listnode *node, *next; struct pim_br *pim_br; for (ALL_LIST_ELEMENTS (pim_br_list, node, next, pim_br)) { - if (sg->u.sg.src.s_addr == pim_br->sg.u.sg.src.s_addr && - sg->u.sg.grp.s_addr == pim_br->sg.u.sg.grp.s_addr) + if (sg->src.s_addr == pim_br->sg.src.s_addr && + sg->grp.s_addr == pim_br->sg.grp.s_addr) break; } @@ -84,14 +84,14 @@ pim_br_set_pmbr (struct prefix *sg, struct in_addr br) * Remove the (S,G) from the stored values */ void -pim_br_clear_pmbr (struct prefix *sg) +pim_br_clear_pmbr (struct prefix_sg *sg) { struct listnode *node, *next; struct pim_br *pim_br; for (ALL_LIST_ELEMENTS (pim_br_list, node, next, pim_br)) { - if (sg->u.sg.src.s_addr == pim_br->sg.u.sg.src.s_addr && - sg->u.sg.grp.s_addr == pim_br->sg.u.sg.grp.s_addr) + if (sg->src.s_addr == pim_br->sg.src.s_addr && + sg->grp.s_addr == pim_br->sg.grp.s_addr) break; } |