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

Reduce copy/paste when freeing an source node.

Browse Source
This commit is contained in:
Gleb Smirnoff 2012-09-20 07:04:08 +00:00
parent 22c914789e
commit b7340ded6e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/netpfil/pf/pf.c
View File

@ -673,6 +673,11 @@ pf_remove_src_node(struct pf_src_node *src)
PF_HASHROW_LOCK(sh); PF_HASHROW_LOCK(sh);
LIST_REMOVE(src, entry); LIST_REMOVE(src, entry);
PF_HASHROW_UNLOCK(sh); PF_HASHROW_UNLOCK(sh);
V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++;
V_pf_status.src_nodes--;
uma_zfree(V_pf_sources_z, src);
} }
/* Data storage structures initialization. */ /* Data storage structures initialization. */
@ -3547,18 +3552,12 @@ csfailed:
if (nk != NULL) if (nk != NULL)
uma_zfree(V_pf_state_key_z, nk); uma_zfree(V_pf_state_key_z, nk);
if (sn != NULL && sn->states == 0 && sn->expire == 0) { if (sn != NULL && sn->states == 0 && sn->expire == 0)
pf_remove_src_node(sn); pf_remove_src_node(sn);
V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++;
V_pf_status.src_nodes--; if (nsn != sn && nsn != NULL && nsn->states == 0 && nsn->expire == 0)
uma_zfree(V_pf_sources_z, sn);
}
if (nsn != sn && nsn != NULL && nsn->states == 0 && nsn->expire == 0) {
pf_remove_src_node(nsn); pf_remove_src_node(nsn);
V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++;
V_pf_status.src_nodes--;
uma_zfree(V_pf_sources_z, nsn);
}
return (PF_DROP); return (PF_DROP);
} }