Re: in_var.h incudes in6_var.h
* Martin Pieuchot mpieuc...@nolizard.org [2013-09-02 12:12]: On 30/08/13(Fri) 21:50, Alexander Bluhm wrote: Hi, The file netinet/in_var.h includes netinet6/in6_var.h. This creates a bunch of useless dependencies. For an upcomming change in in6_var.h I would like to split that up. Is this a good idea? comments/ok? I like the idea but we should be careful about ports assuming that in_var.h includes in6_var.h even if there's no RFC requirement. indeed, that needs to be checked. otherwise ok. -- Henning Brauer, h...@bsws.de, henn...@openbsd.org BS Web Services GmbH, http://bsws.de, Full-Service ISP Secure Hosting, Mail and DNS Services. Dedicated Servers, Root to Fully Managed Henning Brauer Consulting, http://henningbrauer.com/
Re: in_var.h incudes in6_var.h
On 30/08/13(Fri) 21:50, Alexander Bluhm wrote: Hi, The file netinet/in_var.h includes netinet6/in6_var.h. This creates a bunch of useless dependencies. For an upcomming change in in6_var.h I would like to split that up. Is this a good idea? comments/ok? I like the idea but we should be careful about ports assuming that in_var.h includes in6_var.h even if there's no RFC requirement. ok mpi@ The important part of my diff is in sys/netinet/in_var.h: -/* INET6 stuff */ -#include netinet6/in6_var.h bluhm Index: sbin/ifconfig/ifconfig.c === RCS file: /data/mirror/openbsd/cvs/src/sbin/ifconfig/ifconfig.c,v retrieving revision 1.269 diff -u -p -u -p -r1.269 ifconfig.c --- sbin/ifconfig/ifconfig.c 19 Aug 2013 11:20:57 - 1.269 +++ sbin/ifconfig/ifconfig.c 27 Aug 2013 22:40:10 - @@ -70,6 +70,7 @@ #include net/if_types.h #include netinet/in.h #include netinet/in_var.h +#include netinet6/in6_var.h #include netinet6/nd6.h #include arpa/inet.h #include netinet/ip_ipsp.h Index: sys/net/bridgestp.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/bridgestp.c,v retrieving revision 1.44 diff -u -p -u -p -r1.44 bridgestp.c --- sys/net/bridgestp.c 20 Jun 2013 12:03:40 - 1.44 +++ sys/net/bridgestp.c 27 Aug 2013 22:27:28 - @@ -60,7 +60,6 @@ __FBSDID($FreeBSD: /repoman/r/ncvs/src/ #ifdef INET #include netinet/in.h #include netinet/in_systm.h -#include netinet/in_var.h #include netinet/ip.h #include netinet/if_ether.h #endif Index: sys/net/if.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if.c,v retrieving revision 1.264 diff -u -p -u -p -r1.264 if.c --- sys/net/if.c 28 Aug 2013 07:38:50 - 1.264 +++ sys/net/if.c 29 Aug 2013 20:49:43 - @@ -103,6 +103,7 @@ #ifndef INET #include netinet/in.h #endif +#include netinet6/in6_var.h #include netinet6/in6_ifattach.h #include netinet6/nd6.h #include netinet/ip6.h Index: sys/net/if_bridge.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_bridge.c,v retrieving revision 1.214 diff -u -p -u -p -r1.214 if_bridge.c --- sys/net/if_bridge.c 21 Aug 2013 13:53:48 - 1.214 +++ sys/net/if_bridge.c 27 Aug 2013 22:27:28 - @@ -71,6 +71,7 @@ #endif #ifdef INET6 +#include netinet6/in6_var.h #include netinet/ip6.h #include netinet6/ip6_var.h #endif Index: sys/net/if_fddisubr.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_fddisubr.c,v retrieving revision 1.61 diff -u -p -u -p -r1.61 if_fddisubr.c --- sys/net/if_fddisubr.c 28 Mar 2013 16:55:27 - 1.61 +++ sys/net/if_fddisubr.c 27 Aug 2013 22:27:28 - @@ -103,8 +103,8 @@ #ifdef INET6 #ifndef INET #include netinet/in.h -#include netinet/in_var.h #endif +#include netinet6/in6_var.h #include netinet6/nd6.h #endif Index: sys/net/if_gif.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_gif.c,v retrieving revision 1.62 diff -u -p -u -p -r1.62 if_gif.c --- sys/net/if_gif.c 17 Jun 2013 18:19:44 - 1.62 +++ sys/net/if_gif.c 27 Aug 2013 22:27:28 - @@ -57,6 +57,7 @@ #ifndef INET #include netinet/in.h #endif +#include netinet6/in6_var.h #include netinet/ip6.h #include netinet6/ip6_var.h #include netinet6/in6_gif.h Index: sys/net/if_gre.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_gre.c,v retrieving revision 1.62 diff -u -p -u -p -r1.62 if_gre.c --- sys/net/if_gre.c 5 Jun 2013 15:17:40 - 1.62 +++ sys/net/if_gre.c 27 Aug 2013 22:27:28 - @@ -60,7 +60,6 @@ #ifdef INET #include netinet/in.h #include netinet/in_systm.h -#include netinet/in_var.h #include netinet/ip.h #include netinet/ip_var.h #include netinet/if_ether.h Index: sys/net/if_mpe.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_mpe.c,v retrieving revision 1.29 diff -u -p -u -p -r1.29 if_mpe.c --- sys/net/if_mpe.c 28 Mar 2013 16:45:16 - 1.29 +++ sys/net/if_mpe.c 27 Aug 2013 22:27:28 - @@ -37,6 +37,7 @@ #endif #ifdef INET6 +#include netinet6/in6_var.h #include netinet/ip6.h #ifndef INET #include netinet/in.h Index: sys/net/if_pflog.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_pflog.c,v retrieving revision 1.54 diff -u -p -u -p -r1.54 if_pflog.c --- sys/net/if_pflog.c26 Jun 2013 09:12:39 - 1.54 +++ sys/net/if_pflog.c27 Aug
in_var.h incudes in6_var.h
Hi, The file netinet/in_var.h includes netinet6/in6_var.h. This creates a bunch of useless dependencies. For an upcomming change in in6_var.h I would like to split that up. Is this a good idea? comments/ok? Note that netinet/in.h includes netinet6/in6.h, but that is required by RFC. The important part of my diff is in sys/netinet/in_var.h: -/* INET6 stuff */ -#include netinet6/in6_var.h bluhm Index: sbin/ifconfig/ifconfig.c === RCS file: /data/mirror/openbsd/cvs/src/sbin/ifconfig/ifconfig.c,v retrieving revision 1.269 diff -u -p -u -p -r1.269 ifconfig.c --- sbin/ifconfig/ifconfig.c19 Aug 2013 11:20:57 - 1.269 +++ sbin/ifconfig/ifconfig.c27 Aug 2013 22:40:10 - @@ -70,6 +70,7 @@ #include net/if_types.h #include netinet/in.h #include netinet/in_var.h +#include netinet6/in6_var.h #include netinet6/nd6.h #include arpa/inet.h #include netinet/ip_ipsp.h Index: sys/net/bridgestp.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/bridgestp.c,v retrieving revision 1.44 diff -u -p -u -p -r1.44 bridgestp.c --- sys/net/bridgestp.c 20 Jun 2013 12:03:40 - 1.44 +++ sys/net/bridgestp.c 27 Aug 2013 22:27:28 - @@ -60,7 +60,6 @@ __FBSDID($FreeBSD: /repoman/r/ncvs/src/ #ifdef INET #include netinet/in.h #include netinet/in_systm.h -#include netinet/in_var.h #include netinet/ip.h #include netinet/if_ether.h #endif Index: sys/net/if.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if.c,v retrieving revision 1.264 diff -u -p -u -p -r1.264 if.c --- sys/net/if.c28 Aug 2013 07:38:50 - 1.264 +++ sys/net/if.c29 Aug 2013 20:49:43 - @@ -103,6 +103,7 @@ #ifndef INET #include netinet/in.h #endif +#include netinet6/in6_var.h #include netinet6/in6_ifattach.h #include netinet6/nd6.h #include netinet/ip6.h Index: sys/net/if_bridge.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_bridge.c,v retrieving revision 1.214 diff -u -p -u -p -r1.214 if_bridge.c --- sys/net/if_bridge.c 21 Aug 2013 13:53:48 - 1.214 +++ sys/net/if_bridge.c 27 Aug 2013 22:27:28 - @@ -71,6 +71,7 @@ #endif #ifdef INET6 +#include netinet6/in6_var.h #include netinet/ip6.h #include netinet6/ip6_var.h #endif Index: sys/net/if_fddisubr.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_fddisubr.c,v retrieving revision 1.61 diff -u -p -u -p -r1.61 if_fddisubr.c --- sys/net/if_fddisubr.c 28 Mar 2013 16:55:27 - 1.61 +++ sys/net/if_fddisubr.c 27 Aug 2013 22:27:28 - @@ -103,8 +103,8 @@ #ifdef INET6 #ifndef INET #include netinet/in.h -#include netinet/in_var.h #endif +#include netinet6/in6_var.h #include netinet6/nd6.h #endif Index: sys/net/if_gif.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_gif.c,v retrieving revision 1.62 diff -u -p -u -p -r1.62 if_gif.c --- sys/net/if_gif.c17 Jun 2013 18:19:44 - 1.62 +++ sys/net/if_gif.c27 Aug 2013 22:27:28 - @@ -57,6 +57,7 @@ #ifndef INET #include netinet/in.h #endif +#include netinet6/in6_var.h #include netinet/ip6.h #include netinet6/ip6_var.h #include netinet6/in6_gif.h Index: sys/net/if_gre.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_gre.c,v retrieving revision 1.62 diff -u -p -u -p -r1.62 if_gre.c --- sys/net/if_gre.c5 Jun 2013 15:17:40 - 1.62 +++ sys/net/if_gre.c27 Aug 2013 22:27:28 - @@ -60,7 +60,6 @@ #ifdef INET #include netinet/in.h #include netinet/in_systm.h -#include netinet/in_var.h #include netinet/ip.h #include netinet/ip_var.h #include netinet/if_ether.h Index: sys/net/if_mpe.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_mpe.c,v retrieving revision 1.29 diff -u -p -u -p -r1.29 if_mpe.c --- sys/net/if_mpe.c28 Mar 2013 16:45:16 - 1.29 +++ sys/net/if_mpe.c27 Aug 2013 22:27:28 - @@ -37,6 +37,7 @@ #endif #ifdef INET6 +#include netinet6/in6_var.h #include netinet/ip6.h #ifndef INET #include netinet/in.h Index: sys/net/if_pflog.c === RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_pflog.c,v retrieving revision 1.54 diff -u -p -u -p -r1.54 if_pflog.c --- sys/net/if_pflog.c 26 Jun 2013 09:12:39 - 1.54 +++ sys/net/if_pflog.c 27 Aug 2013 22:27:28 - @@ -63,6 +63,7 @@ #ifndef INET #include netinet/in.h #endif +#include netinet6/in6_var.h #include netinet/ip6.h #include netinet6/nd6.h #include netinet/icmp6.h Index: sys/net/if_pflow.c
