diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2022-01-04 17:54:44 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2022-01-12 18:24:25 +0100 |
| commit | 6fff2cc620f7762c550b1fe458d35e339608c464 (patch) | |
| tree | dfa2ecc90125b010c84c93890b3331d9af887def /pimd/pim_ifchannel.h | |
| parent | bedc005a7ae9fd9e087f69a55f30daf47ff9d4a9 (diff) | |
pimd: `prefix_sg` => `pim_sgaddr`
Mostly just 2 sed calls:
- `sed -e 's%struct prefix_sg%pim_sgaddr%g'`
- `sed -e 's%memset(&sg, 0, sizeof(pim_sgaddr));%memset(\&sg, 0, sizeof(sg));%g'`
Plus a bunch of fixing whatever that broke.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'pimd/pim_ifchannel.h')
| -rw-r--r-- | pimd/pim_ifchannel.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h index e266040697..ab405202e3 100644 --- a/pimd/pim_ifchannel.h +++ b/pimd/pim_ifchannel.h @@ -89,7 +89,7 @@ struct pim_ifchannel { struct pim_ifchannel *parent; struct list *sources; - struct prefix_sg sg; + pim_sgaddr sg; char sg_str[PIM_SG_LEN]; struct interface *interface; /* backpointer to interface */ uint32_t flags; @@ -123,21 +123,18 @@ void pim_ifchannel_delete(struct pim_ifchannel *ch); void pim_ifchannel_delete_all(struct interface *ifp); void pim_ifchannel_membership_clear(struct interface *ifp); void pim_ifchannel_delete_on_noinfo(struct interface *ifp); -struct pim_ifchannel *pim_ifchannel_find(struct interface *ifp, - struct prefix_sg *sg); -struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp, - struct prefix_sg *sg, uint8_t ch_flags, - int up_flags); +struct pim_ifchannel *pim_ifchannel_find(struct interface *ifp, pim_sgaddr *sg); +struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp, pim_sgaddr *sg, + uint8_t ch_flags, int up_flags); void pim_ifchannel_join_add(struct interface *ifp, struct in_addr neigh_addr, - struct in_addr upstream, struct prefix_sg *sg, + struct in_addr upstream, pim_sgaddr *sg, uint8_t source_flags, uint16_t holdtime); void pim_ifchannel_prune(struct interface *ifp, struct in_addr upstream, - struct prefix_sg *sg, uint8_t source_flags, + pim_sgaddr *sg, uint8_t source_flags, uint16_t holdtime); -int pim_ifchannel_local_membership_add(struct interface *ifp, - struct prefix_sg *sg, bool is_vxlan); -void pim_ifchannel_local_membership_del(struct interface *ifp, - struct prefix_sg *sg); +int pim_ifchannel_local_membership_add(struct interface *ifp, pim_sgaddr *sg, + bool is_vxlan); +void pim_ifchannel_local_membership_del(struct interface *ifp, pim_sgaddr *sg); void pim_ifchannel_ifjoin_switch(const char *caller, struct pim_ifchannel *ch, enum pim_ifjoin_state new_state); |