Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netipsec Remove unused calls to nat_t_ports...



details:   https://anonhg.NetBSD.org/src/rev/09c70746aceb
branches:  trunk
changeset: 319015:09c70746aceb
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sun May 13 18:34:59 2018 +0000
description:
Remove unused calls to nat_t_ports_get.

diffstat:

 sys/netipsec/xform_ah.c     |  9 ++-------
 sys/netipsec/xform_esp.c    |  9 ++-------
 sys/netipsec/xform_ipcomp.c |  9 ++-------
 3 files changed, 6 insertions(+), 21 deletions(-)

diffs (111 lines):

diff -r bad6ab59f97f -r 09c70746aceb sys/netipsec/xform_ah.c
--- a/sys/netipsec/xform_ah.c   Sun May 13 16:53:04 2018 +0000
+++ b/sys/netipsec/xform_ah.c   Sun May 13 18:34:59 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ah.c,v 1.99 2018/05/11 15:43:07 maxv Exp $       */
+/*     $NetBSD: xform_ah.c,v 1.100 2018/05/13 18:34:59 maxv Exp $      */
 /*     $FreeBSD: xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $    */
 /*     $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
 /*
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.99 2018/05/11 15:43:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.100 2018/05/13 18:34:59 maxv Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -725,8 +725,6 @@
        uint8_t nxt;
        char *ptr;
        int authsize;
-       uint16_t dport;
-       uint16_t sport;
        bool pool_used;
        size_t size;
        IPSEC_DECLARE_LOCK_VARIABLE;
@@ -738,9 +736,6 @@
        protoff = tc->tc_protoff;
        m = crp->crp_buf;
 
-       /* find the source port for NAT-T */
-       nat_t_ports_get(m, &dport, &sport);
-
        IPSEC_ACQUIRE_GLOBAL_LOCKS();
 
        sav = tc->tc_sav;
diff -r bad6ab59f97f -r 09c70746aceb sys/netipsec/xform_esp.c
--- a/sys/netipsec/xform_esp.c  Sun May 13 16:53:04 2018 +0000
+++ b/sys/netipsec/xform_esp.c  Sun May 13 18:34:59 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_esp.c,v 1.87 2018/05/11 15:43:07 maxv Exp $      */
+/*     $NetBSD: xform_esp.c,v 1.88 2018/05/13 18:34:59 maxv Exp $      */
 /*     $FreeBSD: xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $   */
 /*     $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.87 2018/05/11 15:43:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.88 2018/05/13 18:34:59 maxv Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -509,8 +509,6 @@
        struct secasvar *sav;
        struct secasindex *saidx;
        void *ptr;
-       uint16_t dport;
-       uint16_t sport;
        IPSEC_DECLARE_LOCK_VARIABLE;
 
        KASSERT(crp->crp_desc != NULL);
@@ -521,9 +519,6 @@
        protoff = tc->tc_protoff;
        m = crp->crp_buf;
 
-       /* find the source port for NAT-T */
-       nat_t_ports_get(m, &dport, &sport);
-
        IPSEC_ACQUIRE_GLOBAL_LOCKS();
 
        sav = tc->tc_sav;
diff -r bad6ab59f97f -r 09c70746aceb sys/netipsec/xform_ipcomp.c
--- a/sys/netipsec/xform_ipcomp.c       Sun May 13 16:53:04 2018 +0000
+++ b/sys/netipsec/xform_ipcomp.c       Sun May 13 18:34:59 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ipcomp.c,v 1.65 2018/05/07 09:16:46 maxv Exp $   */
+/*     $NetBSD: xform_ipcomp.c,v 1.66 2018/05/13 18:34:59 maxv Exp $   */
 /*     $FreeBSD: xform_ipcomp.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $        */
 /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
 
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.65 2018/05/07 09:16:46 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.66 2018/05/13 18:34:59 maxv Exp $");
 
 /* IP payload compression protocol (IPComp), see RFC 2393 */
 #if defined(_KERNEL_OPT)
@@ -250,8 +250,6 @@
        int hlen = IPCOMP_HLENGTH, error, clen;
        uint8_t nproto;
        struct ipcomp *ipc;
-       uint16_t dport;
-       uint16_t sport;
        IPSEC_DECLARE_LOCK_VARIABLE;
 
        KASSERT(crp->crp_opaque != NULL);
@@ -260,9 +258,6 @@
        protoff = tc->tc_protoff;
        m = crp->crp_buf;
 
-       /* find the source port for NAT-T */
-       nat_t_ports_get(m, &dport, &sport);
-
        IPSEC_ACQUIRE_GLOBAL_LOCKS();
 
        sav = tc->tc_sav;



Home | Main Index | Thread Index | Old Index