Attachment 212872 Details for Bug 245190 – Backport of 11-STABLE MFCs

[patch] Backport of 11-STABLE MFCs

11.3-backport.diff (text/plain), 1.76 KB, created by Cy Schubert on 2020-03-30 18:48:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2020-03-30 18:48:35 UTC

Size: 1.76 KB

patch

obsolete

>Index: fil.c
>===================================================================
>--- fil.c	(revision 355305)
>+++ fil.c	(revision 355795)
>@@ -3436,7 +3436,7 @@
> 		ip6 = (ip6_t *)ip;
> 		off = ((caddr_t)ip6 - m->m_data) + sizeof(struct ip6_hdr);
> 		int len = ntohs(ip6->ip6_plen) - (off - sizeof(*ip6));
>-		return(ipf_pcksum6(fin, ip6, off, len));
>+		return(ipf_pcksum6(m, ip6, off, len));
> 	} else {
> 		return 0xffff;
> 	}
>@@ -6742,9 +6742,9 @@
> 		FR_DEBUG(("checkl4sum: %hx != %hx\n", sum, hdrsum));
> 	}
> #endif
>-	DT2(l4sums, u_short, hdrsum, u_short, sum);
>+	DT3(l4sums, u_short, hdrsum, u_short, sum, fr_info_t *, fin);
> #ifdef USE_INET6
>-	if (hdrsum == sum || (sum == 0 && fin->fin_p == IPPROTO_ICMPV6)) {
>+	if (hdrsum == sum || (sum == 0 && IP_V(fin->fin_ip) == 6)) {
> #else
> 	if (hdrsum == sum) {
> #endif
>Index: ip_fil.h
>===================================================================
>--- ip_fil.h	(revision 355305)
>+++ ip_fil.h	(revision 355795)
>@@ -1840,7 +1840,7 @@
> extern	u_32_t		ipf_newisn __P((fr_info_t *));
> extern	u_int		ipf_pcksum __P((fr_info_t *, int, u_int));
> #ifdef	USE_INET6
>-extern	u_int		ipf_pcksum6 __P((fr_info_t *, ip6_t *,
>+extern	u_int		ipf_pcksum6 __P((struct mbuf *, ip6_t *,
> 						u_int32_t, u_int32_t));
> #endif
> extern	void		ipf_rule_expire __P((ipf_main_softc_t *));
>Index: ip_fil_freebsd.c
>===================================================================
>--- ip_fil_freebsd.c	(revision 355305)
>+++ ip_fil_freebsd.c	(revision 355795)
>@@ -1450,17 +1450,15 @@
> 
> #ifdef	USE_INET6
> u_int
>-ipf_pcksum6(fin, ip6, off, len)
>-	fr_info_t *fin;
>+ipf_pcksum6(m, ip6, off, len)
>+	struct mbuf *m;
> 	ip6_t *ip6;
> 	u_int32_t off;
> 	u_int32_t len;
> {
> #ifdef	_KERNEL
>-	struct mbuf *m;
> 	int sum;
> 
>-	m = fin->fin_m;
> 	if (m->m_len < sizeof(struct ip6_hdr)) {
> 		return 0xffff;
> 	}

Actions: View | Diff

Attachments on bug 245190: 212872