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

The struct ipfw_rule_ref follows the struct m_tag. Deal with this

Browse Source 
correctly. This fixes breakage of ng_ipfw(4) in r201527.

Submitted by:	Alexander Zagrebin <alexz visp.ru>
This commit is contained in:
Gleb Smirnoff 2010-07-01 17:46:12 +00:00
parent 962cf29525
commit 956000b838
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/netgraph/ng_ipfw.c
View File

@ -221,20 +221,21 @@ ng_ipfw_findhook1(node_p node, u_int16_t rulenum)
static int
ng_ipfw_rcvdata(hook_p hook, item_p item)
{
struct ipfw_rule_ref *tag;
struct m_tag *tag;
struct ipfw_rule_ref *r;
struct mbuf *m;
NGI_GET_M(item, m);
NG_FREE_ITEM(item);
tag = (struct ipfw_rule_ref *)
m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL);
tag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL);
if (tag == NULL) {
NG_FREE_M(m);
return (EINVAL); /* XXX: find smth better */
};
if (tag->info & IPFW_INFO_IN) {
r = (struct ipfw_rule_ref *)(tag + 1);
if (r->info & IPFW_INFO_IN) {
ip_input(m);
return (0);
} else {