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

We left out V_static_len from ip_fw2.c

Browse Source 
(also a whitespace diff that i'd rahter fix her ethan break in the
vimage branch.)
This commit is contained in:
julian 2008-08-25 05:38:18 +00:00
parent d908a854a8
commit 64d908d08e
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/compat/svr4/svr4_sockio.c
View File

@ -37,8 +37,8 @@ __FBSDID("$FreeBSD$");
#include <sys/sockio.h> #include <sys/sockio.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/vimage.h> #include <sys/vimage.h>
#include <net/if.h>
#include <net/if.h>
#include <compat/svr4/svr4.h> #include <compat/svr4/svr4.h>
#include <compat/svr4/svr4_util.h> #include <compat/svr4/svr4_util.h>

6
sys/netinet/ip_fw2.c
View File

@ -3470,7 +3470,7 @@ add_rule(struct ip_fw_chain *chain, struct ip_fw *input_rule)
flush_rule_ptrs(chain); flush_rule_ptrs(chain);
done: done:
V_static_count++; V_static_count++;
static_len += l; V_static_len += l;
IPFW_WUNLOCK(chain); IPFW_WUNLOCK(chain);
DEB(printf("ipfw: installed rule %d, static count now %d\n", DEB(printf("ipfw: installed rule %d, static count now %d\n",
rule->rulenum, V_static_count);) rule->rulenum, V_static_count);)
@ -3503,7 +3503,7 @@ remove_rule(struct ip_fw_chain *chain, struct ip_fw *rule,
else else
prev->next = n; prev->next = n;
V_static_count--; V_static_count--;
static_len -= l; V_static_len -= l;
rule->next = chain->reap; rule->next = chain->reap;
chain->reap = rule; chain->reap = rule;
@ -4187,7 +4187,7 @@ ipfw_ctl(struct sockopt *sopt)
* change between calculating the size and returning the * change between calculating the size and returning the
* data in which case we'll just return what fits. * 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 */ if (V_ipfw_dyn_v) /* add size of dyn.rules */
size += (V_dyn_count * sizeof(ipfw_dyn_rule)); size += (V_dyn_count * sizeof(ipfw_dyn_rule));

1
sys/sys/vimage.h
View File

@ -293,6 +293,7 @@
#define V_sptree sptree #define V_sptree sptree
#define V_ss_fltsz ss_fltsz #define V_ss_fltsz ss_fltsz
#define V_ss_fltsz_local ss_fltsz_local #define V_ss_fltsz_local ss_fltsz_local
#define V_static_len static_len
#define V_static_count static_count #define V_static_count static_count
#define V_subnetsarelocal subnetsarelocal #define V_subnetsarelocal subnetsarelocal
#define V_tcb tcb #define V_tcb tcb