diff options
| author | julian <julian@FreeBSD.org> | 2008-08-25 05:38:18 +0000 |
|---|---|---|
| committer | julian <julian@FreeBSD.org> | 2008-08-25 05:38:18 +0000 |
| commit | 64d908d08efb96c9d4abd5c31bfea8d6d2a8fed2 (patch) | |
| tree | d844e467ff749ffe05b16bf4424e654ce716ac0d | |
| parent | d908a854a8b06380b128f7e9bce82ea914045ab7 (diff) | |
| download | FreeBSD-src-64d908d08efb96c9d4abd5c31bfea8d6d2a8fed2.zip FreeBSD-src-64d908d08efb96c9d4abd5c31bfea8d6d2a8fed2.tar.gz | |
We left out V_static_len from ip_fw2.c
(also a whitespace diff that i'd rahter fix her ethan break in the
vimage branch.)
| -rw-r--r-- | sys/compat/svr4/svr4_sockio.c | 2 | ||||
| -rw-r--r-- | sys/netinet/ip_fw2.c | 6 | ||||
| -rw-r--r-- | sys/sys/vimage.h | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c index 41a1621..fb094d0 100644 --- a/sys/compat/svr4/svr4_sockio.c +++ b/sys/compat/svr4/svr4_sockio.c @@ -37,8 +37,8 @@ __FBSDID("$FreeBSD$"); #include <sys/sockio.h> #include <sys/socket.h> #include <sys/vimage.h> -#include <net/if.h> +#include <net/if.h> #include <compat/svr4/svr4.h> #include <compat/svr4/svr4_util.h> diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c index f58899a..6a17274 100644 --- a/sys/netinet/ip_fw2.c +++ b/sys/netinet/ip_fw2.c @@ -3470,7 +3470,7 @@ add_rule(struct ip_fw_chain *chain, struct ip_fw *input_rule) flush_rule_ptrs(chain); done: V_static_count++; - static_len += l; + V_static_len += l; IPFW_WUNLOCK(chain); DEB(printf("ipfw: installed rule %d, static count now %d\n", rule->rulenum, V_static_count);) @@ -3503,7 +3503,7 @@ remove_rule(struct ip_fw_chain *chain, struct ip_fw *rule, else prev->next = n; V_static_count--; - static_len -= l; + V_static_len -= l; rule->next = chain->reap; chain->reap = rule; @@ -4187,7 +4187,7 @@ ipfw_ctl(struct sockopt *sopt) * change between calculating the size and returning the * data in which case we'll just return what fits. */ - size = static_len; /* size of static rules */ + size = V_static_len; /* size of static rules */ if (V_ipfw_dyn_v) /* add size of dyn.rules */ size += (V_dyn_count * sizeof(ipfw_dyn_rule)); diff --git a/sys/sys/vimage.h b/sys/sys/vimage.h index 864d5aa..5c28555 100644 --- a/sys/sys/vimage.h +++ b/sys/sys/vimage.h @@ -293,6 +293,7 @@ #define V_sptree sptree #define V_ss_fltsz ss_fltsz #define V_ss_fltsz_local ss_fltsz_local +#define V_static_len static_len #define V_static_count static_count #define V_subnetsarelocal subnetsarelocal #define V_tcb tcb |
