Module Name: src
Committed By: drochner
Date: Wed Jan 11 14:39:08 UTC 2012
Modified Files:
src/sys/netinet: tcp_input.c
src/sys/netipsec: xform_tcp.c
Log Message:
fix build in the (FAST_)IPSEC & TCP_SIGNATURE case
To generate a diff of this commit:
cvs rdiff -u -r1.320 -r1.321 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.7 -r1.8 src/sys/netipsec/xform_tcp.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/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.320 src/sys/netinet/tcp_input.c:1.321
--- src/sys/netinet/tcp_input.c:1.320 Sat Dec 31 20:41:59 2011
+++ src/sys/netinet/tcp_input.c Wed Jan 11 14:39:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.320 2011/12/31 20:41:59 christos Exp $ */
+/* $NetBSD: tcp_input.c,v 1.321 2012/01/11 14:39:08 drochner 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.320 2011/12/31 20:41:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.321 2012/01/11 14:39:08 drochner Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -3176,7 +3176,7 @@ tcp_signature_getsav(struct mbuf *m, str
/*
* Look up an SADB entry which matches the address of the peer.
*/
- sav = KEY_ALLOCSA(&dst, IPPROTO_TCP, htonl(TCP_SIG_SPI));
+ sav = KEY_ALLOCSA(&dst, IPPROTO_TCP, htonl(TCP_SIG_SPI), 0, 0);
#else
if (ip)
sav = key_allocsa(AF_INET, (void *)&ip->ip_src,
Index: src/sys/netipsec/xform_tcp.c
diff -u src/sys/netipsec/xform_tcp.c:1.7 src/sys/netipsec/xform_tcp.c:1.8
--- src/sys/netipsec/xform_tcp.c:1.7 Fri Feb 18 20:40:58 2011
+++ src/sys/netipsec/xform_tcp.c Wed Jan 11 14:39:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_tcp.c,v 1.7 2011/02/18 20:40:58 drochner Exp $ */
+/* $NetBSD: xform_tcp.c,v 1.8 2012/01/11 14:39:08 drochner Exp $ */
/* $FreeBSD: sys/netipsec/xform_tcp.c,v 1.1.2.1 2004/02/14 22:24:09 bms Exp $ */
/*
@@ -31,7 +31,7 @@
/* TCP MD5 Signature Option (RFC2385) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_tcp.c,v 1.7 2011/02/18 20:40:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_tcp.c,v 1.8 2012/01/11 14:39:08 drochner Exp $");
#include "opt_inet.h"
@@ -160,7 +160,8 @@ tcpsignature_output(struct mbuf *m, stru
static struct xformsw tcpsignature_xformsw = {
XF_TCPSIGNATURE, XFT_AUTH, "TCPMD5",
tcpsignature_init, tcpsignature_zeroize,
- tcpsignature_input, tcpsignature_output
+ tcpsignature_input, tcpsignature_output,
+ NULL
};
INITFN void
