Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from PR kern/26839, OK'd as a stopgap fix by Darren.

Browse Source
This commit is contained in:
martin 2004-12-01 08:25:54 +00:00
parent a1f3bdce1e
commit 897d73f414
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dist/ipf/netinet/fil.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: fil.c,v 1.5 2004/11/25 09:49:12 christos Exp $ */ /* $NetBSD: fil.c,v 1.6 2004/12/01 08:25:54 martin Exp $ */
/* /*
* Copyright (C) 1993-2003 by Darren Reed. * Copyright (C) 1993-2003 by Darren Reed.
@ -135,7 +135,7 @@ struct file;
#if !defined(lint) #if !defined(lint)
#if defined(__NetBSD__) #if defined(__NetBSD__)
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.5 2004/11/25 09:49:12 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.6 2004/12/01 08:25:54 martin Exp $");
#else #else
static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: fil.c,v 2.243.2.25 2004/06/30 11:26:08 darrenr Exp"; static const char rcsid[] = "@(#)Id: fil.c,v 2.243.2.25 2004/06/30 11:26:08 darrenr Exp";
@ -419,7 +419,7 @@ fr_info_t *fin;
* Actually, hop by hop header is only allowed right * Actually, hop by hop header is only allowed right
* after IPv6 header! * after IPv6 header!
*/ */
if (coalesced == 0) { if ((fin->fin_m != NULL) && (coalesced == 0)) {
coalesced = fr_coalesce(fin); coalesced = fr_coalesce(fin);
if (coalesced == -1) if (coalesced == -1)
return; return;
@ -430,7 +430,7 @@ fr_info_t *fin;
frpr_hopopts6(fin); frpr_hopopts6(fin);
break; break;
case IPPROTO_DSTOPTS : case IPPROTO_DSTOPTS :
if (coalesced == 0) { if ((fin->fin_m != NULL) && (coalesced == 0)) {
coalesced = fr_coalesce(fin); coalesced = fr_coalesce(fin);
if (coalesced == -1) if (coalesced == -1)
return; return;
@ -438,7 +438,7 @@ fr_info_t *fin;
frpr_dstopts6(fin); frpr_dstopts6(fin);
break; break;
case IPPROTO_ROUTING : case IPPROTO_ROUTING :
if (coalesced == 0) { if ((fin->fin_m != NULL) && (coalesced == 0)) {
coalesced = fr_coalesce(fin); coalesced = fr_coalesce(fin);
if (coalesced == -1) if (coalesced == -1)
return; return;
@ -460,7 +460,7 @@ fr_info_t *fin;
go = 0; go = 0;
break; break;
case IPPROTO_FRAGMENT : case IPPROTO_FRAGMENT :
if (coalesced == 0) { if ((fin->fin_m != NULL) && (coalesced == 0)) {
coalesced = fr_coalesce(fin); coalesced = fr_coalesce(fin);
if (coalesced == -1) if (coalesced == -1)
return; return;