svn commit: r364941 - in head/sys: net net/route netinet netinet6
Hartmann, O.
ohartmann at walstatt.org
Sat Aug 29 09:44:16 UTC 2020
On Fri, 28 Aug 2020 22:50:21 +0000 (UTC)
"Alexander V. Chernikov" <melifaro at FreeBSD.org> wrote:
> Author: melifaro
> Date: Fri Aug 28 22:50:20 2020
> New Revision: 364941
> URL: https://svnweb.freebsd.org/changeset/base/364941
>
> Log:
> Move net/route/shared.h definitions to net/route/route_var.h.
>
> No functional changes.
>
> net/route/shared.h was created in the inital phases of nexthop
> conversion. It was intended to serve the same purpose as route_var.h
> - share definitions of functions and structures between the routing
> subsystem components. At that time route_var.h was included by many
> files external to the routing subsystem, which largerly defeats its
> purpose.
> As currently this is not the case anymore and amount of route_var.h
> includes is roughly the same as shared.h, retire the latter in favour
> of the former.
>
> Deleted:
> head/sys/net/route/shared.h
> Modified:
> head/sys/net/radix_mpath.c
> head/sys/net/route.c
> head/sys/net/route/nhop.c
> head/sys/net/route/nhop_ctl.c
> head/sys/net/route/route_ctl.c
> head/sys/net/route/route_helpers.c
> head/sys/net/route/route_var.h
> head/sys/net/rtsock.c
> head/sys/netinet/in_fib.c
> head/sys/netinet/in_rmx.c
> head/sys/netinet6/in6_fib.c
> head/sys/netinet6/in6_rmx.c
>
> Modified: head/sys/net/radix_mpath.c
> ==============================================================================
> --- head/sys/net/radix_mpath.c Fri Aug 28 21:59:10 2020
> (r364940) +++ head/sys/net/radix_mpath.c Fri Aug 28 22:50:20
> 2020 (r364941) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
> #include <sys/rmlock.h>
> #include <net/route.h>
> #include <net/route/nhop.h>
> -#include <net/route/shared.h>
> #include <net/route/route_var.h>
> #include <net/route/nhop.h>
> #include <net/if.h>
>
> Modified: head/sys/net/route.c
> ==============================================================================
> --- head/sys/net/route.c Fri Aug 28 21:59:10 2020
> (r364940) +++ head/sys/net/route.c Fri Aug 28 22:50:20
> 2020 (r364941) @@ -64,7 +64,6 @@
> #include <net/route/route_ctl.h>
> #include <net/route/route_var.h>
> #include <net/route/nhop.h>
> -#include <net/route/shared.h>
> #include <net/vnet.h>
>
> #ifdef RADIX_MPATH
>
> Modified: head/sys/net/route/nhop.c
> ==============================================================================
> --- head/sys/net/route/nhop.c Fri Aug 28 21:59:10 2020
> (r364940) +++ head/sys/net/route/nhop.c Fri Aug 28 22:50:20
> 2020 (r364941) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
> #include <net/route/nhop_utils.h>
> #include <net/route/nhop.h>
> #include <net/route/nhop_var.h>
> -#include <net/route/shared.h>
> #include <net/vnet.h>
>
> /*
>
> Modified: head/sys/net/route/nhop_ctl.c
> ==============================================================================
> --- head/sys/net/route/nhop_ctl.c Fri Aug 28 21:59:10
> 2020 (r364940) +++ head/sys/net/route/nhop_ctl.c Fri
> Aug 28 22:50:20 2020 (r364941) @@ -49,7 +49,6 @@
> __FBSDID("$FreeBSD$"); #include <net/route/nhop_utils.h>
> #include <net/route/nhop.h>
> #include <net/route/nhop_var.h>
> -#include <net/route/shared.h>
> #include <net/vnet.h>
>
> /*
>
> Modified: head/sys/net/route/route_ctl.c
> ==============================================================================
> --- head/sys/net/route/route_ctl.c Fri Aug 28 21:59:10
> 2020 (r364940) +++ head/sys/net/route/route_ctl.c Fri
> Aug 28 22:50:20 2020 (r364941) @@ -52,7 +52,6 @@
> __FBSDID("$FreeBSD$"); #include <net/route/nhop_utils.h>
> #include <net/route/nhop.h>
> #include <net/route/nhop_var.h>
> -#include <net/route/shared.h>
> #include <netinet/in.h>
>
> #ifdef RADIX_MPATH
>
> Modified: head/sys/net/route/route_helpers.c
> ==============================================================================
> --- head/sys/net/route/route_helpers.c Fri Aug 28 21:59:10
> 2020 (r364940) +++ head/sys/net/route/route_helpers.c
> Fri Aug 28 22:50:20 2020 (r364941) @@ -55,7 +55,6 @@
> __FBSDID("$FreeBSD$"); #include <net/route/nhop_utils.h>
> #include <net/route/nhop.h>
> #include <net/route/nhop_var.h>
> -#include <net/route/shared.h>
> #ifdef INET
> #include <netinet/in_fib.h>
> #endif
>
> Modified: head/sys/net/route/route_var.h
> ==============================================================================
> --- head/sys/net/route/route_var.h Fri Aug 28 21:59:10
> 2020 (r364940) +++ head/sys/net/route/route_var.h Fri
> Aug 28 22:50:20 2020 (r364941) @@ -39,7 +39,14 @@
> #include <sys/epoch.h>
> #include <netinet/in.h> /* struct sockaddr_in */
> #include <sys/counter.h>
> +#include <net/route/nhop.h>
>
> +#ifdef RTDEBUG
> +#define DPRINTF(_fmt, ...) printf("%s: " _fmt "\n",
> __func__ , ## __VA_ARGS__) +#else
> +#define DPRINTF(_fmt, ...)
> +#endif
> +
> struct nh_control;
> typedef int rnh_preadd_entry_f_t(u_int fibnum, const struct sockaddr
> *addr, const struct sockaddr *mask, struct nhop_object *nh);
> @@ -221,6 +228,7 @@ fib_rte_to_nh_flags(int rt_flags)
> return (res);
> }
>
> +/* route_temporal.c */
> void tmproutes_update(struct rib_head *rnh, struct rtentry *rt);
> void tmproutes_init(struct rib_head *rh);
> void tmproutes_destroy(struct rib_head *rh);
> @@ -236,5 +244,33 @@ int change_route_conditional(struct rib_head
> *rnh, str
> void vnet_rtzone_init(void);
> void vnet_rtzone_destroy(void);
> +
> +/* subscriptions */
> +void rib_init_subscriptions(struct rib_head *rnh);
> +void rib_destroy_subscriptions(struct rib_head *rnh);
> +
> +/* Nexhops */
> +void nhops_init(void);
> +int nhops_init_rib(struct rib_head *rh);
> +void nhops_destroy_rib(struct rib_head *rh);
> +void nhop_ref_object(struct nhop_object *nh);
> +int nhop_try_ref_object(struct nhop_object *nh);
> +int nhop_ref_any(struct nhop_object *nh);
> +void nhop_free_any(struct nhop_object *nh);
> +
> +void nhop_set_type(struct nhop_object *nh, enum nhop_type nh_type);
> +void nhop_set_rtflags(struct nhop_object *nh, int rt_flags);
> +
> +int nhop_create_from_info(struct rib_head *rnh, struct rt_addrinfo
> *info,
> + struct nhop_object **nh_ret);
> +int nhop_create_from_nhop(struct rib_head *rnh, const struct
> nhop_object *nh_orig,
> + struct rt_addrinfo *info, struct nhop_object **pnh_priv);
> +
> +void nhops_update_ifmtu(struct rib_head *rh, struct ifnet *ifp,
> uint32_t mtu); +int nhops_dump_sysctl(struct rib_head *rh, struct
> sysctl_req *w); +
> +/* route */
> +struct rtentry *rt_unlinkrte(struct rib_head *rnh, struct
> rt_addrinfo *info,
> + int *perror);
>
> #endif
>
> Modified: head/sys/net/rtsock.c
> ==============================================================================
> --- head/sys/net/rtsock.c Fri Aug 28 21:59:10 2020
> (r364940) +++ head/sys/net/rtsock.c Fri Aug 28 22:50:20
> 2020 (r364941) @@ -77,7 +77,6 @@
> #include <netinet6/scope6_var.h>
> #endif
> #include <net/route/nhop.h>
> -#include <net/route/shared.h>
>
> #ifdef COMPAT_FREEBSD32
> #include <sys/mount.h>
>
> Modified: head/sys/netinet/in_fib.c
> ==============================================================================
> --- head/sys/netinet/in_fib.c Fri Aug 28 21:59:10 2020
> (r364940) +++ head/sys/netinet/in_fib.c Fri Aug 28 22:50:20
> 2020 (r364941) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
> #include <net/route.h>
> #include <net/route/route_var.h>
> #include <net/route/nhop.h>
> -#include <net/route/shared.h>
> #include <net/vnet.h>
>
> #ifdef RADIX_MPATH
>
> Modified: head/sys/netinet/in_rmx.c
> ==============================================================================
> --- head/sys/netinet/in_rmx.c Fri Aug 28 21:59:10 2020
> (r364940) +++ head/sys/netinet/in_rmx.c Fri Aug 28 22:50:20
> 2020 (r364941) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
> #include <net/route/route_ctl.h>
> #include <net/route/route_var.h>
> #include <net/route/nhop.h>
> -#include <net/route/shared.h>
> #include <net/vnet.h>
>
> #include <netinet/in.h>
>
> Modified: head/sys/netinet6/in6_fib.c
> ==============================================================================
> --- head/sys/netinet6/in6_fib.c Fri Aug 28 21:59:10
> 2020 (r364940) +++ head/sys/netinet6/in6_fib.c Fri Aug
> 28 22:50:20 2020 (r364941) @@ -51,7 +51,6 @@
> __FBSDID("$FreeBSD$"); #include <net/route.h>
> #include <net/route/route_var.h>
> #include <net/route/nhop.h>
> -#include <net/route/shared.h>
> #include <net/vnet.h>
>
> #ifdef RADIX_MPATH
>
> Modified: head/sys/netinet6/in6_rmx.c
> ==============================================================================
> --- head/sys/netinet6/in6_rmx.c Fri Aug 28 21:59:10
> 2020 (r364940) +++ head/sys/netinet6/in6_rmx.c Fri Aug
> 28 22:50:20 2020 (r364941) @@ -84,7 +84,6 @@
> __FBSDID("$FreeBSD$"); #include <net/route/route_ctl.h>
> #include <net/route/route_var.h>
> #include <net/route/nhop.h>
> -#include <net/route/shared.h>
>
> #include <netinet/in.h>
> #include <netinet/ip_var.h>
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to
> "svn-src-head-unsubscribe at freebsd.org"
This commit breaks "make buildkernel" on CURRENT for me on several
CURRENT boxes:
[...]
x86 -> /usr/src/sys/x86/include
--- route_ctl.o ---
/usr/src/sys/net/route/route_ctl.c:315:30: error: variable 'netmask' is
uninitialized when used here [-Werror,-Wuninitialized]
rt_mpath_conflict(rnh, rt, netmask)) { ^~~~~~~
/usr/src/sys/net/route/route_ctl.c:297:33: note: initialize the
variable 'netmask' to silence this warning --- modules-all ---
--- all_subdir_acpi/acpi_video ---
===> acpi/acpi_video (all)
--- route_ctl.o ---
struct sockaddr *ndst, *netmask;
^
= NULL
--- modules-all ---
--- all_subdir_amdgpio ---
[...]
Greetings,
oh
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 228 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20200829/ed864403/attachment.sig>
More information about the svn-src-all
mailing list