d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

routing: add rib_match_gw() helper

Browse Source 
Finish 02e05b8faec1:
* add gateway matcher function that can be used in rib_del_route_px()
 or any rib_walk-family functions. It will be used in the upcoming
 migration to the new KPI
* rename gw_fulter_func to match_gw_one() to better signal the
 function purpose / semantic.

MFC after:	1 month
This commit is contained in:
Alexander V. Chernikov 2022-08-12 09:31:21 +00:00
parent 6a70a0c8bf
commit 730bfa2805
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/net/route/route_ctl.c
View File

@ -290,13 +290,28 @@ match_nhop_gw(const struct nhop_object *nh, const struct sockaddr *gw)
return (false);
}
/*
* Matches all nexthop with given @gw.
* Can be used as rib_filter_f callback.
*/
int
rib_match_gw(const struct rtentry *rt, const struct nhop_object *nh, void *gw_sa)
{
const struct sockaddr *gw = (const struct sockaddr *)gw_sa;
return (match_nhop_gw(nh, gw));
}
struct gw_filter_data {
const struct sockaddr *gw;
int count;
};
/*
* Matches first occurence of the gateway provided in @gwd
*/
static int
gw_fulter_func(const struct rtentry *rt, const struct nhop_object *nh, void *_data)
match_gw_one(const struct rtentry *rt, const struct nhop_object *nh, void *_data)
{
struct gw_filter_data *gwd = (struct gw_filter_data *)_data;
@ -518,7 +533,7 @@ rib_del_route_px_gw(uint32_t fibnum, struct sockaddr *dst, int plen,
{
struct gw_filter_data gwd = { .gw = gw };
return (rib_del_route_px(fibnum, dst, plen, gw_fulter_func, &gwd, op_flags, rc));
return (rib_del_route_px(fibnum, dst, plen, match_gw_one, &gwd, op_flags, rc));
}
/*
@ -955,7 +970,7 @@ rib_del_route(uint32_t fibnum, struct rt_addrinfo *info, struct rib_cmd_info *rc
filter_func = info->rti_filter;
filter_arg = info->rti_filterdata;
} else if (gwd.gw != NULL) {
filter_func = gw_fulter_func;
filter_func = match_gw_one;
filter_arg = &gwd;
}

3
sys/net/route/route_ctl.h
View File

@ -77,6 +77,9 @@ int rib_action(uint32_t fibnum, int action, struct rt_addrinfo *info,
struct rib_cmd_info *rc);
int rib_handle_ifaddr_info(uint32_t fibnum, int cmd, struct rt_addrinfo *info);
int rib_match_gw(const struct rtentry *rt, const struct nhop_object *nh,
void *gw_sa);
typedef void route_notification_t(struct rib_cmd_info *rc, void *);
void rib_decompose_notification(struct rib_cmd_info *rc,
route_notification_t *cb, void *cbdata);