diff options
| author | melifaro <melifaro@FreeBSD.org> | 2012-10-22 19:22:31 +0000 |
|---|---|---|
| committer | melifaro <melifaro@FreeBSD.org> | 2012-10-22 19:22:31 +0000 |
| commit | e377b20c9958d604796e9752dfd8556cdad9f300 (patch) | |
| tree | 2d74bf38174f93cc388f4e41d028741db23d353e /sys/netpfil | |
| parent | a4f9a8cbfbdcf6617e3e960f5f391943f28f982c (diff) | |
| download | FreeBSD-src-e377b20c9958d604796e9752dfd8556cdad9f300.zip FreeBSD-src-e377b20c9958d604796e9752dfd8556cdad9f300.tar.gz | |
Remove unnecessary chain read lock in ipfw nat 'global' code.
Document case when ipfw chain lock must be held while calling ipfw_nat().
MFC after: 2 weeks
Diffstat (limited to 'sys/netpfil')
| -rw-r--r-- | sys/netpfil/ipfw/ip_fw_nat.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c index 94861b3..d387ddb 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -202,6 +202,13 @@ add_redir_spool_cfg(char *buf, struct cfg_nat *ptr) } } +/* + * ipfw_nat - perform mbuf header translation. + * + * Note V_layer3_chain has to be locked while calling ipfw_nat() in + * 'global' operation mode (t == NULL). + * + */ static int ipfw_nat(struct ip_fw_args *args, struct cfg_nat *t, struct mbuf *m) { @@ -269,7 +276,6 @@ ipfw_nat(struct ip_fw_args *args, struct cfg_nat *t, struct mbuf *m) found = 0; chain = &V_layer3_chain; - IPFW_RLOCK(chain); /* Check every nat entry... */ LIST_FOREACH(t, &chain->nat, _next) { if ((t->mode & PKT_ALIAS_SKIP_GLOBAL) != 0) @@ -282,7 +288,6 @@ ipfw_nat(struct ip_fw_args *args, struct cfg_nat *t, struct mbuf *m) break; } } - IPFW_RUNLOCK(chain); if (found != 1) { /* No instance found, return ignore */ args->m = mcl; |
