jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-29 21:52:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Resolve conflicts created by import.

Browse Source
This commit is contained in:
Darren Reed 1997-04-03 10:47:12 +00:00
parent bcff1846f0
commit beec821495
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=24590
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/netinet/ip_input.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ip_input.c 8.2 (Berkeley) 1/4/94
* $Id$
* $Id: ip_input.c,v 1.1.1.2 1997/04/03 10:39:25 darrenr Exp $
* $ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
*/
@ -319,7 +319,19 @@ tooshort:
* - Wrap: fake packet's addr/port <unimpl.>
* - Encapsulate: put it in another IP and send out. <unimp.>
*/
#if defined(IPFILTER) || defined(IPFILTER_LKM)
/*
* Check if we want to allow this packet to be processed.
* Consider it to be bad if not.
*/
if (fr_check) {
struct mbuf *m1 = m;
if ((*fr_checkp)(ip, hlen, m->m_pkthdr.rcvif, 0, &m1) || !m1)
return;
ip = mtod(m = m1, struct ip *);
}
#endif
#ifdef COMPAT_IPFW
if (ip_fw_chk_ptr) {
int action;
@ -347,20 +359,6 @@ tooshort:
return;
#endif
#if defined(IPFILTER) || defined(IPFILTER_LKM)
/*
* Check if we want to allow this packet to be processed.
* Consider it to be bad if not.
*/
if (fr_check) {
struct mbuf *m1 = m;
if ((*fr_checkp)(ip, hlen, m->m_pkthdr.rcvif, 0, &m1) || !m1)
goto next;
ip = mtod(m = m1, struct ip *);
}
#endif
/*
* Process options and, if not destined for us,
* ship it on. ip_dooptions returns 1 when an

11
sys/netinet/ip_output.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ip_output.c 8.3 (Berkeley) 1/21/94
* $Id: ip_output.c,v 1.52 1997/02/28 19:40:48 fenner Exp $
* $Id: ip_output.c,v 1.1.1.2 1997/04/03 10:39:32 darrenr Exp $
*/
#define _IP_VHL
@ -75,14 +75,16 @@ static void ip_mloopback
__P((struct ifnet *, struct mbuf *, struct sockaddr_in *));
static int ip_getmoptions
__P((int, struct ip_moptions *, struct mbuf **));
static int ip_optcopy __P((struct ip *, struct ip *));
static int ip_pcbopts __P((struct mbuf **, struct mbuf *));
static int ip_setmoptions
__P((int, struct ip_moptions **, struct mbuf *));
#if defined(IPFILTER_LKM) || defined(IPFILTER)
int ip_optcopy __P((struct ip *, struct ip *));
extern int fr_check __P((struct ip *, int, struct ifnet *, int, struct mbuf **));
extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **));
#else
static int ip_optcopy __P((struct ip *, struct ip *));
#endif
@ -580,7 +582,10 @@ ip_insertoptions(m, opt, phlen)
* Copy options from ip to jp,
* omitting those not copied during fragmentation.
*/
static int
#if !defined(IPFILTER) && !defined(IPFILTER_LKM)
static
#endif
int
ip_optcopy(ip, jp)
struct ip *ip, *jp;
{