[src/trunk]: src/sys/netipsec dedup

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

details:   https://anonhg.NetBSD.org/src/rev/1ab260a2c9e7
branches:  trunk
changeset: 359558:1ab260a2c9e7
user:      maxv <maxv%NetBSD.org@localhost>
date:      Thu Feb 15 10:09:53 2018 +0000

description:
dedup

diffstat:

 sys/netipsec/xform_ipip.c |  40 ++++++++++++----------------------------
 1 files changed, 12 insertions(+), 28 deletions(-)

diffs (90 lines):

diff -r af9ca9dc62ca -r 1ab260a2c9e7 sys/netipsec/xform_ipip.c
--- a/sys/netipsec/xform_ipip.c Thu Feb 15 10:04:43 2018 +0000
+++ b/sys/netipsec/xform_ipip.c Thu Feb 15 10:09:53 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ipip.c,v 1.59 2018/02/15 10:04:43 maxv Exp $     */
+/*     $NetBSD: xform_ipip.c,v 1.60 2018/02/15 10:09:53 maxv Exp $     */
 /*     $FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
 /*     $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.59 2018/02/15 10:04:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.60 2018/02/15 10:09:53 maxv Exp $");
 
 /*
  * IP-inside-IP processing
@@ -358,7 +358,7 @@
        char buf[IPSEC_ADDRSTRLEN];
        uint8_t tp, otos;
        struct secasindex *saidx;
-       int error;
+       int error, iphlen;
 #ifdef INET
        uint8_t itos;
        struct ip *ipo;
@@ -399,8 +399,9 @@
                        goto bad;
                }
 
+               iphlen = sizeof(struct ip);
+
                ipo = mtod(m, struct ip *);
-
                ipo->ip_v = IPVERSION;
                ipo->ip_hl = 5;
                ipo->ip_len = htons(m->m_pkthdr.len);
@@ -482,6 +483,8 @@
                        goto bad;
                }
 
+               iphlen = sizeof(struct ip6_hdr);
+
                /* Initialize IPv6 header */
                ip6o = mtod(m, struct ip6_hdr *);
                ip6o->ip6_flow = 0;
@@ -532,37 +535,18 @@
                DPRINTF(("%s: unsupported protocol family %u\n", __func__,
                    saidx->dst.sa.sa_family));
                IPIP_STATINC(IPIP_STAT_FAMILY);
-               error = EAFNOSUPPORT;           /* XXX diffs from openbsd */
+               error = EAFNOSUPPORT;
                goto bad;
        }
 
        IPIP_STATINC(IPIP_STAT_OPACKETS);
-       *mp = m;
-
-#ifdef INET
-       if (saidx->dst.sa.sa_family == AF_INET) {
+       IPIP_STATADD(IPIP_STAT_OBYTES, m->m_pkthdr.len - iphlen);
 #if 0
-               if (sav->tdb_xform->xf_type == XF_IP4)
-                       tdb->tdb_cur_bytes +=
-                           m->m_pkthdr.len - sizeof(struct ip);
+       if (sav->tdb_xform->xf_type == XF_IP4)
+               tdb->tdb_cur_bytes += m->m_pkthdr.len - iphlen;
 #endif
-               IPIP_STATADD(IPIP_STAT_OBYTES,
-                   m->m_pkthdr.len - sizeof(struct ip));
-       }
-#endif /* INET */
 
-#ifdef INET6
-       if (saidx->dst.sa.sa_family == AF_INET6) {
-#if 0
-               if (sav->tdb_xform->xf_type == XF_IP4)
-                       tdb->tdb_cur_bytes +=
-                           m->m_pkthdr.len - sizeof(struct ip6_hdr);
-#endif
-               IPIP_STATADD(IPIP_STAT_OBYTES,
-                   m->m_pkthdr.len - sizeof(struct ip6_hdr));
-       }
-#endif /* INET6 */
-
+       *mp = m;
        return 0;
 
 bad: