[src/trunk]: src/sys/netinet Clean up this mess. This is typically the kind o...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/11c8c606da4a
branches:  trunk
changeset: 829544:11c8c606da4a
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon Feb 05 14:52:42 2018 +0000

description:
Clean up this mess. This is typically the kind of places where we need to
seriously cut the bullshit. These things are unreadable, undocumented, and
all they bought us was not figuring out we had IPv4 forwarding enabled by
default for 20+ years.

diffstat:

 sys/netinet/ip_input.c |  47 +++++++++++++++++------------------------------
 1 files changed, 17 insertions(+), 30 deletions(-)

diffs (81 lines):

diff -r 3fed37a6dc70 -r 11c8c606da4a sys/netinet/ip_input.c
--- a/sys/netinet/ip_input.c    Mon Feb 05 14:23:38 2018 +0000
+++ b/sys/netinet/ip_input.c    Mon Feb 05 14:52:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_input.c,v 1.369 2018/02/05 14:23:38 maxv Exp $      */
+/*     $NetBSD: ip_input.c,v 1.370 2018/02/05 14:52:42 maxv Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.369 2018/02/05 14:23:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.370 2018/02/05 14:52:42 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -153,47 +153,34 @@
 #ifndef        IPFORWARDING
 #ifdef GATEWAY
 #define        IPFORWARDING    1       /* forward IP packets not for us */
-#else /* GATEWAY */
+#else
 #define        IPFORWARDING    0       /* don't forward IP packets not for us */
-#endif /* GATEWAY */
-#endif /* IPFORWARDING */
+#endif
+#endif
+
 #ifndef        IPSENDREDIRECTS
 #define        IPSENDREDIRECTS 1
 #endif
-#ifndef IPFORWSRCRT
-#define        IPFORWSRCRT     0       /* forward source-routed packets */
-#endif
-#ifndef IPALLOWSRCRT
-#define        IPALLOWSRCRT    0       /* allow source-routed packets */
-#endif
-#ifndef IPMTUDISC
-#define IPMTUDISC      1
-#endif
+
 #ifndef IPMTUDISCTIMEOUT
 #define IPMTUDISCTIMEOUT (10 * 60)     /* as per RFC 1191 */
 #endif
 
-/*
- * Note: DIRECTED_BROADCAST is handled this way so that previous
- * configuration using this option will Just Work.
- */
-#ifndef IPDIRECTEDBCAST
 #ifdef DIRECTED_BROADCAST
 #define IPDIRECTEDBCAST        1
 #else
 #define        IPDIRECTEDBCAST 0
-#endif /* DIRECTED_BROADCAST */
-#endif /* IPDIRECTEDBCAST */
-int    ipforwarding = IPFORWARDING;
-int    ipsendredirects = IPSENDREDIRECTS;
-int    ip_defttl = IPDEFTTL;
-int    ip_forwsrcrt = IPFORWSRCRT;
-int    ip_directedbcast = IPDIRECTEDBCAST;
-int    ip_allowsrcrt = IPALLOWSRCRT;
-int    ip_mtudisc = IPMTUDISC;
-int    ip_mtudisc_timeout = IPMTUDISCTIMEOUT;
+#endif
 
-int    ip_do_randomid = 0;
+int ipforwarding = IPFORWARDING;
+int ipsendredirects = IPSENDREDIRECTS;
+int ip_defttl = IPDEFTTL;
+int ip_forwsrcrt = 0;
+int ip_directedbcast = IPDIRECTEDBCAST;
+int ip_allowsrcrt = 0;
+int ip_mtudisc = 1;
+int ip_mtudisc_timeout = IPMTUDISCTIMEOUT;
+int ip_do_randomid = 0;
 
 /*
  * XXX - Setting ip_checkinterface mostly implements the receive side of