Module Name: src
Committed By: maxv
Date: Fri May 18 19:02:49 UTC 2018
Modified Files:
src/sys/netipsec: ipsec_input.c xform_ah.c xform_esp.c
Log Message:
IP6_EXTHDR_GET -> M_REGION_GET, no functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/netipsec/ipsec_input.c
cvs rdiff -u -r1.100 -r1.101 src/sys/netipsec/xform_ah.c
cvs rdiff -u -r1.88 -r1.89 src/sys/netipsec/xform_esp.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/ipsec_input.c
diff -u src/sys/netipsec/ipsec_input.c:1.69 src/sys/netipsec/ipsec_input.c:1.70
--- src/sys/netipsec/ipsec_input.c:1.69 Sun Apr 29 14:54:09 2018
+++ src/sys/netipsec/ipsec_input.c Fri May 18 19:02:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_input.c,v 1.69 2018/04/29 14:54:09 maxv Exp $ */
+/* $NetBSD: ipsec_input.c,v 1.70 2018/05/18 19:02:49 maxv Exp $ */
/* $FreeBSD: ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $ */
/* $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.69 2018/04/29 14:54:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.70 2018/05/18 19:02:49 maxv Exp $");
/*
* IPsec input processing.
@@ -139,7 +139,7 @@ ipsec4_fixup_checksum(struct mbuf *m)
switch (ip->ip_p) {
case IPPROTO_TCP:
- IP6_EXTHDR_GET(th, struct tcphdr *, m, poff, sizeof(*th));
+ M_REGION_GET(th, struct tcphdr *, m, poff, sizeof(*th));
if (th == NULL)
return NULL;
off = th->th_off << 2;
@@ -151,7 +151,7 @@ ipsec4_fixup_checksum(struct mbuf *m)
th->th_sum = in4_cksum(m, IPPROTO_TCP, poff, plen);
break;
case IPPROTO_UDP:
- IP6_EXTHDR_GET(uh, struct udphdr *, m, poff, sizeof(*uh));
+ M_REGION_GET(uh, struct udphdr *, m, poff, sizeof(*uh));
if (uh == NULL)
return NULL;
off = sizeof(*uh);
Index: src/sys/netipsec/xform_ah.c
diff -u src/sys/netipsec/xform_ah.c:1.100 src/sys/netipsec/xform_ah.c:1.101
--- src/sys/netipsec/xform_ah.c:1.100 Sun May 13 18:34:59 2018
+++ src/sys/netipsec/xform_ah.c Fri May 18 19:02:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ah.c,v 1.100 2018/05/13 18:34:59 maxv Exp $ */
+/* $NetBSD: xform_ah.c,v 1.101 2018/05/18 19:02:49 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.100 2018/05/13 18:34:59 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.101 2018/05/18 19:02:49 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -530,7 +530,7 @@ ah_input(struct mbuf *m, struct secasvar
rplen = HDRSIZE(sav);
/* XXX don't pullup, just copy header */
- IP6_EXTHDR_GET(ah, struct newah *, m, skip, rplen);
+ M_REGION_GET(ah, struct newah *, m, skip, rplen);
if (ah == NULL) {
/* m already freed */
return ENOBUFS;
Index: src/sys/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.88 src/sys/netipsec/xform_esp.c:1.89
--- src/sys/netipsec/xform_esp.c:1.88 Sun May 13 18:34:59 2018
+++ src/sys/netipsec/xform_esp.c Fri May 18 19:02:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_esp.c,v 1.88 2018/05/13 18:34:59 maxv Exp $ */
+/* $NetBSD: xform_esp.c,v 1.89 2018/05/18 19:02:49 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.88 2018/05/13 18:34:59 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.89 2018/05/18 19:02:49 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -309,7 +309,7 @@ esp_input(struct mbuf *m, struct secasva
skip, m->m_pkthdr.len);
/* XXX don't pullup, just copy header */
- IP6_EXTHDR_GET(esp, struct newesp *, m, skip, sizeof(struct newesp));
+ M_REGION_GET(esp, struct newesp *, m, skip, sizeof(struct newesp));
if (esp == NULL) {
/* m already freed */
return ENOBUFS;
