d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import OpenBSD stable branch.

Browse Source
This commit is contained in:
Max Laier 2004-06-17 16:52:25 +00:00
parent 32b3098356
commit 00924b8326
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/vendor-sys/pf/dist/; revision=130637
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/contrib/pf/net/pf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: pf.c,v 1.433 2004/03/26 22:20:57 dhartmei Exp $ */
/* $OpenBSD: pf.c,v 1.433.2.1 2004/04/30 21:46:33 brad Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@ -4898,17 +4898,14 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp,
if (ifp == NULL)
goto bad;
mtag = m_tag_find(m0, PACKET_TAG_PF_ROUTED, NULL);
if (mtag == NULL) {
struct m_tag *mtag;
if (m_tag_find(m0, PACKET_TAG_PF_ROUTED, NULL) != NULL)
goto bad;
mtag = m_tag_get(PACKET_TAG_PF_ROUTED, 0, M_NOWAIT);
if (mtag == NULL)
goto bad;
m_tag_prepend(m0, mtag);
mtag = m_tag_get(PACKET_TAG_PF_ROUTED, 0, M_NOWAIT);
if (mtag == NULL)
goto bad;
m_tag_prepend(m0, mtag);
}
if (oifp != ifp && mtag == NULL) {
if (oifp != ifp) {
if (pf_test(PF_OUT, ifp, &m0) != PF_PASS)
goto bad;
else if (m0 == NULL)

6
sys/contrib/pf/net/pf_ioctl.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: pf_ioctl.c,v 1.112 2004/03/22 04:54:18 mcbride Exp $ */
/* $OpenBSD: pf_ioctl.c,v 1.112.2.1 2004/04/30 21:43:30 brad Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@ -81,7 +81,7 @@ void pfattach(int);
int pfopen(dev_t, int, int, struct proc *);
int pfclose(dev_t, int, int, struct proc *);
struct pf_pool *pf_get_pool(char *, char *, u_int32_t,
u_int8_t, u_int8_t, u_int8_t, u_int8_t, u_int8_t);
u_int8_t, u_int32_t, u_int8_t, u_int8_t, u_int8_t);
int pf_get_ruleset_number(u_int8_t);
void pf_init_ruleset(struct pf_ruleset *);
void pf_mv_pool(struct pf_palist *, struct pf_palist *);
@ -198,7 +198,7 @@ pfclose(dev_t dev, int flags, int fmt, struct proc *p)
struct pf_pool *
pf_get_pool(char *anchorname, char *rulesetname, u_int32_t ticket,
u_int8_t rule_action, u_int8_t rule_number, u_int8_t r_last,
u_int8_t rule_action, u_int32_t rule_number, u_int8_t r_last,
u_int8_t active, u_int8_t check_ticket)
{
struct pf_ruleset *ruleset;

10
sys/contrib/pf/net/pf_norm.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: pf_norm.c,v 1.80 2004/03/09 21:44:41 mcbride Exp $ */
/* $OpenBSD: pf_norm.c,v 1.80.2.1 2004/04/30 21:46:33 brad Exp $ */
/*
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
@ -1362,8 +1362,8 @@ pf_normalize_tcp_init(struct mbuf *m, int off, struct pf_pdesc *pd,
}
/* FALLTHROUGH */
default:
hlen -= opt[1];
opt += opt[1];
hlen -= MAX(opt[1], 2);
opt += MAX(opt[1], 2);
break;
}
}
@ -1473,8 +1473,8 @@ pf_normalize_tcp_stateful(struct mbuf *m, int off, struct pf_pdesc *pd,
}
/* FALLTHROUGH */
default:
hlen -= opt[1];
opt += opt[1];
hlen -= MAX(opt[1], 2);
opt += MAX(opt[1], 2);
break;
}
}