diff options
author | luigi <luigi@FreeBSD.org> | 2009-06-05 13:44:30 +0000 |
---|---|---|
committer | luigi <luigi@FreeBSD.org> | 2009-06-05 13:44:30 +0000 |
commit | 1384b62c4ba2ec9807b625311f416059f3a7aac0 (patch) | |
tree | c69eecd8f875c47b7a4ba27f5a37ac99ee98e78f /sys/netinet/ip_var.h | |
parent | 2e85daee53850ca1d9c8acfa556ce08d31c9515a (diff) | |
download | FreeBSD-src-1384b62c4ba2ec9807b625311f416059f3a7aac0.zip FreeBSD-src-1384b62c4ba2ec9807b625311f416059f3a7aac0.tar.gz |
More cleanup in preparation of ipfw relocation (no actual code change):
+ move ipfw and dummynet hooks declarations to raw_ip.c (definitions
in ip_var.h) same as for most other global variables.
This removes some dependencies from ip_input.c;
+ remove the IPFW_LOADED macro, just test ip_fw_chk_ptr directly;
+ remove the DUMMYNET_LOADED macro, just test ip_dn_io_ptr directly;
+ move ip_dn_ruledel_ptr to ip_fw2.c which is the only file using it;
To be merged together with rev 193497
MFC after: 5 days
Diffstat (limited to 'sys/netinet/ip_var.h')
-rw-r--r-- | sys/netinet/ip_var.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 472a458..aa9beb1 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -173,7 +173,8 @@ extern int ipstealth; /* stealth forwarding */ extern int rsvp_on; extern struct socket *ip_rsvpd; /* reservation protocol daemon */ extern struct socket *ip_mrouter; /* multicast routing daemon */ -#endif +#endif /* VIMAGE_GLOBALS */ + extern u_char ip_protox[]; extern int (*legal_vif_num)(int); extern u_long (*ip_mcast_src)(int); @@ -223,6 +224,13 @@ extern struct pfil_head inet_pfil_hook; /* packet filter hooks */ void in_delayed_cksum(struct mbuf *m); +/* ipfw and dummynet hooks. Most are declared in raw_ip.c */ +struct ip_fw_args; +extern int (*ip_fw_chk_ptr)(struct ip_fw_args *args); +extern int (*ip_fw_ctl_ptr)(struct sockopt *); +extern int (*ip_dn_ctl_ptr)(struct sockopt *); +extern int (*ip_dn_io_ptr)(struct mbuf **m, int dir, struct ip_fw_args *fwa); +extern void (*ip_dn_ruledel_ptr)(void *); /* in ip_fw2.c */ #endif /* _KERNEL */ #endif /* !_NETINET_IP_VAR_H_ */ |