Module Name: src
Committed By: maxv
Date: Sun May 13 18:34:59 UTC 2018
Modified Files:
src/sys/netipsec: xform_ah.c xform_esp.c xform_ipcomp.c
Log Message:
Remove unused calls to nat_t_ports_get.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/netipsec/xform_ah.c
cvs rdiff -u -r1.87 -r1.88 src/sys/netipsec/xform_esp.c
cvs rdiff -u -r1.65 -r1.66 src/sys/netipsec/xform_ipcomp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netipsec/xform_ah.c
diff -u src/sys/netipsec/xform_ah.c:1.99 src/sys/netipsec/xform_ah.c:1.100
--- src/sys/netipsec/xform_ah.c:1.99 Fri May 11 15:43:07 2018
+++ src/sys/netipsec/xform_ah.c Sun May 13 18:34:59 2018
@@ -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 @@ ah_input_cb(struct cryptop *crp)
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 @@ ah_input_cb(struct cryptop *crp)
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;
Index: src/sys/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.87 src/sys/netipsec/xform_esp.c:1.88
--- src/sys/netipsec/xform_esp.c:1.87 Fri May 11 15:43:07 2018
+++ src/sys/netipsec/xform_esp.c Sun May 13 18:34:59 2018
@@ -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 @@ esp_input_cb(struct cryptop *crp)
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 @@ esp_input_cb(struct cryptop *crp)
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;
Index: src/sys/netipsec/xform_ipcomp.c
diff -u src/sys/netipsec/xform_ipcomp.c:1.65 src/sys/netipsec/xform_ipcomp.c:1.66
--- src/sys/netipsec/xform_ipcomp.c:1.65 Mon May 7 09:16:46 2018
+++ src/sys/netipsec/xform_ipcomp.c Sun May 13 18:34:59 2018
@@ -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 @@ ipcomp_input_cb(struct cryptop *crp)
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 @@ ipcomp_input_cb(struct cryptop *crp)
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;
