Module Name: src
Committed By: maxv
Date: Mon Feb 12 08:22:27 UTC 2018
Modified Files:
src/sys/netinet: tcp_input.c tcp_output.c tcp_var.h
Log Message:
Remove unused argument from tcp_signature_getsav.
To generate a diff of this commit:
cvs rdiff -u -r1.378 -r1.379 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.197 -r1.198 src/sys/netinet/tcp_output.c
cvs rdiff -u -r1.183 -r1.184 src/sys/netinet/tcp_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.378 src/sys/netinet/tcp_input.c:1.379
--- src/sys/netinet/tcp_input.c:1.378 Mon Feb 12 08:13:08 2018
+++ src/sys/netinet/tcp_input.c Mon Feb 12 08:22:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.378 2018/02/12 08:13:08 maxv Exp $ */
+/* $NetBSD: tcp_input.c,v 1.379 2018/02/12 08:22:26 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.378 2018/02/12 08:13:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.379 2018/02/12 08:22:26 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -3092,7 +3092,7 @@ tcp_signature_apply(void *fstate, void *
}
struct secasvar *
-tcp_signature_getsav(struct mbuf *m, struct tcphdr *th)
+tcp_signature_getsav(struct mbuf *m)
{
struct ip *ip;
struct ip6_hdr *ip6;
@@ -3341,9 +3341,7 @@ tcp_dooptions(struct tcpcb *tp, const u_
return 0;
#else
if (tp->t_flags & TF_SIGNATURE) {
-
- sav = tcp_signature_getsav(m, th);
-
+ sav = tcp_signature_getsav(m);
if (sav == NULL && tp->t_state == TCPS_LISTEN)
return (-1);
}
@@ -4584,9 +4582,7 @@ syn_cache_respond(struct syn_cache *sc)
#ifdef TCP_SIGNATURE
if (sc->sc_flags & SCF_SIGNATURE) {
-
- sav = tcp_signature_getsav(m, th);
-
+ sav = tcp_signature_getsav(m);
if (sav == NULL) {
if (m)
m_freem(m);
Index: src/sys/netinet/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.197 src/sys/netinet/tcp_output.c:1.198
--- src/sys/netinet/tcp_output.c:1.197 Thu Aug 3 06:32:51 2017
+++ src/sys/netinet/tcp_output.c Mon Feb 12 08:22:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_output.c,v 1.197 2017/08/03 06:32:51 ozaki-r Exp $ */
+/* $NetBSD: tcp_output.c,v 1.198 2018/02/12 08:22:26 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.197 2017/08/03 06:32:51 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.198 2018/02/12 08:22:26 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1492,8 +1492,7 @@ reset: TCP_REASS_UNLOCK(tp);
struct secasvar *sav;
u_int8_t *sigp;
- sav = tcp_signature_getsav(m, th);
-
+ sav = tcp_signature_getsav(m);
if (sav == NULL) {
if (m)
m_freem(m);
Index: src/sys/netinet/tcp_var.h
diff -u src/sys/netinet/tcp_var.h:1.183 src/sys/netinet/tcp_var.h:1.184
--- src/sys/netinet/tcp_var.h:1.183 Mon Feb 12 08:08:28 2018
+++ src/sys/netinet/tcp_var.h Mon Feb 12 08:22:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_var.h,v 1.183 2018/02/12 08:08:28 maxv Exp $ */
+/* $NetBSD: tcp_var.h,v 1.184 2018/02/12 08:22:26 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -880,7 +880,7 @@ struct tcpcb *
tcp_drop(struct tcpcb *, int);
#ifdef TCP_SIGNATURE
int tcp_signature_apply(void *, void *, u_int);
-struct secasvar *tcp_signature_getsav(struct mbuf *, struct tcphdr *);
+struct secasvar *tcp_signature_getsav(struct mbuf *);
int tcp_signature(struct mbuf *, struct tcphdr *, int, struct secasvar *,
char *);
#endif
