From: Vitaliy Makkoveev <otto@bsdbox.dev>
Subject: Re: in_pcb.h includes ip6_var.h
To: Alexander Bluhm <alexander.bluhm@gmx.net>
Cc: tech@openbsd.org
Date: Fri, 9 Feb 2024 21:34:54 +0300

> On 9 Feb 2024, at 21:20, Alexander Bluhm <alexander.bluhm@gmx.net> wrote:
> 
> Hi,
> 
> Putting inet and inet6 addresses into struct route is harder than
> expected.  libkvm includes net/route.h which creates a lot of
> fallout.
> 
> As a first step I want to remove include netinet6/ip6_var.h from
> netinet/in_pcb.h.  It survived a make release.  Not exposing ip6_var.h
> to libkvm might make things easier.
> 
> ok?
> 

ok mvs

> bluhm
> 
> Index: netinet/in_pcb.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/in_pcb.c,v
> diff -u -p -r1.291 in_pcb.c
> --- netinet/in_pcb.c	9 Feb 2024 14:02:11 -0000	1.291
> +++ netinet/in_pcb.c	9 Feb 2024 16:21:23 -0000
> @@ -90,6 +90,7 @@
> #include <netinet/in_var.h>
> #include <netinet/ip.h>
> #include <netinet/ip_var.h>
> +#include <netinet6/ip6_var.h>
> #include <netinet/in_pcb.h>
> #ifdef IPSEC
> #include <netinet/ip_esp.h>
> Index: netinet/in_pcb.h
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/in_pcb.h,v
> diff -u -p -r1.150 in_pcb.h
> --- netinet/in_pcb.h	31 Jan 2024 12:27:57 -0000	1.150
> +++ netinet/in_pcb.h	9 Feb 2024 16:21:23 -0000
> @@ -69,7 +69,6 @@
> #include <sys/rwlock.h>
> #include <sys/refcnt.h>
> #include <netinet/ip6.h>
> -#include <netinet6/ip6_var.h>
> #include <netinet/icmp6.h>
> #include <netinet/ip_ipsp.h>
> 
> Index: netinet/ip_ipip.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/ip_ipip.c,v
> diff -u -p -r1.100 ip_ipip.c
> --- netinet/ip_ipip.c	28 Nov 2023 13:23:20 -0000	1.100
> +++ netinet/ip_ipip.c	9 Feb 2024 16:21:23 -0000
> @@ -60,6 +60,7 @@
> #include <netinet/ip.h>
> #include <netinet/in_pcb.h>
> #include <netinet/ip_var.h>
> +#include <netinet6/ip6_var.h>
> #include <netinet/ip_ecn.h>
> #include <netinet/ip_ipip.h>
> 
> Index: netinet/ipsec_output.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/ipsec_output.c,v
> diff -u -p -r1.97 ipsec_output.c
> --- netinet/ipsec_output.c	2 Jan 2022 22:36:04 -0000	1.97
> +++ netinet/ipsec_output.c	9 Feb 2024 16:21:23 -0000
> @@ -36,6 +36,7 @@
> #include <netinet/ip.h>
> #include <netinet/in_pcb.h>
> #include <netinet/ip_var.h>
> +#include <netinet6/ip6_var.h>
> 
> #if NPF > 0
> #include <net/pfvar.h>
> Index: netinet/tcp_input.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/tcp_input.c,v
> diff -u -p -r1.399 tcp_input.c
> --- netinet/tcp_input.c	27 Jan 2024 21:13:46 -0000	1.399
> +++ netinet/tcp_input.c	9 Feb 2024 16:21:23 -0000
> @@ -88,6 +88,7 @@
> #include <netinet/ip.h>
> #include <netinet/in_pcb.h>
> #include <netinet/ip_var.h>
> +#include <netinet6/ip6_var.h>
> #include <netinet/tcp.h>
> #include <netinet/tcp_fsm.h>
> #include <netinet/tcp_seq.h>
> Index: netinet/tcp_output.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/tcp_output.c,v
> diff -u -p -r1.141 tcp_output.c
> --- netinet/tcp_output.c	26 Nov 2023 22:08:10 -0000	1.141
> +++ netinet/tcp_output.c	9 Feb 2024 16:21:24 -0000
> @@ -90,6 +90,7 @@
> #include <netinet/ip.h>
> #include <netinet/in_pcb.h>
> #include <netinet/ip_var.h>
> +#include <netinet6/ip6_var.h>
> #include <netinet/tcp.h>
> #define	TCPOUTFLAGS
> #include <netinet/tcp_fsm.h>
> Index: netinet/tcp_subr.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/tcp_subr.c,v
> diff -u -p -r1.197 tcp_subr.c
> --- netinet/tcp_subr.c	28 Jan 2024 20:34:25 -0000	1.197
> +++ netinet/tcp_subr.c	9 Feb 2024 16:21:24 -0000
> @@ -85,6 +85,7 @@
> #include <netinet/ip.h>
> #include <netinet/in_pcb.h>
> #include <netinet/ip_var.h>
> +#include <netinet6/ip6_var.h>
> #include <netinet/ip_icmp.h>
> #include <netinet/tcp.h>
> #include <netinet/tcp_fsm.h>
> Index: netinet/tcp_usrreq.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/tcp_usrreq.c,v
> diff -u -p -r1.229 tcp_usrreq.c
> --- netinet/tcp_usrreq.c	19 Jan 2024 02:24:07 -0000	1.229
> +++ netinet/tcp_usrreq.c	9 Feb 2024 16:21:24 -0000
> @@ -90,6 +90,7 @@
> #include <netinet/ip.h>
> #include <netinet/in_pcb.h>
> #include <netinet/ip_var.h>
> +#include <netinet6/ip6_var.h>
> #include <netinet/tcp.h>
> #include <netinet/tcp_fsm.h>
> #include <netinet/tcp_seq.h>
> Index: netinet6/in6_pcb.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/in6_pcb.c,v
> diff -u -p -r1.136 in6_pcb.c
> --- netinet6/in6_pcb.c	9 Feb 2024 14:02:12 -0000	1.136
> +++ netinet6/in6_pcb.c	9 Feb 2024 16:21:24 -0000
> @@ -116,6 +116,7 @@
> #include <netinet/in.h>
> #include <netinet/ip.h>
> #include <netinet/ip_var.h>
> +#include <netinet6/ip6_var.h>
> #include <netinet/in_pcb.h>
> 
> #include <netinet6/in6_var.h>
> Index: netinet6/ip6_divert.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/ip6_divert.c,v
> diff -u -p -r1.92 ip6_divert.c
> --- netinet6/ip6_divert.c	3 Feb 2024 22:50:09 -0000	1.92
> +++ netinet6/ip6_divert.c	9 Feb 2024 16:21:24 -0000
> @@ -35,6 +35,7 @@
> #include <netinet/in_pcb.h>
> #include <netinet/ip_divert.h>
> #include <netinet/ip6.h>
> +#include <netinet6/ip6_var.h>
> #include <netinet6/in6_var.h>
> #include <netinet6/ip6_divert.h>
> #include <netinet/tcp.h>
>