diff options
Diffstat (limited to 'sys/contrib/ipfilter')
41 files changed, 1010 insertions, 1016 deletions
diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c index 03d50e0963a1..7402437d98c7 100644 --- a/sys/contrib/ipfilter/netinet/fil.c +++ b/sys/contrib/ipfilter/netinet/fil.c @@ -120,67 +120,65 @@ extern int blockreason; #define LBUMP(x) softc->x++ #define LBUMPD(x, y) do { softc->x.y++; DT(y); } while (0) -static INLINE int ipf_check_ipf __P((fr_info_t *, frentry_t *, int)); -static u_32_t ipf_checkcipso __P((fr_info_t *, u_char *, int)); -static u_32_t ipf_checkripso __P((u_char *)); -static u_32_t ipf_decaps __P((fr_info_t *, u_32_t, int)); +static INLINE int ipf_check_ipf(fr_info_t *, frentry_t *, int); +static u_32_t ipf_checkcipso(fr_info_t *, u_char *, int); +static u_32_t ipf_checkripso(u_char *); +static u_32_t ipf_decaps(fr_info_t *, u_32_t, int); #ifdef IPFILTER_LOG -static frentry_t *ipf_dolog __P((fr_info_t *, u_32_t *)); +static frentry_t *ipf_dolog(fr_info_t *, u_32_t *); #endif -static int ipf_flushlist __P((ipf_main_softc_t *, int *, - frentry_t **)); -static int ipf_flush_groups __P((ipf_main_softc_t *, frgroup_t **, - int)); -static ipfunc_t ipf_findfunc __P((ipfunc_t)); -static void *ipf_findlookup __P((ipf_main_softc_t *, int, - frentry_t *, - i6addr_t *, i6addr_t *)); -static frentry_t *ipf_firewall __P((fr_info_t *, u_32_t *)); -static int ipf_fr_matcharray __P((fr_info_t *, int *)); -static int ipf_frruleiter __P((ipf_main_softc_t *, void *, int, - void *)); -static void ipf_funcfini __P((ipf_main_softc_t *, frentry_t *)); -static int ipf_funcinit __P((ipf_main_softc_t *, frentry_t *)); -static int ipf_geniter __P((ipf_main_softc_t *, ipftoken_t *, - ipfgeniter_t *)); -static void ipf_getstat __P((ipf_main_softc_t *, - struct friostat *, int)); -static int ipf_group_flush __P((ipf_main_softc_t *, frgroup_t *)); -static void ipf_group_free __P((frgroup_t *)); -static int ipf_grpmapfini __P((struct ipf_main_softc_s *, - frentry_t *)); -static int ipf_grpmapinit __P((struct ipf_main_softc_s *, - frentry_t *)); -static frentry_t *ipf_nextrule __P((ipf_main_softc_t *, int, int, - frentry_t *, int)); -static int ipf_portcheck __P((frpcmp_t *, u_32_t)); -static INLINE int ipf_pr_ah __P((fr_info_t *)); -static INLINE void ipf_pr_esp __P((fr_info_t *)); -static INLINE void ipf_pr_gre __P((fr_info_t *)); -static INLINE void ipf_pr_udp __P((fr_info_t *)); -static INLINE void ipf_pr_tcp __P((fr_info_t *)); -static INLINE void ipf_pr_icmp __P((fr_info_t *)); -static INLINE void ipf_pr_ipv4hdr __P((fr_info_t *)); -static INLINE void ipf_pr_short __P((fr_info_t *, int)); -static INLINE int ipf_pr_tcpcommon __P((fr_info_t *)); -static INLINE int ipf_pr_udpcommon __P((fr_info_t *)); -static void ipf_rule_delete __P((ipf_main_softc_t *, frentry_t *f, - int, int)); -static void ipf_rule_expire_insert __P((ipf_main_softc_t *, - frentry_t *, int)); -static int ipf_synclist __P((ipf_main_softc_t *, frentry_t *, - void *)); -static void ipf_token_flush __P((ipf_main_softc_t *)); -static void ipf_token_unlink __P((ipf_main_softc_t *, - ipftoken_t *)); -static ipftuneable_t *ipf_tune_findbyname __P((ipftuneable_t *, - const char *)); -static ipftuneable_t *ipf_tune_findbycookie __P((ipftuneable_t **, void *, - void **)); -static int ipf_updateipid __P((fr_info_t *)); -static int ipf_settimeout __P((struct ipf_main_softc_s *, +static int ipf_flushlist(ipf_main_softc_t *, int *, frentry_t **); +static int ipf_flush_groups(ipf_main_softc_t *, frgroup_t **, + int); +static ipfunc_t ipf_findfunc(ipfunc_t); +static void *ipf_findlookup(ipf_main_softc_t *, int, frentry_t *, + i6addr_t *, i6addr_t *); +static frentry_t *ipf_firewall(fr_info_t *, u_32_t *); +static int ipf_fr_matcharray(fr_info_t *, int *); +static int ipf_frruleiter(ipf_main_softc_t *, void *, int, + void *); +static void ipf_funcfini(ipf_main_softc_t *, frentry_t *); +static int ipf_funcinit(ipf_main_softc_t *, frentry_t *); +static int ipf_geniter(ipf_main_softc_t *, ipftoken_t *, + ipfgeniter_t *); +static void ipf_getstat(ipf_main_softc_t *, + struct friostat *, int); +static int ipf_group_flush(ipf_main_softc_t *, frgroup_t *); +static void ipf_group_free(frgroup_t *); +static int ipf_grpmapfini(struct ipf_main_softc_s *, + frentry_t *); +static int ipf_grpmapinit(struct ipf_main_softc_s *, + frentry_t *); +static frentry_t *ipf_nextrule(ipf_main_softc_t *, int, int, + frentry_t *, int); +static int ipf_portcheck(frpcmp_t *, u_32_t); +static INLINE int ipf_pr_ah(fr_info_t *); +static INLINE void ipf_pr_esp(fr_info_t *); +static INLINE void ipf_pr_gre(fr_info_t *); +static INLINE void ipf_pr_udp(fr_info_t *); +static INLINE void ipf_pr_tcp(fr_info_t *); +static INLINE void ipf_pr_icmp(fr_info_t *); +static INLINE void ipf_pr_ipv4hdr(fr_info_t *); +static INLINE void ipf_pr_short(fr_info_t *, int); +static INLINE int ipf_pr_tcpcommon(fr_info_t *); +static INLINE int ipf_pr_udpcommon(fr_info_t *); +static void ipf_rule_delete(ipf_main_softc_t *, frentry_t *f, + int, int); +static void ipf_rule_expire_insert(ipf_main_softc_t *, + frentry_t *, int); +static int ipf_synclist(ipf_main_softc_t *, frentry_t *, + void *); +static void ipf_token_flush(ipf_main_softc_t *); +static void ipf_token_unlink(ipf_main_softc_t *, + ipftoken_t *); +static ipftuneable_t *ipf_tune_findbyname(ipftuneable_t *, + const char *); +static ipftuneable_t *ipf_tune_findbycookie(ipftuneable_t **, void *, + void **); +static int ipf_updateipid(fr_info_t *); +static int ipf_settimeout(struct ipf_main_softc_s *, struct ipftuneable *, - ipftuneval_t *)); + ipftuneval_t *); #if !defined(_KERNEL) || SOLARIS static int ppsratecheck(struct timeval *, int *, int); #endif @@ -394,20 +392,20 @@ static ipftuneable_t ipf_main_tuneables[] = { * adding more code to a growing switch statement. */ #ifdef USE_INET6 -static INLINE int ipf_pr_ah6 __P((fr_info_t *)); -static INLINE void ipf_pr_esp6 __P((fr_info_t *)); -static INLINE void ipf_pr_gre6 __P((fr_info_t *)); -static INLINE void ipf_pr_udp6 __P((fr_info_t *)); -static INLINE void ipf_pr_tcp6 __P((fr_info_t *)); -static INLINE void ipf_pr_icmp6 __P((fr_info_t *)); -static INLINE void ipf_pr_ipv6hdr __P((fr_info_t *)); -static INLINE void ipf_pr_short6 __P((fr_info_t *, int)); -static INLINE int ipf_pr_hopopts6 __P((fr_info_t *)); -static INLINE int ipf_pr_mobility6 __P((fr_info_t *)); -static INLINE int ipf_pr_routing6 __P((fr_info_t *)); -static INLINE int ipf_pr_dstopts6 __P((fr_info_t *)); -static INLINE int ipf_pr_fragment6 __P((fr_info_t *)); -static INLINE struct ip6_ext *ipf_pr_ipv6exthdr __P((fr_info_t *, int, int)); +static INLINE int ipf_pr_ah6(fr_info_t *); +static INLINE void ipf_pr_esp6(fr_info_t *); +static INLINE void ipf_pr_gre6(fr_info_t *); +static INLINE void ipf_pr_udp6(fr_info_t *); +static INLINE void ipf_pr_tcp6(fr_info_t *); +static INLINE void ipf_pr_icmp6(fr_info_t *); +static INLINE void ipf_pr_ipv6hdr(fr_info_t *); +static INLINE void ipf_pr_short6(fr_info_t *, int); +static INLINE int ipf_pr_hopopts6(fr_info_t *); +static INLINE int ipf_pr_mobility6(fr_info_t *); +static INLINE int ipf_pr_routing6(fr_info_t *); +static INLINE int ipf_pr_dstopts6(fr_info_t *); +static INLINE int ipf_pr_fragment6(fr_info_t *); +static INLINE struct ip6_ext *ipf_pr_ipv6exthdr(fr_info_t *, int, int); /* ------------------------------------------------------------------------ */ @@ -9809,9 +9807,9 @@ ipf_rule_expire(softc) } -static int ipf_ht_node_cmp __P((struct host_node_s *, struct host_node_s *)); -static void ipf_ht_node_make_key __P((host_track_t *, host_node_t *, int, - i6addr_t *)); +static int ipf_ht_node_cmp(struct host_node_s *, struct host_node_s *); +static void ipf_ht_node_make_key(host_track_t *, host_node_t *, int, + i6addr_t *); host_node_t RBI_ZERO(ipf_rb); RBI_CODE(ipf_rb, host_node_t, hn_entry, ipf_ht_node_cmp) diff --git a/sys/contrib/ipfilter/netinet/ip_auth.c b/sys/contrib/ipfilter/netinet/ip_auth.c index f08d0b2fd1d9..18b8f3a65641 100644 --- a/sys/contrib/ipfilter/netinet/ip_auth.c +++ b/sys/contrib/ipfilter/netinet/ip_auth.c @@ -115,13 +115,13 @@ static const char rcsid[] = "@(#)$FreeBSD$"; #endif -static void ipf_auth_deref __P((frauthent_t **)); -static void ipf_auth_deref_unlocked __P((ipf_auth_softc_t *, frauthent_t **)); -static int ipf_auth_geniter __P((ipf_main_softc_t *, ipftoken_t *, - ipfgeniter_t *, ipfobj_t *)); -static int ipf_auth_reply __P((ipf_main_softc_t *, ipf_auth_softc_t *, char *)); -static int ipf_auth_wait __P((ipf_main_softc_t *, ipf_auth_softc_t *, char *)); -static int ipf_auth_flush __P((void *)); +static void ipf_auth_deref(frauthent_t **); +static void ipf_auth_deref_unlocked(ipf_auth_softc_t *, frauthent_t **); +static int ipf_auth_geniter(ipf_main_softc_t *, ipftoken_t *, + ipfgeniter_t *, ipfobj_t *); +static int ipf_auth_reply(ipf_main_softc_t *, ipf_auth_softc_t *, char *); +static int ipf_auth_wait(ipf_main_softc_t *, ipf_auth_softc_t *, char *); +static int ipf_auth_flush(void *); /* ------------------------------------------------------------------------ */ diff --git a/sys/contrib/ipfilter/netinet/ip_auth.h b/sys/contrib/ipfilter/netinet/ip_auth.h index 81e166a6bee5..e914dacacdf0 100644 --- a/sys/contrib/ipfilter/netinet/ip_auth.h +++ b/sys/contrib/ipfilter/netinet/ip_auth.h @@ -68,25 +68,25 @@ typedef struct ipf_auth_softc_s { frentry_t *ipf_auth_rules; } ipf_auth_softc_t; -extern frentry_t *ipf_auth_check __P((fr_info_t *, u_32_t *)); -extern void ipf_auth_expire __P((ipf_main_softc_t *)); -extern int ipf_auth_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t, - int, int, void *)); -extern int ipf_auth_init __P((void)); -extern int ipf_auth_main_load __P((void)); -extern int ipf_auth_main_unload __P((void)); -extern void ipf_auth_soft_destroy __P((ipf_main_softc_t *, void *)); -extern void *ipf_auth_soft_create __P((ipf_main_softc_t *)); -extern int ipf_auth_new __P((mb_t *, fr_info_t *)); -extern int ipf_auth_precmd __P((ipf_main_softc_t *, ioctlcmd_t, - frentry_t *, frentry_t **)); -extern void ipf_auth_unload __P((ipf_main_softc_t *)); -extern int ipf_auth_waiting __P((ipf_main_softc_t *)); -extern void ipf_auth_setlock __P((void *, int)); -extern int ipf_auth_soft_init __P((ipf_main_softc_t *, void *)); -extern int ipf_auth_soft_fini __P((ipf_main_softc_t *, void *)); -extern u_32_t ipf_auth_pre_scanlist __P((ipf_main_softc_t *, fr_info_t *, - u_32_t)); -extern frentry_t **ipf_auth_rulehead __P((ipf_main_softc_t *)); +extern frentry_t *ipf_auth_check(fr_info_t *, u_32_t *); +extern void ipf_auth_expire(ipf_main_softc_t *); +extern int ipf_auth_ioctl(ipf_main_softc_t *, caddr_t, ioctlcmd_t, + int, int, void *); +extern int ipf_auth_init(void); +extern int ipf_auth_main_load(void); +extern int ipf_auth_main_unload(void); +extern void ipf_auth_soft_destroy(ipf_main_softc_t *, void *); +extern void *ipf_auth_soft_create(ipf_main_softc_t *); +extern int ipf_auth_new(mb_t *, fr_info_t *); +extern int ipf_auth_precmd(ipf_main_softc_t *, ioctlcmd_t, + frentry_t *, frentry_t **); +extern void ipf_auth_unload(ipf_main_softc_t *); +extern int ipf_auth_waiting(ipf_main_softc_t *); +extern void ipf_auth_setlock(void *, int); +extern int ipf_auth_soft_init(ipf_main_softc_t *, void *); +extern int ipf_auth_soft_fini(ipf_main_softc_t *, void *); +extern u_32_t ipf_auth_pre_scanlist(ipf_main_softc_t *, fr_info_t *, + u_32_t); +extern frentry_t **ipf_auth_rulehead(ipf_main_softc_t *); #endif /* __IP_AUTH_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h index ac20b527ab34..4394b732e10c 100644 --- a/sys/contrib/ipfilter/netinet/ip_compat.h +++ b/sys/contrib/ipfilter/netinet/ip_compat.h @@ -11,10 +11,6 @@ #ifndef __IP_COMPAT_H__ #define __IP_COMPAT_H__ -#ifndef __P -# define __P(x) x -#endif - #if defined(_KERNEL) || defined(KERNEL) || defined(__KERNEL__) # undef KERNEL # undef _KERNEL @@ -366,12 +362,12 @@ typedef struct mb_s { MTOD((mb_t *)m, char *) + (o), \ (l)) # define UIOMOVE(a,b,c,d) ipfuiomove((caddr_t)a,b,c,d) -extern void m_copydata __P((mb_t *, int, int, caddr_t)); -extern int ipfuiomove __P((caddr_t, int, int, struct uio *)); -extern int bcopywrap __P((void *, void *, size_t)); -extern mb_t *allocmbt __P((size_t)); -extern mb_t *dupmbt __P((mb_t *)); -extern void freembt __P((mb_t *)); +extern void m_copydata(mb_t *, int, int, caddr_t); +extern int ipfuiomove(caddr_t, int, int, struct uio *); +extern int bcopywrap(void *, void *, size_t); +extern mb_t *allocmbt(size_t); +extern mb_t *dupmbt(mb_t *); +extern void freembt(mb_t *); # define MUTEX_DESTROY(x) eMmutex_destroy(&(x)->ipf_emu, \ __FILE__, __LINE__) @@ -398,16 +394,16 @@ extern void freembt __P((mb_t *)); # define USE_MUTEXES 1 -extern void eMmutex_destroy __P((eMmutex_t *, char *, int)); -extern void eMmutex_enter __P((eMmutex_t *, char *, int)); -extern void eMmutex_exit __P((eMmutex_t *, char *, int)); -extern void eMmutex_init __P((eMmutex_t *, char *, char *, int)); -extern void eMrwlock_destroy __P((eMrwlock_t *)); -extern void eMrwlock_exit __P((eMrwlock_t *)); -extern void eMrwlock_init __P((eMrwlock_t *, char *)); -extern void eMrwlock_read_enter __P((eMrwlock_t *, char *, int)); -extern void eMrwlock_write_enter __P((eMrwlock_t *, char *, int)); -extern void eMrwlock_downgrade __P((eMrwlock_t *, char *, int)); +extern void eMmutex_destroy(eMmutex_t *, char *, int); +extern void eMmutex_enter(eMmutex_t *, char *, int); +extern void eMmutex_exit(eMmutex_t *, char *, int); +extern void eMmutex_init(eMmutex_t *, char *, char *, int); +extern void eMrwlock_destroy(eMrwlock_t *); +extern void eMrwlock_exit(eMrwlock_t *); +extern void eMrwlock_init(eMrwlock_t *, char *); +extern void eMrwlock_read_enter(eMrwlock_t *, char *, int); +extern void eMrwlock_write_enter(eMrwlock_t *, char *, int); +extern void eMrwlock_downgrade(eMrwlock_t *, char *, int); #endif @@ -586,7 +582,7 @@ MALLOC_DECLARE(M_IPFILTER); #endif #ifndef COPYIFNAME # define NEED_FRGETIFNAME -extern char *ipf_getifname __P((struct ifnet *, char *)); +extern char *ipf_getifname(struct ifnet *, char *); # define COPYIFNAME(v, x, b) \ ipf_getifname((struct ifnet *)x, b) #endif diff --git a/sys/contrib/ipfilter/netinet/ip_dns_pxy.c b/sys/contrib/ipfilter/netinet/ip_dns_pxy.c index ff1bc792bd59..22871a7ba02b 100644 --- a/sys/contrib/ipfilter/netinet/ip_dns_pxy.c +++ b/sys/contrib/ipfilter/netinet/ip_dns_pxy.c @@ -27,16 +27,16 @@ typedef struct ipf_dns_softc_s { u_long ipf_p_dns_nospace; } ipf_dns_softc_t; -int ipf_p_dns_allow_query __P((ipf_dns_softc_t *, dnsinfo_t *)); -int ipf_p_dns_ctl __P((ipf_main_softc_t *, void *, ap_ctl_t *)); -void ipf_p_dns_del __P((ipf_main_softc_t *, ap_session_t *)); -int ipf_p_dns_get_name __P((ipf_dns_softc_t *, char *, int, char *, int)); -int ipf_p_dns_inout __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_dns_match __P((fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_dns_match_names __P((ipf_dns_filter_t *, char *, int)); -int ipf_p_dns_new __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -void *ipf_p_dns_soft_create __P((ipf_main_softc_t *)); -void ipf_p_dns_soft_destroy __P((ipf_main_softc_t *, void *)); +int ipf_p_dns_allow_query(ipf_dns_softc_t *, dnsinfo_t *); +int ipf_p_dns_ctl(ipf_main_softc_t *, void *, ap_ctl_t *); +void ipf_p_dns_del(ipf_main_softc_t *, ap_session_t *); +int ipf_p_dns_get_name(ipf_dns_softc_t *, char *, int, char *, int); +int ipf_p_dns_inout(void *, fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_dns_match(fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_dns_match_names(ipf_dns_filter_t *, char *, int); +int ipf_p_dns_new(void *, fr_info_t *, ap_session_t *, nat_t *); +void *ipf_p_dns_soft_create(ipf_main_softc_t *); +void ipf_p_dns_soft_destroy(ipf_main_softc_t *, void *); typedef struct { u_char dns_id[2]; diff --git a/sys/contrib/ipfilter/netinet/ip_dstlist.c b/sys/contrib/ipfilter/netinet/ip_dstlist.c index 4f2e3bb05a18..0c65e4cd6896 100644 --- a/sys/contrib/ipfilter/netinet/ip_dstlist.c +++ b/sys/contrib/ipfilter/netinet/ip_dstlist.c @@ -73,41 +73,41 @@ typedef struct ipf_dstl_softc_s { } ipf_dstl_softc_t; -static void *ipf_dstlist_soft_create __P((ipf_main_softc_t *)); -static void ipf_dstlist_soft_destroy __P((ipf_main_softc_t *, void *)); -static int ipf_dstlist_soft_init __P((ipf_main_softc_t *, void *)); -static void ipf_dstlist_soft_fini __P((ipf_main_softc_t *, void *)); -static int ipf_dstlist_addr_find __P((ipf_main_softc_t *, void *, int, - void *, u_int)); -static size_t ipf_dstlist_flush __P((ipf_main_softc_t *, void *, - iplookupflush_t *)); -static int ipf_dstlist_iter_deref __P((ipf_main_softc_t *, void *, int, int, - void *)); -static int ipf_dstlist_iter_next __P((ipf_main_softc_t *, void *, ipftoken_t *, - ipflookupiter_t *)); -static int ipf_dstlist_node_add __P((ipf_main_softc_t *, void *, - iplookupop_t *, int)); -static int ipf_dstlist_node_del __P((ipf_main_softc_t *, void *, - iplookupop_t *, int)); -static int ipf_dstlist_stats_get __P((ipf_main_softc_t *, void *, - iplookupop_t *)); -static int ipf_dstlist_table_add __P((ipf_main_softc_t *, void *, - iplookupop_t *)); -static int ipf_dstlist_table_del __P((ipf_main_softc_t *, void *, - iplookupop_t *)); -static int ipf_dstlist_table_deref __P((ipf_main_softc_t *, void *, void *)); -static void *ipf_dstlist_table_find __P((void *, int, char *)); -static void ipf_dstlist_table_free __P((ipf_dstl_softc_t *, ippool_dst_t *)); -static void ipf_dstlist_table_remove __P((ipf_main_softc_t *, - ipf_dstl_softc_t *, ippool_dst_t *)); -static void ipf_dstlist_table_clearnodes __P((ipf_dstl_softc_t *, - ippool_dst_t *)); -static ipf_dstnode_t *ipf_dstlist_select __P((fr_info_t *, ippool_dst_t *)); -static void *ipf_dstlist_select_ref __P((void *, int, char *)); -static void ipf_dstlist_node_free __P((ipf_dstl_softc_t *, ippool_dst_t *, ipf_dstnode_t *)); -static int ipf_dstlist_node_deref __P((void *, ipf_dstnode_t *)); -static void ipf_dstlist_expire __P((ipf_main_softc_t *, void *)); -static void ipf_dstlist_sync __P((ipf_main_softc_t *, void *)); +static void *ipf_dstlist_soft_create(ipf_main_softc_t *); +static void ipf_dstlist_soft_destroy(ipf_main_softc_t *, void *); +static int ipf_dstlist_soft_init(ipf_main_softc_t *, void *); +static void ipf_dstlist_soft_fini(ipf_main_softc_t *, void *); +static int ipf_dstlist_addr_find(ipf_main_softc_t *, void *, int, + void *, u_int); +static size_t ipf_dstlist_flush(ipf_main_softc_t *, void *, + iplookupflush_t *); +static int ipf_dstlist_iter_deref(ipf_main_softc_t *, void *, int, int, + void *); +static int ipf_dstlist_iter_next(ipf_main_softc_t *, void *, ipftoken_t *, + ipflookupiter_t *); +static int ipf_dstlist_node_add(ipf_main_softc_t *, void *, + iplookupop_t *, int); +static int ipf_dstlist_node_del(ipf_main_softc_t *, void *, + iplookupop_t *, int); +static int ipf_dstlist_stats_get(ipf_main_softc_t *, void *, + iplookupop_t *); +static int ipf_dstlist_table_add(ipf_main_softc_t *, void *, + iplookupop_t *); +static int ipf_dstlist_table_del(ipf_main_softc_t *, void *, + iplookupop_t *); +static int ipf_dstlist_table_deref(ipf_main_softc_t *, void *, void *); +static void *ipf_dstlist_table_find(void *, int, char *); +static void ipf_dstlist_table_free(ipf_dstl_softc_t *, ippool_dst_t *); +static void ipf_dstlist_table_remove(ipf_main_softc_t *, + ipf_dstl_softc_t *, ippool_dst_t *); +static void ipf_dstlist_table_clearnodes(ipf_dstl_softc_t *, + ippool_dst_t *); +static ipf_dstnode_t *ipf_dstlist_select(fr_info_t *, ippool_dst_t *); +static void *ipf_dstlist_select_ref(void *, int, char *); +static void ipf_dstlist_node_free(ipf_dstl_softc_t *, ippool_dst_t *, ipf_dstnode_t *); +static int ipf_dstlist_node_deref(void *, ipf_dstnode_t *); +static void ipf_dstlist_expire(ipf_main_softc_t *, void *); +static void ipf_dstlist_sync(ipf_main_softc_t *, void *); ipf_lookup_t ipf_dstlist_backend = { IPLT_DSTLIST, diff --git a/sys/contrib/ipfilter/netinet/ip_dstlist.h b/sys/contrib/ipfilter/netinet/ip_dstlist.h index e2885e5c47ad..c4acd78dfd94 100644 --- a/sys/contrib/ipfilter/netinet/ip_dstlist.h +++ b/sys/contrib/ipfilter/netinet/ip_dstlist.h @@ -62,7 +62,7 @@ typedef struct dstlist_stat_s { extern ipf_lookup_t ipf_dstlist_backend; -extern int ipf_dstlist_select_node __P((fr_info_t *, void *, u_32_t *, - frdest_t *)); +extern int ipf_dstlist_select_node(fr_info_t *, void *, u_32_t *, + frdest_t *); #endif /* __IP_DSTLIST_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/contrib/ipfilter/netinet/ip_fil.h index 0c7448492464..3121e94f1488 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil.h +++ b/sys/contrib/ipfilter/netinet/ip_fil.h @@ -84,8 +84,8 @@ struct ipscan; struct ifnet; struct ipf_main_softc_s; -typedef int (* lookupfunc_t) __P((struct ipf_main_softc_s *, void *, - int, void *, u_int)); +typedef int (* lookupfunc_t)(struct ipf_main_softc_s *, void *, + int, void *, u_int); /* * i6addr is used as a container for both IPv4 and IPv6 addresses, as well @@ -435,8 +435,8 @@ typedef struct fr_info { #define IPF_IN 0 #define IPF_OUT 1 -typedef struct frentry *(*ipfunc_t) __P((fr_info_t *, u_32_t *)); -typedef int (*ipfuncinit_t) __P((struct ipf_main_softc_s *, struct frentry *)); +typedef struct frentry *(*ipfunc_t)(fr_info_t *, u_32_t *); +typedef int (*ipfuncinit_t)(struct ipf_main_softc_s *, struct frentry *); typedef struct ipfunc_resolve { char ipfu_name[32]; @@ -621,7 +621,7 @@ typedef enum fr_rtypes_e { FR_T_IPFEXPR_BUILTIN } fr_rtypes_t; -typedef struct frentry * (* frentfunc_t) __P((fr_info_t *)); +typedef struct frentry * (* frentfunc_t)(fr_info_t *); typedef struct frentry { ipfmutex_t fr_lock; @@ -1325,7 +1325,7 @@ typedef union ipftuneval { } ipftuneval_t; struct ipftuneable; -typedef int (* ipftunefunc_t) __P((struct ipf_main_softc_s *, struct ipftuneable *, ipftuneval_t *)); +typedef int (* ipftunefunc_t)(struct ipf_main_softc_s *, struct ipftuneable *, ipftuneval_t *); typedef struct ipftuneable { ipftunevalptr_t ipft_una; @@ -1382,8 +1382,8 @@ typedef struct ipftune { # define FR_VERBOSE(verb_pr) # define FR_DEBUG(verb_pr) #else -extern void ipfkdebug __P((char *, ...)); -extern void ipfkverbose __P((char *, ...)); +extern void ipfkdebug(char *, ...); +extern void ipfkverbose(char *, ...); # define FR_VERBOSE(verb_pr) ipfkverbose verb_pr # define FR_DEBUG(verb_pr) ipfkdebug verb_pr #endif @@ -1611,233 +1611,233 @@ typedef struct ipf_main_softc_s { } while (0) #ifndef _KERNEL -extern int ipf_check __P((void *, struct ip *, int, struct ifnet *, int, mb_t **)); -extern struct ifnet *get_unit __P((char *, int)); -extern char *get_ifname __P((struct ifnet *)); -extern int ipfioctl __P((ipf_main_softc_t *, int, ioctlcmd_t, - caddr_t, int)); -extern void m_freem __P((mb_t *)); -extern size_t msgdsize __P((mb_t *)); -extern int bcopywrap __P((void *, void *, size_t)); +extern int ipf_check(void *, struct ip *, int, struct ifnet *, int, mb_t **); +extern struct ifnet *get_unit(char *, int); +extern char *get_ifname(struct ifnet *); +extern int ipfioctl(ipf_main_softc_t *, int, ioctlcmd_t, + caddr_t, int); +extern void m_freem(mb_t *); +extern size_t msgdsize(mb_t *); +extern int bcopywrap(void *, void *, size_t); extern void ip_fillid(struct ip *); #else /* #ifndef _KERNEL */ # if defined(__NetBSD__) && defined(PFIL_HOOKS) -extern void ipfilterattach __P((int)); +extern void ipfilterattach(int); # endif -extern int ipl_enable __P((void)); -extern int ipl_disable __P((void)); +extern int ipl_enable(void); +extern int ipl_disable(void); # ifdef MENTAT /* XXX MENTAT is always defined for Solaris */ -extern int ipf_check __P((void *, struct ip *, int, struct ifnet *, int, void *, - mblk_t **)); +extern int ipf_check(void *, struct ip *, int, struct ifnet *, int, void *, + mblk_t **); # if SOLARIS extern void ipf_prependmbt(fr_info_t *, mblk_t *); -extern int ipfioctl __P((dev_t, int, intptr_t, int, cred_t *, int *)); +extern int ipfioctl(dev_t, int, intptr_t, int, cred_t *, int *); # endif -extern int ipf_qout __P((queue_t *, mblk_t *)); +extern int ipf_qout(queue_t *, mblk_t *); # else /* MENTAT */ /* XXX MENTAT is never defined for FreeBSD & NetBSD */ -extern int ipf_check __P((void *, struct ip *, int, struct ifnet *, int, mb_t **)); -extern int (*fr_checkp) __P((ip_t *, int, void *, int, mb_t **)); -extern size_t mbufchainlen __P((mb_t *)); +extern int ipf_check(void *, struct ip *, int, struct ifnet *, int, mb_t **); +extern int (*fr_checkp)(ip_t *, int, void *, int, mb_t **); +extern size_t mbufchainlen(mb_t *); # ifdef IPFILTER_LKM -extern int ipf_identify __P((char *)); +extern int ipf_identify(char *); # endif # if defined(__FreeBSD_version) -extern int ipfioctl __P((struct cdev*, u_long, caddr_t, int, struct thread *)); +extern int ipfioctl(struct cdev*, u_long, caddr_t, int, struct thread *); # elif defined(__NetBSD__) -extern int ipfioctl __P((dev_t, u_long, void *, int, struct lwp *)); +extern int ipfioctl(dev_t, u_long, void *, int, struct lwp *); # endif # endif /* MENTAT */ # if defined(__FreeBSD_version) -extern int ipf_pfil_hook __P((void)); -extern int ipf_pfil_unhook __P((void)); -extern void ipf_event_reg __P((void)); -extern void ipf_event_dereg __P((void)); +extern int ipf_pfil_hook(void); +extern int ipf_pfil_unhook(void); +extern void ipf_event_reg(void); +extern void ipf_event_dereg(void); # endif # if defined(INSTANCES) -extern ipf_main_softc_t *ipf_find_softc __P((u_long)); -extern int ipf_set_loopback __P((ipf_main_softc_t *, ipftuneable_t *, - ipftuneval_t *)); +extern ipf_main_softc_t *ipf_find_softc(u_long); +extern int ipf_set_loopback(ipf_main_softc_t *, ipftuneable_t *, + ipftuneval_t *); # endif #endif /* #ifndef _KERNEL */ -extern char *memstr __P((const char *, char *, size_t, size_t)); -extern int count4bits __P((u_32_t)); +extern char *memstr(const char *, char *, size_t, size_t); +extern int count4bits(u_32_t); #ifdef USE_INET6 -extern int count6bits __P((u_32_t *)); +extern int count6bits(u_32_t *); #endif -extern int frrequest __P((ipf_main_softc_t *, int, ioctlcmd_t, caddr_t, - int, int)); -extern char *getifname __P((struct ifnet *)); -extern int ipfattach __P((ipf_main_softc_t *)); -extern int ipfdetach __P((ipf_main_softc_t *)); -extern u_short ipf_cksum __P((u_short *, int)); -extern int copyinptr __P((ipf_main_softc_t *, void *, void *, size_t)); -extern int copyoutptr __P((ipf_main_softc_t *, void *, void *, size_t)); -extern int ipf_fastroute __P((mb_t *, mb_t **, fr_info_t *, frdest_t *)); -extern int ipf_inject __P((fr_info_t *, mb_t *)); -extern int ipf_inobj __P((ipf_main_softc_t *, void *, ipfobj_t *, - void *, int)); -extern int ipf_inobjsz __P((ipf_main_softc_t *, void *, void *, - int , int)); -extern int ipf_ioctlswitch __P((ipf_main_softc_t *, int, void *, - ioctlcmd_t, int, int, void *)); -extern int ipf_ipf_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t, - int, int, void *)); -extern int ipf_ipftune __P((ipf_main_softc_t *, ioctlcmd_t, void *)); -extern int ipf_matcharray_load __P((ipf_main_softc_t *, caddr_t, - ipfobj_t *, int **)); -extern int ipf_matcharray_verify __P((int *, int)); -extern int ipf_outobj __P((ipf_main_softc_t *, void *, void *, int)); -extern int ipf_outobjk __P((ipf_main_softc_t *, ipfobj_t *, void *)); -extern int ipf_outobjsz __P((ipf_main_softc_t *, void *, void *, - int, int)); -extern void *ipf_pullup __P((mb_t *, fr_info_t *, int)); -extern int ipf_resolvedest __P((ipf_main_softc_t *, char *, - struct frdest *, int)); -extern int ipf_resolvefunc __P((ipf_main_softc_t *, void *)); -extern void *ipf_resolvenic __P((ipf_main_softc_t *, char *, int)); -extern int ipf_send_icmp_err __P((int, fr_info_t *, int)); -extern int ipf_send_reset __P((fr_info_t *)); -extern void ipf_apply_timeout __P((ipftq_t *, u_int)); -extern ipftq_t *ipf_addtimeoutqueue __P((ipf_main_softc_t *, ipftq_t **, - u_int)); -extern void ipf_deletequeueentry __P((ipftqent_t *)); -extern int ipf_deletetimeoutqueue __P((ipftq_t *)); -extern void ipf_freetimeoutqueue __P((ipf_main_softc_t *, ipftq_t *)); -extern void ipf_movequeue __P((u_long, ipftqent_t *, ipftq_t *, - ipftq_t *)); -extern void ipf_queueappend __P((u_long, ipftqent_t *, ipftq_t *, void *)); -extern void ipf_queueback __P((u_long, ipftqent_t *)); -extern int ipf_queueflush __P((ipf_main_softc_t *, ipftq_delete_fn_t, - ipftq_t *, ipftq_t *, u_int *, int, int)); -extern void ipf_queuefront __P((ipftqent_t *)); -extern int ipf_settimeout_tcp __P((ipftuneable_t *, ipftuneval_t *, - ipftq_t *)); -extern int ipf_checkv4sum __P((fr_info_t *)); -extern int ipf_checkl4sum __P((fr_info_t *)); -extern int ipf_ifpfillv4addr __P((int, struct sockaddr_in *, +extern int frrequest(ipf_main_softc_t *, int, ioctlcmd_t, caddr_t, + int, int); +extern char *getifname(struct ifnet *); +extern int ipfattach(ipf_main_softc_t *); +extern int ipfdetach(ipf_main_softc_t *); +extern u_short ipf_cksum(u_short *, int); +extern int copyinptr(ipf_main_softc_t *, void *, void *, size_t); +extern int copyoutptr(ipf_main_softc_t *, void *, void *, size_t); +extern int ipf_fastroute(mb_t *, mb_t **, fr_info_t *, frdest_t *); +extern int ipf_inject(fr_info_t *, mb_t *); +extern int ipf_inobj(ipf_main_softc_t *, void *, ipfobj_t *, + void *, int); +extern int ipf_inobjsz(ipf_main_softc_t *, void *, void *, + int , int); +extern int ipf_ioctlswitch(ipf_main_softc_t *, int, void *, + ioctlcmd_t, int, int, void *); +extern int ipf_ipf_ioctl(ipf_main_softc_t *, caddr_t, ioctlcmd_t, + int, int, void *); +extern int ipf_ipftune(ipf_main_softc_t *, ioctlcmd_t, void *); +extern int ipf_matcharray_load(ipf_main_softc_t *, caddr_t, + ipfobj_t *, int **); +extern int ipf_matcharray_verify(int *, int); +extern int ipf_outobj(ipf_main_softc_t *, void *, void *, int); +extern int ipf_outobjk(ipf_main_softc_t *, ipfobj_t *, void *); +extern int ipf_outobjsz(ipf_main_softc_t *, void *, void *, + int, int); +extern void *ipf_pullup(mb_t *, fr_info_t *, int); +extern int ipf_resolvedest(ipf_main_softc_t *, char *, + struct frdest *, int); +extern int ipf_resolvefunc(ipf_main_softc_t *, void *); +extern void *ipf_resolvenic(ipf_main_softc_t *, char *, int); +extern int ipf_send_icmp_err(int, fr_info_t *, int); +extern int ipf_send_reset(fr_info_t *); +extern void ipf_apply_timeout(ipftq_t *, u_int); +extern ipftq_t *ipf_addtimeoutqueue(ipf_main_softc_t *, ipftq_t **, + u_int); +extern void ipf_deletequeueentry(ipftqent_t *); +extern int ipf_deletetimeoutqueue(ipftq_t *); +extern void ipf_freetimeoutqueue(ipf_main_softc_t *, ipftq_t *); +extern void ipf_movequeue(u_long, ipftqent_t *, ipftq_t *, + ipftq_t *); +extern void ipf_queueappend(u_long, ipftqent_t *, ipftq_t *, void *); +extern void ipf_queueback(u_long, ipftqent_t *); +extern int ipf_queueflush(ipf_main_softc_t *, ipftq_delete_fn_t, + ipftq_t *, ipftq_t *, u_int *, int, int); +extern void ipf_queuefront(ipftqent_t *); +extern int ipf_settimeout_tcp(ipftuneable_t *, ipftuneval_t *, + ipftq_t *); +extern int ipf_checkv4sum(fr_info_t *); +extern int ipf_checkl4sum(fr_info_t *); +extern int ipf_ifpfillv4addr(int, struct sockaddr_in *, struct sockaddr_in *, struct in_addr *, - struct in_addr *)); -extern int ipf_coalesce __P((fr_info_t *)); + struct in_addr *); +extern int ipf_coalesce(fr_info_t *); #ifdef USE_INET6 -extern int ipf_checkv6sum __P((fr_info_t *)); -extern int ipf_ifpfillv6addr __P((int, struct sockaddr_in6 *, +extern int ipf_checkv6sum(fr_info_t *); +extern int ipf_ifpfillv6addr(int, struct sockaddr_in6 *, struct sockaddr_in6 *, i6addr_t *, - i6addr_t *)); + i6addr_t *); #endif -extern int ipf_tune_add __P((ipf_main_softc_t *, ipftuneable_t *)); -extern int ipf_tune_add_array __P((ipf_main_softc_t *, ipftuneable_t *)); -extern int ipf_tune_del __P((ipf_main_softc_t *, ipftuneable_t *)); -extern int ipf_tune_del_array __P((ipf_main_softc_t *, ipftuneable_t *)); -extern int ipf_tune_array_link __P((ipf_main_softc_t *, ipftuneable_t *)); -extern int ipf_tune_array_unlink __P((ipf_main_softc_t *, - ipftuneable_t *)); -extern ipftuneable_t *ipf_tune_array_copy __P((void *, size_t, - ipftuneable_t *)); - -extern int ipf_pr_pullup __P((fr_info_t *, int)); - -extern int ipf_flush __P((ipf_main_softc_t *, minor_t, int)); -extern frgroup_t *ipf_group_add __P((ipf_main_softc_t *, char *, void *, - u_32_t, minor_t, int)); -extern void ipf_group_del __P((ipf_main_softc_t *, frgroup_t *, - frentry_t *)); -extern int ipf_derefrule __P((ipf_main_softc_t *, frentry_t **)); -extern frgroup_t *ipf_findgroup __P((ipf_main_softc_t *, char *, minor_t, - int, frgroup_t ***)); - -extern int ipf_log_init __P((void)); -extern int ipf_log_bytesused __P((ipf_main_softc_t *, int)); -extern int ipf_log_canread __P((ipf_main_softc_t *, int)); -extern int ipf_log_clear __P((ipf_main_softc_t *, minor_t)); -extern u_long ipf_log_failures __P((ipf_main_softc_t *, int)); -extern int ipf_log_read __P((ipf_main_softc_t *, minor_t, uio_t *)); -extern int ipf_log_items __P((ipf_main_softc_t *, int, fr_info_t *, - void **, size_t *, int *, int)); -extern u_long ipf_log_logok __P((ipf_main_softc_t *, int)); -extern void ipf_log_unload __P((ipf_main_softc_t *)); -extern int ipf_log_pkt __P((fr_info_t *, u_int)); - -extern frentry_t *ipf_acctpkt __P((fr_info_t *, u_32_t *)); -extern u_short fr_cksum __P((fr_info_t *, ip_t *, int, void *)); -extern void ipf_deinitialise __P((ipf_main_softc_t *)); -extern int ipf_deliverlocal __P((ipf_main_softc_t *, int, void *, - i6addr_t *)); -extern frentry_t *ipf_dstgrpmap __P((fr_info_t *, u_32_t *)); -extern void ipf_fixskip __P((frentry_t **, frentry_t *, int)); -extern void ipf_forgetifp __P((ipf_main_softc_t *, void *)); -extern frentry_t *ipf_getrulen __P((ipf_main_softc_t *, int, char *, - u_32_t)); -extern int ipf_ifpaddr __P((ipf_main_softc_t *, int, int, void *, - i6addr_t *, i6addr_t *)); -extern void ipf_inet_mask_add __P((int, ipf_v4_masktab_t *)); -extern void ipf_inet_mask_del __P((int, ipf_v4_masktab_t *)); +extern int ipf_tune_add(ipf_main_softc_t *, ipftuneable_t *); +extern int ipf_tune_add_array(ipf_main_softc_t *, ipftuneable_t *); +extern int ipf_tune_del(ipf_main_softc_t *, ipftuneable_t *); +extern int ipf_tune_del_array(ipf_main_softc_t *, ipftuneable_t *); +extern int ipf_tune_array_link(ipf_main_softc_t *, ipftuneable_t *); +extern int ipf_tune_array_unlink(ipf_main_softc_t *, + ipftuneable_t *); +extern ipftuneable_t *ipf_tune_array_copy(void *, size_t, + ipftuneable_t *); + +extern int ipf_pr_pullup(fr_info_t *, int); + +extern int ipf_flush(ipf_main_softc_t *, minor_t, int); +extern frgroup_t *ipf_group_add(ipf_main_softc_t *, char *, void *, + u_32_t, minor_t, int); +extern void ipf_group_del(ipf_main_softc_t *, frgroup_t *, + frentry_t *); +extern int ipf_derefrule(ipf_main_softc_t *, frentry_t **); +extern frgroup_t *ipf_findgroup(ipf_main_softc_t *, char *, minor_t, + int, frgroup_t ***); + +extern int ipf_log_init(void); +extern int ipf_log_bytesused(ipf_main_softc_t *, int); +extern int ipf_log_canread(ipf_main_softc_t *, int); +extern int ipf_log_clear(ipf_main_softc_t *, minor_t); +extern u_long ipf_log_failures(ipf_main_softc_t *, int); +extern int ipf_log_read(ipf_main_softc_t *, minor_t, uio_t *); +extern int ipf_log_items(ipf_main_softc_t *, int, fr_info_t *, + void **, size_t *, int *, int); +extern u_long ipf_log_logok(ipf_main_softc_t *, int); +extern void ipf_log_unload(ipf_main_softc_t *); +extern int ipf_log_pkt(fr_info_t *, u_int); + +extern frentry_t *ipf_acctpkt(fr_info_t *, u_32_t *); +extern u_short fr_cksum(fr_info_t *, ip_t *, int, void *); +extern void ipf_deinitialise(ipf_main_softc_t *); +extern int ipf_deliverlocal(ipf_main_softc_t *, int, void *, + i6addr_t *); +extern frentry_t *ipf_dstgrpmap(fr_info_t *, u_32_t *); +extern void ipf_fixskip(frentry_t **, frentry_t *, int); +extern void ipf_forgetifp(ipf_main_softc_t *, void *); +extern frentry_t *ipf_getrulen(ipf_main_softc_t *, int, char *, + u_32_t); +extern int ipf_ifpaddr(ipf_main_softc_t *, int, int, void *, + i6addr_t *, i6addr_t *); +extern void ipf_inet_mask_add(int, ipf_v4_masktab_t *); +extern void ipf_inet_mask_del(int, ipf_v4_masktab_t *); #ifdef USE_INET6 -extern void ipf_inet6_mask_add __P((int, i6addr_t *, - ipf_v6_masktab_t *)); -extern void ipf_inet6_mask_del __P((int, i6addr_t *, - ipf_v6_masktab_t *)); +extern void ipf_inet6_mask_add(int, i6addr_t *, + ipf_v6_masktab_t *); +extern void ipf_inet6_mask_del(int, i6addr_t *, + ipf_v6_masktab_t *); #endif -extern int ipf_initialise __P((void)); -extern int ipf_lock __P((caddr_t, int *)); -extern int ipf_makefrip __P((int, ip_t *, fr_info_t *)); -extern int ipf_matchtag __P((ipftag_t *, ipftag_t *)); -extern int ipf_matchicmpqueryreply __P((int, icmpinfo_t *, - struct icmp *, int)); -extern u_32_t ipf_newisn __P((fr_info_t *)); -extern u_int ipf_pcksum __P((fr_info_t *, int, u_int)); +extern int ipf_initialise(void); +extern int ipf_lock(caddr_t, int *); +extern int ipf_makefrip(int, ip_t *, fr_info_t *); +extern int ipf_matchtag(ipftag_t *, ipftag_t *); +extern int ipf_matchicmpqueryreply(int, icmpinfo_t *, + struct icmp *, int); +extern u_32_t ipf_newisn(fr_info_t *); +extern u_int ipf_pcksum(fr_info_t *, int, u_int); #ifdef USE_INET6 -extern u_int ipf_pcksum6 __P((struct mbuf *, ip6_t *, - u_int32_t, u_int32_t)); +extern u_int ipf_pcksum6(struct mbuf *, ip6_t *, + u_int32_t, u_int32_t); #endif -extern void ipf_rule_expire __P((ipf_main_softc_t *)); -extern int ipf_scanlist __P((fr_info_t *, u_32_t)); -extern frentry_t *ipf_srcgrpmap __P((fr_info_t *, u_32_t *)); -extern int ipf_tcpudpchk __P((fr_ip_t *, frtuc_t *)); -extern int ipf_verifysrc __P((fr_info_t *fin)); -extern int ipf_zerostats __P((ipf_main_softc_t *, char *)); -extern int ipf_getnextrule __P((ipf_main_softc_t *, ipftoken_t *, - void *)); -extern int ipf_sync __P((ipf_main_softc_t *, void *)); -extern int ipf_token_deref __P((ipf_main_softc_t *, ipftoken_t *)); -extern void ipf_token_expire __P((ipf_main_softc_t *)); -extern ipftoken_t *ipf_token_find __P((ipf_main_softc_t *, int, int, - void *)); -extern int ipf_token_del __P((ipf_main_softc_t *, int, int, - void *)); -extern void ipf_token_mark_complete __P((ipftoken_t *)); -extern int ipf_genericiter __P((ipf_main_softc_t *, void *, - int, void *)); +extern void ipf_rule_expire(ipf_main_softc_t *); +extern int ipf_scanlist(fr_info_t *, u_32_t); +extern frentry_t *ipf_srcgrpmap(fr_info_t *, u_32_t *); +extern int ipf_tcpudpchk(fr_ip_t *, frtuc_t *); +extern int ipf_verifysrc(fr_info_t *fin); +extern int ipf_zerostats(ipf_main_softc_t *, char *); +extern int ipf_getnextrule(ipf_main_softc_t *, ipftoken_t *, + void *); +extern int ipf_sync(ipf_main_softc_t *, void *); +extern int ipf_token_deref(ipf_main_softc_t *, ipftoken_t *); +extern void ipf_token_expire(ipf_main_softc_t *); +extern ipftoken_t *ipf_token_find(ipf_main_softc_t *, int, int, + void *); +extern int ipf_token_del(ipf_main_softc_t *, int, int, + void *); +extern void ipf_token_mark_complete(ipftoken_t *); +extern int ipf_genericiter(ipf_main_softc_t *, void *, + int, void *); #ifdef IPFILTER_LOOKUP -extern void *ipf_resolvelookup __P((int, u_int, u_int, - lookupfunc_t *)); +extern void *ipf_resolvelookup(int, u_int, u_int, + lookupfunc_t *); #endif -extern u_32_t ipf_random __P((void)); - -extern int ipf_main_load __P((void)); -extern void *ipf_main_soft_create __P((void *)); -extern void ipf_main_soft_destroy __P((ipf_main_softc_t *)); -extern int ipf_main_soft_init __P((ipf_main_softc_t *)); -extern int ipf_main_soft_fini __P((ipf_main_softc_t *)); -extern int ipf_main_unload __P((void)); -extern int ipf_load_all __P((void)); -extern int ipf_unload_all __P((void)); -extern void ipf_destroy_all __P((ipf_main_softc_t *)); -extern ipf_main_softc_t *ipf_create_all __P((void *)); -extern int ipf_init_all __P((ipf_main_softc_t *)); -extern int ipf_fini_all __P((ipf_main_softc_t *)); -extern void ipf_log_soft_destroy __P((ipf_main_softc_t *, void *)); -extern void *ipf_log_soft_create __P((ipf_main_softc_t *)); -extern int ipf_log_soft_init __P((ipf_main_softc_t *, void *)); -extern int ipf_log_soft_fini __P((ipf_main_softc_t *, void *)); -extern int ipf_log_main_load __P((void)); -extern int ipf_log_main_unload __P((void)); +extern u_32_t ipf_random(void); + +extern int ipf_main_load(void); +extern void *ipf_main_soft_create(void *); +extern void ipf_main_soft_destroy(ipf_main_softc_t *); +extern int ipf_main_soft_init(ipf_main_softc_t *); +extern int ipf_main_soft_fini(ipf_main_softc_t *); +extern int ipf_main_unload(void); +extern int ipf_load_all(void); +extern int ipf_unload_all(void); +extern void ipf_destroy_all(ipf_main_softc_t *); +extern ipf_main_softc_t *ipf_create_all(void *); +extern int ipf_init_all(ipf_main_softc_t *); +extern int ipf_fini_all(ipf_main_softc_t *); +extern void ipf_log_soft_destroy(ipf_main_softc_t *, void *); +extern void *ipf_log_soft_create(ipf_main_softc_t *); +extern int ipf_log_soft_init(ipf_main_softc_t *, void *); +extern int ipf_log_soft_fini(ipf_main_softc_t *, void *); +extern int ipf_log_main_load(void); +extern int ipf_log_main_unload(void); extern char ipfilter_version[]; @@ -1847,16 +1847,16 @@ extern int icmptoicmp6unreach[ICMP_MAX_UNREACH]; extern int icmpreplytype6[ICMP6_MAXTYPE + 1]; #endif #ifdef IPFILTER_COMPAT -extern int ipf_in_compat __P((ipf_main_softc_t *, ipfobj_t *, void *,int)); -extern int ipf_out_compat __P((ipf_main_softc_t *, ipfobj_t *, void *)); +extern int ipf_in_compat(ipf_main_softc_t *, ipfobj_t *, void *,int); +extern int ipf_out_compat(ipf_main_softc_t *, ipfobj_t *, void *); #endif extern int icmpreplytype4[ICMP_MAXTYPE + 1]; -extern int ipf_ht_node_add __P((ipf_main_softc_t *, host_track_t *, - int, i6addr_t *)); -extern int ipf_ht_node_del __P((host_track_t *, int, i6addr_t *)); -extern void ipf_rb_ht_flush __P((host_track_t *)); -extern void ipf_rb_ht_freenode __P((host_node_t *, void *)); -extern void ipf_rb_ht_init __P((host_track_t *)); +extern int ipf_ht_node_add(ipf_main_softc_t *, host_track_t *, + int, i6addr_t *); +extern int ipf_ht_node_del(host_track_t *, int, i6addr_t *); +extern void ipf_rb_ht_flush(host_track_t *); +extern void ipf_rb_ht_freenode(host_node_t *, void *); +extern void ipf_rb_ht_init(host_track_t *); #endif /* __IP_FIL_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c index 0215b41562b1..7fc64cefb4c2 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c @@ -83,15 +83,15 @@ static const char rcsid[] = "@(#)$Id$"; #ifdef CSUM_DATA_VALID #include <machine/in_cksum.h> #endif -extern int ip_optcopy __P((struct ip *, struct ip *)); +extern int ip_optcopy(struct ip *, struct ip *); # ifdef IPFILTER_M_IPFILTER MALLOC_DEFINE(M_IPFILTER, "ipfilter", "IP Filter packet filter data structures"); # endif -static int ipf_send_ip __P((fr_info_t *, mb_t *)); -static void ipf_timer_func __P((void *arg)); +static int ipf_send_ip(fr_info_t *, mb_t *); +static void ipf_timer_func(void *arg); VNET_DEFINE(ipf_main_softc_t, ipfmain) = { .ipf_running = -2, diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/contrib/ipfilter/netinet/ip_frag.c index 28d306da2a60..0636f27c81e8 100644 --- a/sys/contrib/ipfilter/netinet/ip_frag.c +++ b/sys/contrib/ipfilter/netinet/ip_frag.c @@ -81,23 +81,23 @@ static const char rcsid[] = "@(#)$FreeBSD$"; #ifdef USE_MUTEXES -static ipfr_t *ipfr_frag_new __P((ipf_main_softc_t *, ipf_frag_softc_t *, +static ipfr_t *ipfr_frag_new(ipf_main_softc_t *, ipf_frag_softc_t *, fr_info_t *, u_32_t, ipfr_t **, - ipfrwlock_t *)); -static ipfr_t *ipf_frag_lookup __P((ipf_main_softc_t *, ipf_frag_softc_t *, fr_info_t *, ipfr_t **, ipfrwlock_t *)); -static void ipf_frag_deref __P((void *, ipfr_t **, ipfrwlock_t *)); -static int ipf_frag_next __P((ipf_main_softc_t *, ipftoken_t *, ipfgeniter_t *, - ipfr_t **, ipfrwlock_t *)); + ipfrwlock_t *); +static ipfr_t *ipf_frag_lookup(ipf_main_softc_t *, ipf_frag_softc_t *, fr_info_t *, ipfr_t **, ipfrwlock_t *); +static void ipf_frag_deref(void *, ipfr_t **, ipfrwlock_t *); +static int ipf_frag_next(ipf_main_softc_t *, ipftoken_t *, ipfgeniter_t *, + ipfr_t **, ipfrwlock_t *); #else -static ipfr_t *ipfr_frag_new __P((ipf_main_softc_t *, ipf_frag_softc_t *, - fr_info_t *, u_32_t, ipfr_t **)); -static ipfr_t *ipf_frag_lookup __P((ipf_main_softc_t *, ipf_frag_softc_t *, fr_info_t *, ipfr_t **)); -static void ipf_frag_deref __P((void *, ipfr_t **)); -static int ipf_frag_next __P((ipf_main_softc_t *, ipftoken_t *, ipfgeniter_t *, - ipfr_t **)); +static ipfr_t *ipfr_frag_new(ipf_main_softc_t *, ipf_frag_softc_t *, + fr_info_t *, u_32_t, ipfr_t **); +static ipfr_t *ipf_frag_lookup(ipf_main_softc_t *, ipf_frag_softc_t *, fr_info_t *, ipfr_t **); +static void ipf_frag_deref(void *, ipfr_t **); +static int ipf_frag_next(ipf_main_softc_t *, ipftoken_t *, ipfgeniter_t *, + ipfr_t **); #endif -static void ipf_frag_delete __P((ipf_main_softc_t *, ipfr_t *, ipfr_t ***)); -static void ipf_frag_free __P((ipf_frag_softc_t *, ipfr_t *)); +static void ipf_frag_delete(ipf_main_softc_t *, ipfr_t *, ipfr_t ***); +static void ipf_frag_free(ipf_frag_softc_t *, ipfr_t *); static frentry_t ipfr_block; diff --git a/sys/contrib/ipfilter/netinet/ip_frag.h b/sys/contrib/ipfilter/netinet/ip_frag.h index 08f45ff313ae..b85e009b2155 100644 --- a/sys/contrib/ipfilter/netinet/ip_frag.h +++ b/sys/contrib/ipfilter/netinet/ip_frag.h @@ -94,32 +94,32 @@ typedef struct ipf_frag_softc_s { #define IPFR_CMPSZ (offsetof(ipfr_t, ipfr_pass) - \ offsetof(ipfr_t, ipfr_ifp)) -extern void *ipf_frag_soft_create __P((ipf_main_softc_t *)); -extern int ipf_frag_soft_init __P((ipf_main_softc_t *, void *)); -extern int ipf_frag_soft_fini __P((ipf_main_softc_t *, void *)); -extern void ipf_frag_soft_destroy __P((ipf_main_softc_t *, void *)); -extern int ipf_frag_main_load __P((void)); -extern int ipf_frag_main_unload __P((void)); -extern int ipf_frag_load __P((void)); -extern void ipf_frag_clear __P((ipf_main_softc_t *)); -extern void ipf_frag_expire __P((ipf_main_softc_t *)); -extern void ipf_frag_forget __P((void *)); -extern int ipf_frag_init __P((void)); -extern u_32_t ipf_frag_ipidknown __P((fr_info_t *)); -extern int ipf_frag_ipidnew __P((fr_info_t *, u_32_t)); -extern frentry_t *ipf_frag_known __P((fr_info_t *, u_32_t *)); -extern void ipf_frag_natforget __P((ipf_main_softc_t *, void *)); -extern int ipf_frag_natnew __P((ipf_main_softc_t *, fr_info_t *, u_32_t, struct nat *)); -extern nat_t *ipf_frag_natknown __P((fr_info_t *)); -extern int ipf_frag_new __P((ipf_main_softc_t *, fr_info_t *, u_32_t)); -extern ipfrstat_t *ipf_frag_stats __P((void *)); -extern void ipf_frag_setlock __P((void *, int)); -extern void ipf_frag_pkt_deref __P((ipf_main_softc_t *, void *)); -extern int ipf_frag_pkt_next __P((ipf_main_softc_t *, ipftoken_t *, - ipfgeniter_t *)); -extern void ipf_frag_nat_deref __P((ipf_main_softc_t *, void *)); -extern int ipf_frag_nat_next __P((ipf_main_softc_t *, ipftoken_t *, - ipfgeniter_t *)); -extern void ipf_slowtimer __P((ipf_main_softc_t *)); +extern void *ipf_frag_soft_create(ipf_main_softc_t *); +extern int ipf_frag_soft_init(ipf_main_softc_t *, void *); +extern int ipf_frag_soft_fini(ipf_main_softc_t *, void *); +extern void ipf_frag_soft_destroy(ipf_main_softc_t *, void *); +extern int ipf_frag_main_load(void); +extern int ipf_frag_main_unload(void); +extern int ipf_frag_load(void); +extern void ipf_frag_clear(ipf_main_softc_t *); +extern void ipf_frag_expire(ipf_main_softc_t *); +extern void ipf_frag_forget(void *); +extern int ipf_frag_init(void); +extern u_32_t ipf_frag_ipidknown(fr_info_t *); +extern int ipf_frag_ipidnew(fr_info_t *, u_32_t); +extern frentry_t *ipf_frag_known(fr_info_t *, u_32_t *); +extern void ipf_frag_natforget(ipf_main_softc_t *, void *); +extern int ipf_frag_natnew(ipf_main_softc_t *, fr_info_t *, u_32_t, struct nat *); +extern nat_t *ipf_frag_natknown(fr_info_t *); +extern int ipf_frag_new(ipf_main_softc_t *, fr_info_t *, u_32_t); +extern ipfrstat_t *ipf_frag_stats(void *); +extern void ipf_frag_setlock(void *, int); +extern void ipf_frag_pkt_deref(ipf_main_softc_t *, void *); +extern int ipf_frag_pkt_next(ipf_main_softc_t *, ipftoken_t *, + ipfgeniter_t *); +extern void ipf_frag_nat_deref(ipf_main_softc_t *, void *); +extern int ipf_frag_nat_next(ipf_main_softc_t *, ipftoken_t *, + ipfgeniter_t *); +extern void ipf_slowtimer(ipf_main_softc_t *); #endif /* __IP_FRAG_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c index c2cd6fc31e40..5d8f9f1f51f7 100644 --- a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c +++ b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c @@ -66,45 +66,45 @@ typedef struct ipf_ftp_softc_s { } ipf_ftp_softc_t; -void ipf_p_ftp_main_load __P((void)); -void ipf_p_ftp_main_unload __P((void)); -void *ipf_p_ftp_soft_create __P((ipf_main_softc_t *)); -void ipf_p_ftp_soft_destroy __P((ipf_main_softc_t *, void *)); - -int ipf_p_ftp_client __P((ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, - ftpinfo_t *, int)); -int ipf_p_ftp_complete __P((char *, size_t)); -int ipf_p_ftp_in __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_ftp_new __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -void ipf_p_ftp_del __P((ipf_main_softc_t *, ap_session_t *)); -int ipf_p_ftp_out __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_ftp_pasv __P((ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, - ftpinfo_t *, int)); -int ipf_p_ftp_epsv __P((ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, - ftpinfo_t *, int)); -int ipf_p_ftp_port __P((ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, - ftpinfo_t *, int)); -int ipf_p_ftp_process __P((ipf_ftp_softc_t *, fr_info_t *, nat_t *, - ftpinfo_t *, int)); -int ipf_p_ftp_server __P((ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, - ftpinfo_t *, int)); -int ipf_p_ftp_valid __P((ipf_ftp_softc_t *, ftpinfo_t *, int, char *, size_t)); -int ipf_p_ftp_server_valid __P((ipf_ftp_softc_t *, ftpside_t *, char *, - size_t)); -int ipf_p_ftp_client_valid __P((ipf_ftp_softc_t *, ftpside_t *, char *, - size_t)); -u_short ipf_p_ftp_atoi __P((char **)); -int ipf_p_ftp_pasvreply __P((ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, - ftpinfo_t *, u_int, char *, char *)); -int ipf_p_ftp_eprt __P((ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, - ftpinfo_t *, int)); -int ipf_p_ftp_eprt4 __P((ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, - ftpinfo_t *, int)); -int ipf_p_ftp_eprt6 __P((ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, - ftpinfo_t *, int)); -int ipf_p_ftp_addport __P((ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, - ftpinfo_t *, int, int, int)); -void ipf_p_ftp_setpending __P((ipf_main_softc_t *, ftpinfo_t *)); +void ipf_p_ftp_main_load(void); +void ipf_p_ftp_main_unload(void); +void *ipf_p_ftp_soft_create(ipf_main_softc_t *); +void ipf_p_ftp_soft_destroy(ipf_main_softc_t *, void *); + +int ipf_p_ftp_client(ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, + ftpinfo_t *, int); +int ipf_p_ftp_complete(char *, size_t); +int ipf_p_ftp_in(void *, fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_ftp_new(void *, fr_info_t *, ap_session_t *, nat_t *); +void ipf_p_ftp_del(ipf_main_softc_t *, ap_session_t *); +int ipf_p_ftp_out(void *, fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_ftp_pasv(ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, + ftpinfo_t *, int); +int ipf_p_ftp_epsv(ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, + ftpinfo_t *, int); +int ipf_p_ftp_port(ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, + ftpinfo_t *, int); +int ipf_p_ftp_process(ipf_ftp_softc_t *, fr_info_t *, nat_t *, + ftpinfo_t *, int); +int ipf_p_ftp_server(ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, + ftpinfo_t *, int); +int ipf_p_ftp_valid(ipf_ftp_softc_t *, ftpinfo_t *, int, char *, size_t); +int ipf_p_ftp_server_valid(ipf_ftp_softc_t *, ftpside_t *, char *, + size_t); +int ipf_p_ftp_client_valid(ipf_ftp_softc_t *, ftpside_t *, char *, + size_t); +u_short ipf_p_ftp_atoi(char **); +int ipf_p_ftp_pasvreply(ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, + ftpinfo_t *, u_int, char *, char *); +int ipf_p_ftp_eprt(ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, + ftpinfo_t *, int); +int ipf_p_ftp_eprt4(ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, + ftpinfo_t *, int); +int ipf_p_ftp_eprt6(ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, + ftpinfo_t *, int); +int ipf_p_ftp_addport(ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *, + ftpinfo_t *, int, int, int); +void ipf_p_ftp_setpending(ipf_main_softc_t *, ftpinfo_t *); /* * Debug levels diff --git a/sys/contrib/ipfilter/netinet/ip_htable.c b/sys/contrib/ipfilter/netinet/ip_htable.c index 0786355cd87a..bd76c2b5b0be 100644 --- a/sys/contrib/ipfilter/netinet/ip_htable.c +++ b/sys/contrib/ipfilter/netinet/ip_htable.c @@ -53,45 +53,45 @@ static const char rcsid[] = "@(#)$Id$"; #endif # ifdef USE_INET6 -static iphtent_t *ipf_iphmfind6 __P((iphtable_t *, i6addr_t *)); +static iphtent_t *ipf_iphmfind6(iphtable_t *, i6addr_t *); # endif -static iphtent_t *ipf_iphmfind __P((iphtable_t *, struct in_addr *)); -static int ipf_iphmfindip __P((ipf_main_softc_t *, void *, int, void *, u_int)); -static int ipf_htable_clear __P((ipf_main_softc_t *, void *, iphtable_t *)); -static int ipf_htable_create __P((ipf_main_softc_t *, void *, iplookupop_t *)); -static int ipf_htable_deref __P((ipf_main_softc_t *, void *, void *)); -static int ipf_htable_destroy __P((ipf_main_softc_t *, void *, int, char *)); -static void *ipf_htable_exists __P((void *, int, char *)); -static size_t ipf_htable_flush __P((ipf_main_softc_t *, void *, - iplookupflush_t *)); -static void ipf_htable_free __P((void *, iphtable_t *)); -static int ipf_htable_iter_deref __P((ipf_main_softc_t *, void *, int, - int, void *)); -static int ipf_htable_iter_next __P((ipf_main_softc_t *, void *, ipftoken_t *, - ipflookupiter_t *)); -static int ipf_htable_node_add __P((ipf_main_softc_t *, void *, - iplookupop_t *, int)); -static int ipf_htable_node_del __P((ipf_main_softc_t *, void *, - iplookupop_t *, int)); -static int ipf_htable_remove __P((ipf_main_softc_t *, void *, iphtable_t *)); -static void *ipf_htable_soft_create __P((ipf_main_softc_t *)); -static void ipf_htable_soft_destroy __P((ipf_main_softc_t *, void *)); -static int ipf_htable_soft_init __P((ipf_main_softc_t *, void *)); -static void ipf_htable_soft_fini __P((ipf_main_softc_t *, void *)); -static int ipf_htable_stats_get __P((ipf_main_softc_t *, void *, - iplookupop_t *)); -static int ipf_htable_table_add __P((ipf_main_softc_t *, void *, - iplookupop_t *)); -static int ipf_htable_table_del __P((ipf_main_softc_t *, void *, - iplookupop_t *)); -static int ipf_htent_deref __P((void *, iphtent_t *)); -static iphtent_t *ipf_htent_find __P((iphtable_t *, iphtent_t *)); -static int ipf_htent_insert __P((ipf_main_softc_t *, void *, iphtable_t *, - iphtent_t *)); -static int ipf_htent_remove __P((ipf_main_softc_t *, void *, iphtable_t *, - iphtent_t *)); -static void *ipf_htable_select_add_ref __P((void *, int, char *)); -static void ipf_htable_expire __P((ipf_main_softc_t *, void *)); +static iphtent_t *ipf_iphmfind(iphtable_t *, struct in_addr *); +static int ipf_iphmfindip(ipf_main_softc_t *, void *, int, void *, u_int); +static int ipf_htable_clear(ipf_main_softc_t *, void *, iphtable_t *); +static int ipf_htable_create(ipf_main_softc_t *, void *, iplookupop_t *); +static int ipf_htable_deref(ipf_main_softc_t *, void *, void *); +static int ipf_htable_destroy(ipf_main_softc_t *, void *, int, char *); +static void *ipf_htable_exists(void *, int, char *); +static size_t ipf_htable_flush(ipf_main_softc_t *, void *, + iplookupflush_t *); +static void ipf_htable_free(void *, iphtable_t *); +static int ipf_htable_iter_deref(ipf_main_softc_t *, void *, int, + int, void *); +static int ipf_htable_iter_next(ipf_main_softc_t *, void *, ipftoken_t *, + ipflookupiter_t *); +static int ipf_htable_node_add(ipf_main_softc_t *, void *, + iplookupop_t *, int); +static int ipf_htable_node_del(ipf_main_softc_t *, void *, + iplookupop_t *, int); +static int ipf_htable_remove(ipf_main_softc_t *, void *, iphtable_t *); +static void *ipf_htable_soft_create(ipf_main_softc_t *); +static void ipf_htable_soft_destroy(ipf_main_softc_t *, void *); +static int ipf_htable_soft_init(ipf_main_softc_t *, void *); +static void ipf_htable_soft_fini(ipf_main_softc_t *, void *); +static int ipf_htable_stats_get(ipf_main_softc_t *, void *, + iplookupop_t *); +static int ipf_htable_table_add(ipf_main_softc_t *, void *, + iplookupop_t *); +static int ipf_htable_table_del(ipf_main_softc_t *, void *, + iplookupop_t *); +static int ipf_htent_deref(void *, iphtent_t *); +static iphtent_t *ipf_htent_find(iphtable_t *, iphtent_t *); +static int ipf_htent_insert(ipf_main_softc_t *, void *, iphtable_t *, + iphtent_t *); +static int ipf_htent_remove(ipf_main_softc_t *, void *, iphtable_t *, + iphtent_t *); +static void *ipf_htable_select_add_ref(void *, int, char *); +static void ipf_htable_expire(ipf_main_softc_t *, void *); typedef struct ipf_htable_softc_s { diff --git a/sys/contrib/ipfilter/netinet/ip_htable.h b/sys/contrib/ipfilter/netinet/ip_htable.h index 8038bbcc1044..55c289e57ff6 100644 --- a/sys/contrib/ipfilter/netinet/ip_htable.h +++ b/sys/contrib/ipfilter/netinet/ip_htable.h @@ -71,11 +71,11 @@ typedef struct iphtstat_s { } iphtstat_t; -extern void *ipf_iphmfindgroup __P((ipf_main_softc_t *, void *, void *)); -extern iphtable_t *ipf_htable_find __P((void *, int, char *)); +extern void *ipf_iphmfindgroup(ipf_main_softc_t *, void *, void *); +extern iphtable_t *ipf_htable_find(void *, int, char *); extern ipf_lookup_t ipf_htable_backend; #ifndef _KERNEL -extern void ipf_htable_dump __P((ipf_main_softc_t *, void *)); +extern void ipf_htable_dump(ipf_main_softc_t *, void *); #endif #endif /* __IP_HTABLE_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c b/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c index 980476ad8bf9..ca0927d00dbf 100644 --- a/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c +++ b/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c @@ -25,16 +25,16 @@ typedef struct ipf_ipsec_softc_s { } ipf_ipsec_softc_t; -void *ipf_p_ipsec_soft_create __P((ipf_main_softc_t *)); -void ipf_p_ipsec_soft_destroy __P((ipf_main_softc_t *, void *)); -int ipf_p_ipsec_soft_init __P((ipf_main_softc_t *, void *)); -void ipf_p_ipsec_soft_fini __P((ipf_main_softc_t *, void *)); -int ipf_p_ipsec_init __P((void)); -void ipf_p_ipsec_fini __P((void)); -int ipf_p_ipsec_new __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -void ipf_p_ipsec_del __P((ipf_main_softc_t *, ap_session_t *)); -int ipf_p_ipsec_inout __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_ipsec_match __P((fr_info_t *, ap_session_t *, nat_t *)); +void *ipf_p_ipsec_soft_create(ipf_main_softc_t *); +void ipf_p_ipsec_soft_destroy(ipf_main_softc_t *, void *); +int ipf_p_ipsec_soft_init(ipf_main_softc_t *, void *); +void ipf_p_ipsec_soft_fini(ipf_main_softc_t *, void *); +int ipf_p_ipsec_init(void); +void ipf_p_ipsec_fini(void); +int ipf_p_ipsec_new(void *, fr_info_t *, ap_session_t *, nat_t *); +void ipf_p_ipsec_del(ipf_main_softc_t *, ap_session_t *); +int ipf_p_ipsec_inout(void *, fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_ipsec_match(fr_info_t *, ap_session_t *, nat_t *); /* diff --git a/sys/contrib/ipfilter/netinet/ip_irc_pxy.c b/sys/contrib/ipfilter/netinet/ip_irc_pxy.c index 1b788720f3f7..304fe0c35351 100644 --- a/sys/contrib/ipfilter/netinet/ip_irc_pxy.c +++ b/sys/contrib/ipfilter/netinet/ip_irc_pxy.c @@ -11,13 +11,13 @@ #define IPF_IRCBUFSZ 96 /* This *MUST* be >= 64! */ -void ipf_p_irc_main_load __P((void)); -void ipf_p_irc_main_unload __P((void)); -int ipf_p_irc_new __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_irc_out __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_irc_send __P((fr_info_t *, nat_t *)); -int ipf_p_irc_complete __P((ircinfo_t *, char *, size_t)); -u_short ipf_irc_atoi __P((char **)); +void ipf_p_irc_main_load(void); +void ipf_p_irc_main_unload(void); +int ipf_p_irc_new(void *, fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_irc_out(void *, fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_irc_send(fr_info_t *, nat_t *); +int ipf_p_irc_complete(ircinfo_t *, char *, size_t); +u_short ipf_irc_atoi(char **); static frentry_t ircnatfr; diff --git a/sys/contrib/ipfilter/netinet/ip_lookup.c b/sys/contrib/ipfilter/netinet/ip_lookup.c index 046939146075..f25174a752ec 100644 --- a/sys/contrib/ipfilter/netinet/ip_lookup.c +++ b/sys/contrib/ipfilter/netinet/ip_lookup.c @@ -66,14 +66,14 @@ static const char rcsid[] = "@(#)$Id$"; * array indexing on the unit, +1 is used to map [-1.IPL_LOGMAX] to * [0.POOL_LOOKUP_MAX]. */ -static int ipf_lookup_addnode __P((ipf_main_softc_t *, caddr_t, int)); -static int ipf_lookup_delnode __P((ipf_main_softc_t *, caddr_t, int)); -static int ipf_lookup_addtable __P((ipf_main_softc_t *, caddr_t)); -static int ipf_lookup_deltable __P((ipf_main_softc_t *, caddr_t)); -static int ipf_lookup_stats __P((ipf_main_softc_t *, caddr_t)); -static int ipf_lookup_flush __P((ipf_main_softc_t *, caddr_t)); -static int ipf_lookup_iterate __P((ipf_main_softc_t *, void *, int, void *)); -static int ipf_lookup_deltok __P((ipf_main_softc_t *, void *, int, void *)); +static int ipf_lookup_addnode(ipf_main_softc_t *, caddr_t, int); +static int ipf_lookup_delnode(ipf_main_softc_t *, caddr_t, int); +static int ipf_lookup_addtable(ipf_main_softc_t *, caddr_t); +static int ipf_lookup_deltable(ipf_main_softc_t *, caddr_t); +static int ipf_lookup_stats(ipf_main_softc_t *, caddr_t); +static int ipf_lookup_flush(ipf_main_softc_t *, caddr_t); +static int ipf_lookup_iterate(ipf_main_softc_t *, void *, int, void *); +static int ipf_lookup_deltok(ipf_main_softc_t *, void *, int, void *); #define MAX_BACKENDS 3 static ipf_lookup_t *backends[MAX_BACKENDS] = { diff --git a/sys/contrib/ipfilter/netinet/ip_lookup.h b/sys/contrib/ipfilter/netinet/ip_lookup.h index 6b1642a91ec0..72dfbdb37c2a 100644 --- a/sys/contrib/ipfilter/netinet/ip_lookup.h +++ b/sys/contrib/ipfilter/netinet/ip_lookup.h @@ -87,54 +87,54 @@ typedef struct ipflookupiter { typedef struct ipf_lookup { int ipfl_type; - void *(*ipfl_create) __P((ipf_main_softc_t *)); - void (*ipfl_destroy) __P((ipf_main_softc_t *, void *)); - int (*ipfl_init) __P((ipf_main_softc_t *, void *)); - void (*ipfl_fini) __P((ipf_main_softc_t *, void *)); - int (*ipfl_addr_find) __P((ipf_main_softc_t *, void *, - int, void *, u_int)); - size_t (*ipfl_flush) __P((ipf_main_softc_t *, void *, - iplookupflush_t *)); - int (*ipfl_iter_deref) __P((ipf_main_softc_t *, void *, - int, int, void *)); - int (*ipfl_iter_next) __P((ipf_main_softc_t *, void *, - ipftoken_t *, ipflookupiter_t *)); - int (*ipfl_node_add) __P((ipf_main_softc_t *, void *, - iplookupop_t *, int)); - int (*ipfl_node_del) __P((ipf_main_softc_t *, void *, - iplookupop_t *, int)); - int (*ipfl_stats_get) __P((ipf_main_softc_t *, void *, - iplookupop_t *)); - int (*ipfl_table_add) __P((ipf_main_softc_t *, void *, - iplookupop_t *)); - int (*ipfl_table_del) __P((ipf_main_softc_t *, void *, - iplookupop_t *)); - int (*ipfl_table_deref) __P((ipf_main_softc_t *, void *, void *)); - void *(*ipfl_table_find) __P((void *, int, char *)); - void *(*ipfl_select_add_ref) __P((void *, int, char *)); - int (*ipfl_select_node) __P((fr_info_t *, void *, u_32_t *, - frdest_t *)); - void (*ipfl_expire) __P((ipf_main_softc_t *, void *)); - void (*ipfl_sync) __P((ipf_main_softc_t *, void *)); + void *(*ipfl_create)(ipf_main_softc_t *); + void (*ipfl_destroy)(ipf_main_softc_t *, void *); + int (*ipfl_init)(ipf_main_softc_t *, void *); + void (*ipfl_fini)(ipf_main_softc_t *, void *); + int (*ipfl_addr_find)(ipf_main_softc_t *, void *, + int, void *, u_int); + size_t (*ipfl_flush)(ipf_main_softc_t *, void *, + iplookupflush_t *); + int (*ipfl_iter_deref)(ipf_main_softc_t *, void *, + int, int, void *); + int (*ipfl_iter_next)(ipf_main_softc_t *, void *, + ipftoken_t *, ipflookupiter_t *); + int (*ipfl_node_add)(ipf_main_softc_t *, void *, + iplookupop_t *, int); + int (*ipfl_node_del)(ipf_main_softc_t *, void *, + iplookupop_t *, int); + int (*ipfl_stats_get)(ipf_main_softc_t *, void *, + iplookupop_t *); + int (*ipfl_table_add)(ipf_main_softc_t *, void *, + iplookupop_t *); + int (*ipfl_table_del)(ipf_main_softc_t *, void *, + iplookupop_t *); + int (*ipfl_table_deref)(ipf_main_softc_t *, void *, void *); + void *(*ipfl_table_find)(void *, int, char *); + void *(*ipfl_select_add_ref)(void *, int, char *); + int (*ipfl_select_node)(fr_info_t *, void *, u_32_t *, + frdest_t *); + void (*ipfl_expire)(ipf_main_softc_t *, void *); + void (*ipfl_sync)(ipf_main_softc_t *, void *); } ipf_lookup_t; -extern int ipf_lookup_init __P((void)); -extern int ipf_lookup_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, int, void *)); -extern void ipf_lookup_main_unload __P((void)); -extern void ipf_lookup_deref __P((ipf_main_softc_t *, int, void *)); -extern void ipf_lookup_iterderef __P((ipf_main_softc_t *, u_32_t, void *)); -extern void *ipf_lookup_res_name __P((ipf_main_softc_t *, int, u_int, char *, - lookupfunc_t *)); -extern void *ipf_lookup_res_num __P((ipf_main_softc_t *, int, u_int, u_int, - lookupfunc_t *)); -extern void ipf_lookup_soft_destroy __P((ipf_main_softc_t *, void *)); -extern void *ipf_lookup_soft_create __P((ipf_main_softc_t *)); -extern int ipf_lookup_soft_init __P((ipf_main_softc_t *, void *)); -extern int ipf_lookup_soft_fini __P((ipf_main_softc_t *, void *)); -extern void *ipf_lookup_find_htable __P((ipf_main_softc_t *, int, char *)); -extern void ipf_lookup_expire __P((ipf_main_softc_t *)); -extern void ipf_lookup_sync __P((ipf_main_softc_t *, void *)); +extern int ipf_lookup_init(void); +extern int ipf_lookup_ioctl(ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, int, void *); +extern void ipf_lookup_main_unload(void); +extern void ipf_lookup_deref(ipf_main_softc_t *, int, void *); +extern void ipf_lookup_iterderef(ipf_main_softc_t *, u_32_t, void *); +extern void *ipf_lookup_res_name(ipf_main_softc_t *, int, u_int, char *, + lookupfunc_t *); +extern void *ipf_lookup_res_num(ipf_main_softc_t *, int, u_int, u_int, + lookupfunc_t *); +extern void ipf_lookup_soft_destroy(ipf_main_softc_t *, void *); +extern void *ipf_lookup_soft_create(ipf_main_softc_t *); +extern int ipf_lookup_soft_init(ipf_main_softc_t *, void *); +extern int ipf_lookup_soft_fini(ipf_main_softc_t *, void *); +extern void *ipf_lookup_find_htable(ipf_main_softc_t *, int, char *); +extern void ipf_lookup_expire(ipf_main_softc_t *); +extern void ipf_lookup_sync(ipf_main_softc_t *, void *); #ifndef _KERNEL -extern void ipf_lookup_dump __P((ipf_main_softc_t *, void *)); +extern void ipf_lookup_dump(ipf_main_softc_t *, void *); #endif #endif /* __IP_LOOKUP_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c index eeaaba1b367b..bc0883ac7382 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat.c +++ b/sys/contrib/ipfilter/netinet/ip_nat.c @@ -204,56 +204,56 @@ static ipftuneable_t ipf_nat_tuneables[] = { extern int pfil_delayed_copy; #endif -static int ipf_nat_flush_entry __P((ipf_main_softc_t *, void *)); -static int ipf_nat_getent __P((ipf_main_softc_t *, caddr_t, int)); -static int ipf_nat_getsz __P((ipf_main_softc_t *, caddr_t, int)); -static int ipf_nat_putent __P((ipf_main_softc_t *, caddr_t, int)); -static void ipf_nat_addmap __P((ipf_nat_softc_t *, ipnat_t *)); -static void ipf_nat_addrdr __P((ipf_nat_softc_t *, ipnat_t *)); -static int ipf_nat_builddivertmp __P((ipf_nat_softc_t *, ipnat_t *)); -static int ipf_nat_clearlist __P((ipf_main_softc_t *, ipf_nat_softc_t *)); -static int ipf_nat_cmp_rules __P((ipnat_t *, ipnat_t *)); -static int ipf_nat_decap __P((fr_info_t *, nat_t *)); -static void ipf_nat_delrule __P((ipf_main_softc_t *, ipf_nat_softc_t *, - ipnat_t *, int)); -static int ipf_nat_extraflush __P((ipf_main_softc_t *, ipf_nat_softc_t *, int)); -static int ipf_nat_finalise __P((fr_info_t *, nat_t *)); -static int ipf_nat_flushtable __P((ipf_main_softc_t *, ipf_nat_softc_t *)); -static int ipf_nat_getnext __P((ipf_main_softc_t *, ipftoken_t *, - ipfgeniter_t *, ipfobj_t *)); -static int ipf_nat_gettable __P((ipf_main_softc_t *, ipf_nat_softc_t *, - char *)); -static hostmap_t *ipf_nat_hostmap __P((ipf_nat_softc_t *, ipnat_t *, +static int ipf_nat_flush_entry(ipf_main_softc_t *, void *); +static int ipf_nat_getent(ipf_main_softc_t *, caddr_t, int); +static int ipf_nat_getsz(ipf_main_softc_t *, caddr_t, int); +static int ipf_nat_putent(ipf_main_softc_t *, caddr_t, int); +static void ipf_nat_addmap(ipf_nat_softc_t *, ipnat_t *); +static void ipf_nat_addrdr(ipf_nat_softc_t *, ipnat_t *); +static int ipf_nat_builddivertmp(ipf_nat_softc_t *, ipnat_t *); +static int ipf_nat_clearlist(ipf_main_softc_t *, ipf_nat_softc_t *); +static int ipf_nat_cmp_rules(ipnat_t *, ipnat_t *); +static int ipf_nat_decap(fr_info_t *, nat_t *); +static void ipf_nat_delrule(ipf_main_softc_t *, ipf_nat_softc_t *, + ipnat_t *, int); +static int ipf_nat_extraflush(ipf_main_softc_t *, ipf_nat_softc_t *, int); +static int ipf_nat_finalise(fr_info_t *, nat_t *); +static int ipf_nat_flushtable(ipf_main_softc_t *, ipf_nat_softc_t *); +static int ipf_nat_getnext(ipf_main_softc_t *, ipftoken_t *, + ipfgeniter_t *, ipfobj_t *); +static int ipf_nat_gettable(ipf_main_softc_t *, ipf_nat_softc_t *, + char *); +static hostmap_t *ipf_nat_hostmap(ipf_nat_softc_t *, ipnat_t *, struct in_addr, struct in_addr, - struct in_addr, u_32_t)); -static int ipf_nat_icmpquerytype __P((int)); -static int ipf_nat_iterator __P((ipf_main_softc_t *, ipftoken_t *, - ipfgeniter_t *, ipfobj_t *)); -static int ipf_nat_match __P((fr_info_t *, ipnat_t *)); -static int ipf_nat_matcharray __P((nat_t *, int *, u_long)); -static int ipf_nat_matchflush __P((ipf_main_softc_t *, ipf_nat_softc_t *, - caddr_t)); -static void ipf_nat_mssclamp __P((tcphdr_t *, u_32_t, fr_info_t *, - u_short *)); -static int ipf_nat_newmap __P((fr_info_t *, nat_t *, natinfo_t *)); -static int ipf_nat_newdivert __P((fr_info_t *, nat_t *, natinfo_t *)); -static int ipf_nat_newrdr __P((fr_info_t *, nat_t *, natinfo_t *)); -static int ipf_nat_newrewrite __P((fr_info_t *, nat_t *, natinfo_t *)); -static int ipf_nat_nextaddr __P((fr_info_t *, nat_addr_t *, u_32_t *, - u_32_t *)); -static int ipf_nat_nextaddrinit __P((ipf_main_softc_t *, char *, - nat_addr_t *, int, void *)); -static int ipf_nat_resolverule __P((ipf_main_softc_t *, ipnat_t *)); -static int ipf_nat_ruleaddrinit __P((ipf_main_softc_t *, - ipf_nat_softc_t *, ipnat_t *)); -static void ipf_nat_rule_fini __P((ipf_main_softc_t *, ipnat_t *)); -static int ipf_nat_rule_init __P((ipf_main_softc_t *, ipf_nat_softc_t *, - ipnat_t *)); -static int ipf_nat_siocaddnat __P((ipf_main_softc_t *, ipf_nat_softc_t *, - ipnat_t *, int)); -static void ipf_nat_siocdelnat __P((ipf_main_softc_t *, ipf_nat_softc_t *, - ipnat_t *, int)); -static void ipf_nat_tabmove __P((ipf_nat_softc_t *, nat_t *)); + struct in_addr, u_32_t); +static int ipf_nat_icmpquerytype(int); +static int ipf_nat_iterator(ipf_main_softc_t *, ipftoken_t *, + ipfgeniter_t *, ipfobj_t *); +static int ipf_nat_match(fr_info_t *, ipnat_t *); +static int ipf_nat_matcharray(nat_t *, int *, u_long); +static int ipf_nat_matchflush(ipf_main_softc_t *, ipf_nat_softc_t *, + caddr_t); +static void ipf_nat_mssclamp(tcphdr_t *, u_32_t, fr_info_t *, + u_short *); +static int ipf_nat_newmap(fr_info_t *, nat_t *, natinfo_t *); +static int ipf_nat_newdivert(fr_info_t *, nat_t *, natinfo_t *); +static int ipf_nat_newrdr(fr_info_t *, nat_t *, natinfo_t *); +static int ipf_nat_newrewrite(fr_info_t *, nat_t *, natinfo_t *); +static int ipf_nat_nextaddr(fr_info_t *, nat_addr_t *, u_32_t *, + u_32_t *); +static int ipf_nat_nextaddrinit(ipf_main_softc_t *, char *, + nat_addr_t *, int, void *); +static int ipf_nat_resolverule(ipf_main_softc_t *, ipnat_t *); +static int ipf_nat_ruleaddrinit(ipf_main_softc_t *, + ipf_nat_softc_t *, ipnat_t *); +static void ipf_nat_rule_fini(ipf_main_softc_t *, ipnat_t *); +static int ipf_nat_rule_init(ipf_main_softc_t *, ipf_nat_softc_t *, + ipnat_t *); +static int ipf_nat_siocaddnat(ipf_main_softc_t *, ipf_nat_softc_t *, + ipnat_t *, int); +static void ipf_nat_siocdelnat(ipf_main_softc_t *, ipf_nat_softc_t *, + ipnat_t *, int); +static void ipf_nat_tabmove(ipf_nat_softc_t *, nat_t *); /* ------------------------------------------------------------------------ */ /* Function: ipf_nat_main_load */ diff --git a/sys/contrib/ipfilter/netinet/ip_nat.h b/sys/contrib/ipfilter/netinet/ip_nat.h index e726bc926937..bcec72f21f8b 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat.h +++ b/sys/contrib/ipfilter/netinet/ip_nat.h @@ -670,96 +670,96 @@ typedef struct ipf_nat_softc_s { extern frentry_t ipfnatblock; -extern void ipf_fix_datacksum __P((u_short *, u_32_t)); -extern void ipf_fix_incksum __P((int, u_short *, u_32_t, u_32_t)); -extern void ipf_fix_outcksum __P((int, u_short *, u_32_t, u_32_t)); - -extern int ipf_nat_checkin __P((fr_info_t *, u_32_t *)); -extern int ipf_nat_checkout __P((fr_info_t *, u_32_t *)); -extern void ipf_nat_delete __P((ipf_main_softc_t *, struct nat *, int)); -extern void ipf_nat_deref __P((ipf_main_softc_t *, nat_t **)); -extern void ipf_nat_expire __P((ipf_main_softc_t *)); -extern int ipf_nat_hashtab_add __P((ipf_main_softc_t *, - ipf_nat_softc_t *, nat_t *)); -extern void ipf_nat_hostmapdel __P((ipf_main_softc_t *, hostmap_t **)); -extern int ipf_nat_hostmap_rehash __P((ipf_main_softc_t *, - ipftuneable_t *, ipftuneval_t *)); -extern nat_t *ipf_nat_icmperrorlookup __P((fr_info_t *, int)); -extern nat_t *ipf_nat_icmperror __P((fr_info_t *, u_int *, int)); -extern int ipf_nat_init __P((void)); -extern nat_t *ipf_nat_inlookup __P((fr_info_t *, u_int, u_int, - struct in_addr, struct in_addr)); -extern int ipf_nat_in __P((fr_info_t *, nat_t *, int, u_32_t)); -extern int ipf_nat_insert __P((ipf_main_softc_t *, ipf_nat_softc_t *, - nat_t *)); -extern int ipf_nat_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t, - int, int, void *)); -extern void ipf_nat_log __P((ipf_main_softc_t *, ipf_nat_softc_t *, - struct nat *, u_int)); -extern nat_t *ipf_nat_lookupredir __P((natlookup_t *)); -extern nat_t *ipf_nat_maplookup __P((void *, u_int, struct in_addr, - struct in_addr)); -extern nat_t *ipf_nat_add __P((fr_info_t *, ipnat_t *, nat_t **, - u_int, int)); -extern int ipf_nat_out __P((fr_info_t *, nat_t *, int, u_32_t)); -extern nat_t *ipf_nat_outlookup __P((fr_info_t *, u_int, u_int, - struct in_addr, struct in_addr)); -extern u_short *ipf_nat_proto __P((fr_info_t *, nat_t *, u_int)); -extern void ipf_nat_rule_deref __P((ipf_main_softc_t *, ipnat_t **)); -extern void ipf_nat_setqueue __P((ipf_main_softc_t *, ipf_nat_softc_t *, - nat_t *)); -extern void ipf_nat_setpending __P((ipf_main_softc_t *, nat_t *)); -extern nat_t *ipf_nat_tnlookup __P((fr_info_t *, int)); -extern void ipf_nat_update __P((fr_info_t *, nat_t *)); -extern int ipf_nat_rehash __P((ipf_main_softc_t *, ipftuneable_t *, - ipftuneval_t *)); -extern int ipf_nat_rehash_rules __P((ipf_main_softc_t *, ipftuneable_t *, - ipftuneval_t *)); -extern int ipf_nat_settimeout __P((struct ipf_main_softc_s *, - ipftuneable_t *, ipftuneval_t *)); -extern void ipf_nat_sync __P((ipf_main_softc_t *, void *)); - -extern nat_t *ipf_nat_clone __P((fr_info_t *, nat_t *)); -extern void ipf_nat_delmap __P((ipf_nat_softc_t *, ipnat_t *)); -extern void ipf_nat_delrdr __P((ipf_nat_softc_t *, ipnat_t *)); -extern int ipf_nat_wildok __P((nat_t *, int, int, int, int)); -extern void ipf_nat_setlock __P((void *, int)); -extern void ipf_nat_load __P((void)); -extern void *ipf_nat_soft_create __P((ipf_main_softc_t *)); -extern int ipf_nat_soft_init __P((ipf_main_softc_t *, void *)); -extern void ipf_nat_soft_destroy __P((ipf_main_softc_t *, void *)); -extern int ipf_nat_soft_fini __P((ipf_main_softc_t *, void *)); -extern int ipf_nat_main_load __P((void)); -extern int ipf_nat_main_unload __P((void)); -extern ipftq_t *ipf_nat_add_tq __P((ipf_main_softc_t *, int)); -extern void ipf_nat_uncreate __P((fr_info_t *)); +extern void ipf_fix_datacksum(u_short *, u_32_t); +extern void ipf_fix_incksum(int, u_short *, u_32_t, u_32_t); +extern void ipf_fix_outcksum(int, u_short *, u_32_t, u_32_t); + +extern int ipf_nat_checkin(fr_info_t *, u_32_t *); +extern int ipf_nat_checkout(fr_info_t *, u_32_t *); +extern void ipf_nat_delete(ipf_main_softc_t *, struct nat *, int); +extern void ipf_nat_deref(ipf_main_softc_t *, nat_t **); +extern void ipf_nat_expire(ipf_main_softc_t *); +extern int ipf_nat_hashtab_add(ipf_main_softc_t *, + ipf_nat_softc_t *, nat_t *); +extern void ipf_nat_hostmapdel(ipf_main_softc_t *, hostmap_t **); +extern int ipf_nat_hostmap_rehash(ipf_main_softc_t *, + ipftuneable_t *, ipftuneval_t *); +extern nat_t *ipf_nat_icmperrorlookup(fr_info_t *, int); +extern nat_t *ipf_nat_icmperror(fr_info_t *, u_int *, int); +extern int ipf_nat_init(void); +extern nat_t *ipf_nat_inlookup(fr_info_t *, u_int, u_int, + struct in_addr, struct in_addr); +extern int ipf_nat_in(fr_info_t *, nat_t *, int, u_32_t); +extern int ipf_nat_insert(ipf_main_softc_t *, ipf_nat_softc_t *, + nat_t *); +extern int ipf_nat_ioctl(ipf_main_softc_t *, caddr_t, ioctlcmd_t, + int, int, void *); +extern void ipf_nat_log(ipf_main_softc_t *, ipf_nat_softc_t *, + struct nat *, u_int); +extern nat_t *ipf_nat_lookupredir(natlookup_t *); +extern nat_t *ipf_nat_maplookup(void *, u_int, struct in_addr, + struct in_addr); +extern nat_t *ipf_nat_add(fr_info_t *, ipnat_t *, nat_t **, + u_int, int); +extern int ipf_nat_out(fr_info_t *, nat_t *, int, u_32_t); +extern nat_t *ipf_nat_outlookup(fr_info_t *, u_int, u_int, + struct in_addr, struct in_addr); +extern u_short *ipf_nat_proto(fr_info_t *, nat_t *, u_int); +extern void ipf_nat_rule_deref(ipf_main_softc_t *, ipnat_t **); +extern void ipf_nat_setqueue(ipf_main_softc_t *, ipf_nat_softc_t *, + nat_t *); +extern void ipf_nat_setpending(ipf_main_softc_t *, nat_t *); +extern nat_t *ipf_nat_tnlookup(fr_info_t *, int); +extern void ipf_nat_update(fr_info_t *, nat_t *); +extern int ipf_nat_rehash(ipf_main_softc_t *, ipftuneable_t *, + ipftuneval_t *); +extern int ipf_nat_rehash_rules(ipf_main_softc_t *, ipftuneable_t *, + ipftuneval_t *); +extern int ipf_nat_settimeout(struct ipf_main_softc_s *, + ipftuneable_t *, ipftuneval_t *); +extern void ipf_nat_sync(ipf_main_softc_t *, void *); + +extern nat_t *ipf_nat_clone(fr_info_t *, nat_t *); +extern void ipf_nat_delmap(ipf_nat_softc_t *, ipnat_t *); +extern void ipf_nat_delrdr(ipf_nat_softc_t *, ipnat_t *); +extern int ipf_nat_wildok(nat_t *, int, int, int, int); +extern void ipf_nat_setlock(void *, int); +extern void ipf_nat_load(void); +extern void *ipf_nat_soft_create(ipf_main_softc_t *); +extern int ipf_nat_soft_init(ipf_main_softc_t *, void *); +extern void ipf_nat_soft_destroy(ipf_main_softc_t *, void *); +extern int ipf_nat_soft_fini(ipf_main_softc_t *, void *); +extern int ipf_nat_main_load(void); +extern int ipf_nat_main_unload(void); +extern ipftq_t *ipf_nat_add_tq(ipf_main_softc_t *, int); +extern void ipf_nat_uncreate(fr_info_t *); #ifdef USE_INET6 -extern nat_t *ipf_nat6_add __P((fr_info_t *, ipnat_t *, nat_t **, - u_int, int)); -extern void ipf_nat6_addrdr __P((ipf_nat_softc_t *, ipnat_t *)); -extern void ipf_nat6_addmap __P((ipf_nat_softc_t *, ipnat_t *)); -extern void ipf_nat6_addencap __P((ipf_nat_softc_t *, ipnat_t *)); -extern int ipf_nat6_checkout __P((fr_info_t *, u_32_t *)); -extern int ipf_nat6_checkin __P((fr_info_t *, u_32_t *)); -extern void ipf_nat6_delmap __P((ipf_nat_softc_t *, ipnat_t *)); -extern void ipf_nat6_delrdr __P((ipf_nat_softc_t *, ipnat_t *)); -extern int ipf_nat6_finalise __P((fr_info_t *, nat_t *)); -extern nat_t *ipf_nat6_icmperror __P((fr_info_t *, u_int *, int)); -extern nat_t *ipf_nat6_icmperrorlookup __P((fr_info_t *, int)); -extern nat_t *ipf_nat6_inlookup __P((fr_info_t *, u_int, u_int, - struct in6_addr *, struct in6_addr *)); -extern u_32_t ipf_nat6_ip6subtract __P((i6addr_t *, i6addr_t *)); -extern frentry_t *ipf_nat6_ipfin __P((fr_info_t *, u_32_t *)); -extern frentry_t *ipf_nat6_ipfout __P((fr_info_t *, u_32_t *)); -extern nat_t *ipf_nat6_lookupredir __P((natlookup_t *)); -extern int ipf_nat6_newmap __P((fr_info_t *, nat_t *, natinfo_t *)); -extern int ipf_nat6_newrdr __P((fr_info_t *, nat_t *, natinfo_t *)); -extern nat_t *ipf_nat6_outlookup __P((fr_info_t *, u_int, u_int, - struct in6_addr *, struct in6_addr *)); -extern int ipf_nat6_newrewrite __P((fr_info_t *, nat_t *, natinfo_t *)); -extern int ipf_nat6_newdivert __P((fr_info_t *, nat_t *, natinfo_t *)); -extern int ipf_nat6_ruleaddrinit __P((ipf_main_softc_t *, ipf_nat_softc_t *, ipnat_t *)); +extern nat_t *ipf_nat6_add(fr_info_t *, ipnat_t *, nat_t **, + u_int, int); +extern void ipf_nat6_addrdr(ipf_nat_softc_t *, ipnat_t *); +extern void ipf_nat6_addmap(ipf_nat_softc_t *, ipnat_t *); +extern void ipf_nat6_addencap(ipf_nat_softc_t *, ipnat_t *); +extern int ipf_nat6_checkout(fr_info_t *, u_32_t *); +extern int ipf_nat6_checkin(fr_info_t *, u_32_t *); +extern void ipf_nat6_delmap(ipf_nat_softc_t *, ipnat_t *); +extern void ipf_nat6_delrdr(ipf_nat_softc_t *, ipnat_t *); +extern int ipf_nat6_finalise(fr_info_t *, nat_t *); +extern nat_t *ipf_nat6_icmperror(fr_info_t *, u_int *, int); +extern nat_t *ipf_nat6_icmperrorlookup(fr_info_t *, int); +extern nat_t *ipf_nat6_inlookup(fr_info_t *, u_int, u_int, + struct in6_addr *, struct in6_addr *); +extern u_32_t ipf_nat6_ip6subtract(i6addr_t *, i6addr_t *); +extern frentry_t *ipf_nat6_ipfin(fr_info_t *, u_32_t *); +extern frentry_t *ipf_nat6_ipfout(fr_info_t *, u_32_t *); +extern nat_t *ipf_nat6_lookupredir(natlookup_t *); +extern int ipf_nat6_newmap(fr_info_t *, nat_t *, natinfo_t *); +extern int ipf_nat6_newrdr(fr_info_t *, nat_t *, natinfo_t *); +extern nat_t *ipf_nat6_outlookup(fr_info_t *, u_int, u_int, + struct in6_addr *, struct in6_addr *); +extern int ipf_nat6_newrewrite(fr_info_t *, nat_t *, natinfo_t *); +extern int ipf_nat6_newdivert(fr_info_t *, nat_t *, natinfo_t *); +extern int ipf_nat6_ruleaddrinit(ipf_main_softc_t *, ipf_nat_softc_t *, ipnat_t *); #endif diff --git a/sys/contrib/ipfilter/netinet/ip_nat6.c b/sys/contrib/ipfilter/netinet/ip_nat6.c index 19f57868db43..388ee9a67e73 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat6.c +++ b/sys/contrib/ipfilter/netinet/ip_nat6.c @@ -106,22 +106,22 @@ static const char rcsid[] = "@(#)$Id: ip_nat6.c,v 1.22.2.20 2012/07/22 08:04:23 #endif #ifdef USE_INET6 -static struct hostmap *ipf_nat6_hostmap __P((ipf_nat_softc_t *, ipnat_t *, +static struct hostmap *ipf_nat6_hostmap(ipf_nat_softc_t *, ipnat_t *, i6addr_t *, i6addr_t *, - i6addr_t *, u_32_t)); -static int ipf_nat6_match __P((fr_info_t *, ipnat_t *)); -static void ipf_nat6_tabmove __P((ipf_nat_softc_t *, nat_t *)); -static int ipf_nat6_decap __P((fr_info_t *, nat_t *)); -static int ipf_nat6_nextaddr __P((fr_info_t *, nat_addr_t *, i6addr_t *, - i6addr_t *)); -static int ipf_nat6_icmpquerytype __P((int)); -static int ipf_nat6_out __P((fr_info_t *, nat_t *, int, u_32_t)); -static int ipf_nat6_in __P((fr_info_t *, nat_t *, int, u_32_t)); -static int ipf_nat6_builddivertmp __P((ipf_nat_softc_t *, ipnat_t *)); -static int ipf_nat6_nextaddrinit __P((ipf_main_softc_t *, char *, - nat_addr_t *, int, void *)); -static int ipf_nat6_insert __P((ipf_main_softc_t *, ipf_nat_softc_t *, - nat_t *)); + i6addr_t *, u_32_t); +static int ipf_nat6_match(fr_info_t *, ipnat_t *); +static void ipf_nat6_tabmove(ipf_nat_softc_t *, nat_t *); +static int ipf_nat6_decap(fr_info_t *, nat_t *); +static int ipf_nat6_nextaddr(fr_info_t *, nat_addr_t *, i6addr_t *, + i6addr_t *); +static int ipf_nat6_icmpquerytype(int); +static int ipf_nat6_out(fr_info_t *, nat_t *, int, u_32_t); +static int ipf_nat6_in(fr_info_t *, nat_t *, int, u_32_t); +static int ipf_nat6_builddivertmp(ipf_nat_softc_t *, ipnat_t *); +static int ipf_nat6_nextaddrinit(ipf_main_softc_t *, char *, + nat_addr_t *, int, void *); +static int ipf_nat6_insert(ipf_main_softc_t *, ipf_nat_softc_t *, + nat_t *); #define NINCLSIDE6(y,x) ATOMIC_INCL(softn->ipf_nat_stats.ns_side6[y].x) diff --git a/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c b/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c index 4e8bdc66a2f2..d3f226325f42 100644 --- a/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c +++ b/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c @@ -34,9 +34,9 @@ #define IPF_NETBIOS_PROXY -void ipf_p_netbios_main_load __P((void)); -void ipf_p_netbios_main_unload __P((void)); -int ipf_p_netbios_out __P((void *, fr_info_t *, ap_session_t *, nat_t *)); +void ipf_p_netbios_main_load(void); +void ipf_p_netbios_main_unload(void); +int ipf_p_netbios_out(void *, fr_info_t *, ap_session_t *, nat_t *); static frentry_t netbiosfr; diff --git a/sys/contrib/ipfilter/netinet/ip_pool.c b/sys/contrib/ipfilter/netinet/ip_pool.c index fd511fcd2d89..fc2e78bfe27b 100644 --- a/sys/contrib/ipfilter/netinet/ip_pool.c +++ b/sys/contrib/ipfilter/netinet/ip_pool.c @@ -69,41 +69,41 @@ typedef struct ipf_pool_softc_s { } ipf_pool_softc_t; -static void ipf_pool_clearnodes __P((ipf_main_softc_t *, ipf_pool_softc_t *, - ip_pool_t *)); -static int ipf_pool_create __P((ipf_main_softc_t *, ipf_pool_softc_t *, iplookupop_t *)); -static int ipf_pool_deref __P((ipf_main_softc_t *, void *, void *)); -static int ipf_pool_destroy __P((ipf_main_softc_t *, ipf_pool_softc_t *, int, char *)); -static void *ipf_pool_exists __P((ipf_pool_softc_t *, int, char *)); -static void *ipf_pool_find __P((void *, int, char *)); -static ip_pool_node_t *ipf_pool_findeq __P((ipf_pool_softc_t *, ip_pool_t *, - addrfamily_t *, addrfamily_t *)); -static void ipf_pool_free __P((ipf_main_softc_t *, ipf_pool_softc_t *, - ip_pool_t *)); -static int ipf_pool_insert_node __P((ipf_main_softc_t *, ipf_pool_softc_t *, - ip_pool_t *, struct ip_pool_node *)); -static int ipf_pool_iter_deref __P((ipf_main_softc_t *, void *, int, int, void *)); -static int ipf_pool_iter_next __P((ipf_main_softc_t *, void *, ipftoken_t *, - ipflookupiter_t *)); -static size_t ipf_pool_flush __P((ipf_main_softc_t *, void *, iplookupflush_t *)); -static int ipf_pool_node_add __P((ipf_main_softc_t *, void *, iplookupop_t *, - int)); -static int ipf_pool_node_del __P((ipf_main_softc_t *, void *, iplookupop_t *, - int)); -static void ipf_pool_node_deref __P((ipf_pool_softc_t *, ip_pool_node_t *)); -static int ipf_pool_remove_node __P((ipf_main_softc_t *, ipf_pool_softc_t *, - ip_pool_t *, ip_pool_node_t *)); -static int ipf_pool_search __P((ipf_main_softc_t *, void *, int, - void *, u_int)); -static void *ipf_pool_soft_create __P((ipf_main_softc_t *)); -static void ipf_pool_soft_destroy __P((ipf_main_softc_t *, void *)); -static void ipf_pool_soft_fini __P((ipf_main_softc_t *, void *)); -static int ipf_pool_soft_init __P((ipf_main_softc_t *, void *)); -static int ipf_pool_stats_get __P((ipf_main_softc_t *, void *, iplookupop_t *)); -static int ipf_pool_table_add __P((ipf_main_softc_t *, void *, iplookupop_t *)); -static int ipf_pool_table_del __P((ipf_main_softc_t *, void *, iplookupop_t *)); -static void *ipf_pool_select_add_ref __P((void *, int, char *)); -static void ipf_pool_expire __P((ipf_main_softc_t *, void *)); +static void ipf_pool_clearnodes(ipf_main_softc_t *, ipf_pool_softc_t *, + ip_pool_t *); +static int ipf_pool_create(ipf_main_softc_t *, ipf_pool_softc_t *, iplookupop_t *); +static int ipf_pool_deref(ipf_main_softc_t *, void *, void *); +static int ipf_pool_destroy(ipf_main_softc_t *, ipf_pool_softc_t *, int, char *); +static void *ipf_pool_exists(ipf_pool_softc_t *, int, char *); +static void *ipf_pool_find(void *, int, char *); +static ip_pool_node_t *ipf_pool_findeq(ipf_pool_softc_t *, ip_pool_t *, + addrfamily_t *, addrfamily_t *); +static void ipf_pool_free(ipf_main_softc_t *, ipf_pool_softc_t *, + ip_pool_t *); +static int ipf_pool_insert_node(ipf_main_softc_t *, ipf_pool_softc_t *, + ip_pool_t *, struct ip_pool_node *); +static int ipf_pool_iter_deref(ipf_main_softc_t *, void *, int, int, void *); +static int ipf_pool_iter_next(ipf_main_softc_t *, void *, ipftoken_t *, + ipflookupiter_t *); +static size_t ipf_pool_flush(ipf_main_softc_t *, void *, iplookupflush_t *); +static int ipf_pool_node_add(ipf_main_softc_t *, void *, iplookupop_t *, + int); +static int ipf_pool_node_del(ipf_main_softc_t *, void *, iplookupop_t *, + int); +static void ipf_pool_node_deref(ipf_pool_softc_t *, ip_pool_node_t *); +static int ipf_pool_remove_node(ipf_main_softc_t *, ipf_pool_softc_t *, + ip_pool_t *, ip_pool_node_t *); +static int ipf_pool_search(ipf_main_softc_t *, void *, int, + void *, u_int); +static void *ipf_pool_soft_create(ipf_main_softc_t *); +static void ipf_pool_soft_destroy(ipf_main_softc_t *, void *); +static void ipf_pool_soft_fini(ipf_main_softc_t *, void *); +static int ipf_pool_soft_init(ipf_main_softc_t *, void *); +static int ipf_pool_stats_get(ipf_main_softc_t *, void *, iplookupop_t *); +static int ipf_pool_table_add(ipf_main_softc_t *, void *, iplookupop_t *); +static int ipf_pool_table_del(ipf_main_softc_t *, void *, iplookupop_t *); +static void *ipf_pool_select_add_ref(void *, int, char *); +static void ipf_pool_expire(ipf_main_softc_t *, void *); ipf_lookup_t ipf_pool_backend = { IPLT_POOL, @@ -130,7 +130,7 @@ ipf_lookup_t ipf_pool_backend = { #ifdef TEST_POOL -void treeprint __P((ip_pool_t *)); +void treeprint(ip_pool_t *); int main(argc, argv) @@ -732,7 +732,7 @@ ipf_pool_select_add_ref(arg, unit, name) /* */ /* Searches for an exact match of an entry in the pool. */ /* ------------------------------------------------------------------------ */ -extern void printhostmask __P((int, u_32_t *, u_32_t *)); +extern void printhostmask(int, u_32_t *, u_32_t *)); static ip_pool_node_t * ipf_pool_findeq(softp, ipo, addr, mask) ipf_pool_softc_t *softp; diff --git a/sys/contrib/ipfilter/netinet/ip_pool.h b/sys/contrib/ipfilter/netinet/ip_pool.h index 8524e607949c..11675dfcbeeb 100644 --- a/sys/contrib/ipfilter/netinet/ip_pool.h +++ b/sys/contrib/ipfilter/netinet/ip_pool.h @@ -61,7 +61,7 @@ typedef struct ipf_pool_stat { extern ipf_lookup_t ipf_pool_backend; #ifndef _KERNEL -extern void ipf_pool_dump __P((ipf_main_softc_t *, void *)); +extern void ipf_pool_dump(ipf_main_softc_t *, void *); #endif #endif /* __IP_POOL_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c b/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c index 959b107cd6af..e18748a05fae 100644 --- a/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c +++ b/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c @@ -57,15 +57,15 @@ typedef struct pptp_hdr { #define PPTP_MTCTL_LINKINFO 15 -void ipf_p_pptp_main_load __P((void)); -void ipf_p_pptp_main_unload __P((void)); -int ipf_p_pptp_new __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -void ipf_p_pptp_del __P((ipf_main_softc_t *, ap_session_t *)); -int ipf_p_pptp_inout __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -void ipf_p_pptp_donatstate __P((fr_info_t *, nat_t *, pptp_pxy_t *)); -int ipf_p_pptp_message __P((fr_info_t *, nat_t *, pptp_pxy_t *, pptp_side_t *)); -int ipf_p_pptp_nextmessage __P((fr_info_t *, nat_t *, pptp_pxy_t *, int)); -int ipf_p_pptp_mctl __P((fr_info_t *, nat_t *, pptp_pxy_t *, pptp_side_t *)); +void ipf_p_pptp_main_load(void); +void ipf_p_pptp_main_unload(void); +int ipf_p_pptp_new(void *, fr_info_t *, ap_session_t *, nat_t *); +void ipf_p_pptp_del(ipf_main_softc_t *, ap_session_t *); +int ipf_p_pptp_inout(void *, fr_info_t *, ap_session_t *, nat_t *); +void ipf_p_pptp_donatstate(fr_info_t *, nat_t *, pptp_pxy_t *); +int ipf_p_pptp_message(fr_info_t *, nat_t *, pptp_pxy_t *, pptp_side_t *); +int ipf_p_pptp_nextmessage(fr_info_t *, nat_t *, pptp_pxy_t *, int); +int ipf_p_pptp_mctl(fr_info_t *, nat_t *, pptp_pxy_t *, pptp_side_t *); static frentry_t pptpfr; diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c index 84d600ecd113..227ca817f6e4 100644 --- a/sys/contrib/ipfilter/netinet/ip_proxy.c +++ b/sys/contrib/ipfilter/netinet/ip_proxy.c @@ -104,8 +104,8 @@ static const char rcsid[] = "@(#)$Id$"; #define AP_SESS_SIZE 53 -static int ipf_proxy_fixseqack __P((fr_info_t *, ip_t *, ap_session_t *, int )); -static aproxy_t *ipf_proxy_create_clone __P((ipf_main_softc_t *, aproxy_t *)); +static int ipf_proxy_fixseqack(fr_info_t *, ip_t *, ap_session_t *, int ); +static aproxy_t *ipf_proxy_create_clone(ipf_main_softc_t *, aproxy_t *); typedef struct ipf_proxy_softc_s { int ips_proxy_debug; diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.h b/sys/contrib/ipfilter/netinet/ip_proxy.h index 3f4fc2a8af6f..0f67b5e2cca5 100644 --- a/sys/contrib/ipfilter/netinet/ip_proxy.h +++ b/sys/contrib/ipfilter/netinet/ip_proxy.h @@ -103,23 +103,23 @@ typedef struct aproxy { int apr_flags; int apr_ref; int apr_clones; - void (* apr_load) __P((void)); - void (* apr_unload) __P((void)); - void *(* apr_create) __P((ipf_main_softc_t *)); - void (* apr_destroy) __P((ipf_main_softc_t *, void *)); - int (* apr_init) __P((ipf_main_softc_t *, void *)); - void (* apr_fini) __P((ipf_main_softc_t *, void *)); - int (* apr_new) __P((void *, fr_info_t *, ap_session_t *, - struct nat *)); - void (* apr_del) __P((ipf_main_softc_t *, ap_session_t *)); - int (* apr_inpkt) __P((void *, fr_info_t *, ap_session_t *, - struct nat *)); - int (* apr_outpkt) __P((void *, fr_info_t *, ap_session_t *, - struct nat *)); - int (* apr_match) __P((fr_info_t *, ap_session_t *, struct nat *)); - int (* apr_ctl) __P((ipf_main_softc_t *, void *, ap_ctl_t *)); - int (* apr_clear) __P((struct aproxy *)); - int (* apr_flush) __P((struct aproxy *, int)); + void (* apr_load)(void); + void (* apr_unload)(void); + void *(* apr_create)(ipf_main_softc_t *); + void (* apr_destroy)(ipf_main_softc_t *, void *); + int (* apr_init)(ipf_main_softc_t *, void *); + void (* apr_fini)(ipf_main_softc_t *, void *); + int (* apr_new)(void *, fr_info_t *, ap_session_t *, + struct nat *); + void (* apr_del)(ipf_main_softc_t *, ap_session_t *); + int (* apr_inpkt)(void *, fr_info_t *, ap_session_t *, + struct nat *); + int (* apr_outpkt)(void *, fr_info_t *, ap_session_t *, + struct nat *); + int (* apr_match)(fr_info_t *, ap_session_t *, struct nat *); + int (* apr_ctl)(ipf_main_softc_t *, void *, ap_ctl_t *); + int (* apr_clear)(struct aproxy *); + int (* apr_flush)(struct aproxy *, int); void *apr_soft; } aproxy_t; @@ -438,26 +438,26 @@ typedef struct rpcb_session { */ #define XDRALIGN(x) ((((x) % 4) != 0) ? ((((x) + 3) / 4) * 4) : (x)) -extern int ipf_proxy_add __P((void *, aproxy_t *)); -extern int ipf_proxy_check __P((fr_info_t *, struct nat *)); -extern int ipf_proxy_ctl __P((ipf_main_softc_t *, void *, ap_ctl_t *)); -extern int ipf_proxy_del __P((aproxy_t *)); -extern void ipf_proxy_deref __P((aproxy_t *)); -extern void ipf_proxy_flush __P((void *, int)); -extern int ipf_proxy_init __P((void)); -extern int ipf_proxy_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, void *)); -extern aproxy_t *ipf_proxy_lookup __P((void *, u_int, char *)); -extern int ipf_proxy_match __P((fr_info_t *, struct nat *)); -extern int ipf_proxy_new __P((fr_info_t *, struct nat *)); -extern int ipf_proxy_ok __P((fr_info_t *, tcphdr_t *, struct ipnat *)); -extern void ipf_proxy_free __P((ipf_main_softc_t *, ap_session_t *)); -extern int ipf_proxy_main_load __P((void)); -extern int ipf_proxy_main_unload __P((void)); -extern ipnat_t *ipf_proxy_rule_fwd __P((nat_t *)); -extern ipnat_t *ipf_proxy_rule_rev __P((nat_t *)); -extern void *ipf_proxy_soft_create __P((ipf_main_softc_t *)); -extern void ipf_proxy_soft_destroy __P((ipf_main_softc_t *, void *)); -extern int ipf_proxy_soft_init __P((ipf_main_softc_t *, void *)); -extern int ipf_proxy_soft_fini __P((ipf_main_softc_t *, void *)); +extern int ipf_proxy_add(void *, aproxy_t *); +extern int ipf_proxy_check(fr_info_t *, struct nat *); +extern int ipf_proxy_ctl(ipf_main_softc_t *, void *, ap_ctl_t *); +extern int ipf_proxy_del(aproxy_t *); +extern void ipf_proxy_deref(aproxy_t *); +extern void ipf_proxy_flush(void *, int); +extern int ipf_proxy_init(void); +extern int ipf_proxy_ioctl(ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, void *); +extern aproxy_t *ipf_proxy_lookup(void *, u_int, char *); +extern int ipf_proxy_match(fr_info_t *, struct nat *); +extern int ipf_proxy_new(fr_info_t *, struct nat *); +extern int ipf_proxy_ok(fr_info_t *, tcphdr_t *, struct ipnat *); +extern void ipf_proxy_free(ipf_main_softc_t *, ap_session_t *); +extern int ipf_proxy_main_load(void); +extern int ipf_proxy_main_unload(void); +extern ipnat_t *ipf_proxy_rule_fwd(nat_t *); +extern ipnat_t *ipf_proxy_rule_rev(nat_t *); +extern void *ipf_proxy_soft_create(ipf_main_softc_t *); +extern void ipf_proxy_soft_destroy(ipf_main_softc_t *, void *); +extern int ipf_proxy_soft_init(ipf_main_softc_t *, void *); +extern int ipf_proxy_soft_fini(ipf_main_softc_t *, void *); #endif /* __IP_PROXY_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c b/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c index 62202ffc4488..0853b90d31e0 100644 --- a/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c +++ b/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c @@ -11,11 +11,11 @@ #define IPF_RAUDIO_PROXY -void ipf_p_raudio_main_load __P((void)); -void ipf_p_raudio_main_unload __P((void)); -int ipf_p_raudio_new __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_raudio_in __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_raudio_out __P((void *, fr_info_t *, ap_session_t *, nat_t *)); +void ipf_p_raudio_main_load(void); +void ipf_p_raudio_main_unload(void); +int ipf_p_raudio_new(void *, fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_raudio_in(void *, fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_raudio_out(void *, fr_info_t *, ap_session_t *, nat_t *); static frentry_t raudiofr; diff --git a/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c b/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c index 29aec0044f3a..5dfdc040de4c 100644 --- a/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c +++ b/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c @@ -20,17 +20,17 @@ typedef struct rcmdinfo { ipnat_t *rcmd_rule; /* Template rule for back connection */ } rcmdinfo_t; -void ipf_p_rcmd_main_load __P((void)); -void ipf_p_rcmd_main_unload __P((void)); - -int ipf_p_rcmd_init __P((void)); -void ipf_p_rcmd_fini __P((void)); -void ipf_p_rcmd_del __P((ipf_main_softc_t *, ap_session_t *)); -int ipf_p_rcmd_new __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_rcmd_out __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_rcmd_in __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -u_short ipf_rcmd_atoi __P((char *)); -int ipf_p_rcmd_portmsg __P((fr_info_t *, ap_session_t *, nat_t *)); +void ipf_p_rcmd_main_load(void); +void ipf_p_rcmd_main_unload(void); + +int ipf_p_rcmd_init(void); +void ipf_p_rcmd_fini(void); +void ipf_p_rcmd_del(ipf_main_softc_t *, ap_session_t *); +int ipf_p_rcmd_new(void *, fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_rcmd_out(void *, fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_rcmd_in(void *, fr_info_t *, ap_session_t *, nat_t *); +u_short ipf_rcmd_atoi(char *); +int ipf_p_rcmd_portmsg(fr_info_t *, ap_session_t *, nat_t *); static frentry_t rcmdfr; diff --git a/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c b/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c index 727e731cd0e3..4c7996e59300 100644 --- a/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c +++ b/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c @@ -44,36 +44,36 @@ /* * Function prototypes */ -void ipf_p_rpcb_main_load __P((void)); -void ipf_p_rpcb_main_unload __P((void)); -int ipf_p_rpcb_new __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -void ipf_p_rpcb_del __P((ipf_main_softc_t *, ap_session_t *)); -int ipf_p_rpcb_in __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_rpcb_out __P((void *, fr_info_t *, ap_session_t *, nat_t *)); - -static void ipf_p_rpcb_flush __P((rpcb_session_t *)); -static int ipf_p_rpcb_decodereq __P((fr_info_t *, nat_t *, - rpcb_session_t *, rpc_msg_t *)); -static int ipf_p_rpcb_skipauth __P((rpc_msg_t *, xdr_auth_t *, u_32_t **)); -static int ipf_p_rpcb_insert __P((rpcb_session_t *, rpcb_xact_t *)); -static int ipf_p_rpcb_xdrrpcb __P((rpc_msg_t *, u_32_t *, rpcb_args_t *)); -static int ipf_p_rpcb_getuaddr __P((rpc_msg_t *, xdr_uaddr_t *, - u_32_t **)); -static u_int ipf_p_rpcb_atoi __P((char *)); -static int ipf_p_rpcb_modreq __P((fr_info_t *, nat_t *, rpc_msg_t *, - mb_t *, u_int)); -static int ipf_p_rpcb_decoderep __P((fr_info_t *, nat_t *, - rpcb_session_t *, rpc_msg_t *, rpcb_xact_t **)); -static rpcb_xact_t * ipf_p_rpcb_lookup __P((rpcb_session_t *, u_32_t)); -static void ipf_p_rpcb_deref __P((rpcb_session_t *, rpcb_xact_t *)); -static int ipf_p_rpcb_getproto __P((rpc_msg_t *, xdr_proto_t *, - u_32_t **)); -static int ipf_p_rpcb_getnat __P((fr_info_t *, nat_t *, u_int, u_int)); -static int ipf_p_rpcb_modv3 __P((fr_info_t *, nat_t *, rpc_msg_t *, - mb_t *, u_int)); -static int ipf_p_rpcb_modv4 __P((fr_info_t *, nat_t *, rpc_msg_t *, - mb_t *, u_int)); -static void ipf_p_rpcb_fixlen __P((fr_info_t *, int)); +void ipf_p_rpcb_main_load(void); +void ipf_p_rpcb_main_unload(void); +int ipf_p_rpcb_new(void *, fr_info_t *, ap_session_t *, nat_t *); +void ipf_p_rpcb_del(ipf_main_softc_t *, ap_session_t *); +int ipf_p_rpcb_in(void *, fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_rpcb_out(void *, fr_info_t *, ap_session_t *, nat_t *); + +static void ipf_p_rpcb_flush(rpcb_session_t *); +static int ipf_p_rpcb_decodereq(fr_info_t *, nat_t *, + rpcb_session_t *, rpc_msg_t *); +static int ipf_p_rpcb_skipauth(rpc_msg_t *, xdr_auth_t *, u_32_t **); +static int ipf_p_rpcb_insert(rpcb_session_t *, rpcb_xact_t *); +static int ipf_p_rpcb_xdrrpcb(rpc_msg_t *, u_32_t *, rpcb_args_t *); +static int ipf_p_rpcb_getuaddr(rpc_msg_t *, xdr_uaddr_t *, + u_32_t **); +static u_int ipf_p_rpcb_atoi(char *); +static int ipf_p_rpcb_modreq(fr_info_t *, nat_t *, rpc_msg_t *, + mb_t *, u_int); +static int ipf_p_rpcb_decoderep(fr_info_t *, nat_t *, + rpcb_session_t *, rpc_msg_t *, rpcb_xact_t **); +static rpcb_xact_t * ipf_p_rpcb_lookup(rpcb_session_t *, u_32_t); +static void ipf_p_rpcb_deref(rpcb_session_t *, rpcb_xact_t *); +static int ipf_p_rpcb_getproto(rpc_msg_t *, xdr_proto_t *, + u_32_t **); +static int ipf_p_rpcb_getnat(fr_info_t *, nat_t *, u_int, u_int); +static int ipf_p_rpcb_modv3(fr_info_t *, nat_t *, rpc_msg_t *, + mb_t *, u_int); +static int ipf_p_rpcb_modv4(fr_info_t *, nat_t *, rpc_msg_t *, + mb_t *, u_int); +static void ipf_p_rpcb_fixlen(fr_info_t *, int); /* * Global variables diff --git a/sys/contrib/ipfilter/netinet/ip_rules.h b/sys/contrib/ipfilter/netinet/ip_rules.h index 37e364613d50..73ba0cf72b8c 100644 --- a/sys/contrib/ipfilter/netinet/ip_rules.h +++ b/sys/contrib/ipfilter/netinet/ip_rules.h @@ -1,16 +1,16 @@ /* $FreeBSD$ */ -extern int ipfrule_add __P((void)); -extern int ipfrule_remove __P((void)); +extern int ipfrule_add(void); +extern int ipfrule_remove(void); -extern frentry_t *ipfrule_match_out_ __P((fr_info_t *, u_32_t *)); +extern frentry_t *ipfrule_match_out_(fr_info_t *, u_32_t *); extern frentry_t *ipf_rules_out_[1]; -extern int ipfrule_add_out_ __P((void)); -extern int ipfrule_remove_out_ __P((void)); +extern int ipfrule_add_out_(void); +extern int ipfrule_remove_out_(void); -extern frentry_t *ipfrule_match_in_ __P((fr_info_t *, u_32_t *)); +extern frentry_t *ipfrule_match_in_(fr_info_t *, u_32_t *); extern frentry_t *ipf_rules_in_[1]; -extern int ipfrule_add_in_ __P((void)); -extern int ipfrule_remove_in_ __P((void)); +extern int ipfrule_add_in_(void); +extern int ipfrule_remove_in_(void); diff --git a/sys/contrib/ipfilter/netinet/ip_scan.c b/sys/contrib/ipfilter/netinet/ip_scan.c index 34bc844eb354..fd3ad538915d 100644 --- a/sys/contrib/ipfilter/netinet/ip_scan.c +++ b/sys/contrib/ipfilter/netinet/ip_scan.c @@ -69,12 +69,12 @@ ipfrwlock_t ipf_scan_rwlock; # endif -int ipf_scan_add __P((caddr_t)); -int ipf_scan_remove __P((caddr_t)); -struct ipscan *ipf_scan_lookup __P((char *)); -int ipf_scan_matchstr __P((sinfo_t *, char *, int)); -int ipf_scan_matchisc __P((ipscan_t *, ipstate_t *, int, int, int *)); -int ipf_scan_match __P((ipstate_t *)); +int ipf_scan_add(caddr_t); +int ipf_scan_remove(caddr_t); +struct ipscan *ipf_scan_lookup(char *); +int ipf_scan_matchstr(sinfo_t *, char *, int); +int ipf_scan_matchisc(ipscan_t *, ipstate_t *, int, int, int *); +int ipf_scan_match(ipstate_t *); static int ipf_scan_inited = 0; diff --git a/sys/contrib/ipfilter/netinet/ip_scan.h b/sys/contrib/ipfilter/netinet/ip_scan.h index f15aeb844ac2..2cd31fef6590 100644 --- a/sys/contrib/ipfilter/netinet/ip_scan.h +++ b/sys/contrib/ipfilter/netinet/ip_scan.h @@ -88,13 +88,13 @@ typedef struct ipscanstat { } ipscanstat_t; -extern int ipf_scan_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, int, void *)); -extern int ipf_scan_init __P((void)); -extern int ipf_scan_attachis __P((struct ipstate *)); -extern int ipf_scan_attachfr __P((struct frentry *)); -extern int ipf_scan_detachis __P((struct ipstate *)); -extern int ipf_scan_detachfr __P((struct frentry *)); -extern int ipf_scan_packet __P((struct fr_info *, struct ipstate *)); -extern void ipf_scan_unload __P((ipf_main_softc_t *)); +extern int ipf_scan_ioctl(ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, int, void *); +extern int ipf_scan_init(void); +extern int ipf_scan_attachis(struct ipstate *); +extern int ipf_scan_attachfr(struct frentry *); +extern int ipf_scan_detachis(struct ipstate *); +extern int ipf_scan_detachfr(struct frentry *); +extern int ipf_scan_packet(struct fr_info *, struct ipstate *); +extern void ipf_scan_unload(ipf_main_softc_t *); #endif /* __IP_SCAN_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/contrib/ipfilter/netinet/ip_state.c index d723d50f1659..45a641fd86a2 100644 --- a/sys/contrib/ipfilter/netinet/ip_state.c +++ b/sys/contrib/ipfilter/netinet/ip_state.c @@ -143,43 +143,43 @@ static ipftuneable_t ipf_state_tuneables[] = { #define SBUMPDX(x, y, z)do { (softs->x.y)++; DT(z); } while (0) #ifdef USE_INET6 -static ipstate_t *ipf_checkicmp6matchingstate __P((fr_info_t *)); +static ipstate_t *ipf_checkicmp6matchingstate(fr_info_t *); #endif -static int ipf_allowstateicmp __P((fr_info_t *, ipstate_t *, i6addr_t *)); -static ipstate_t *ipf_matchsrcdst __P((fr_info_t *, ipstate_t *, i6addr_t *, - i6addr_t *, tcphdr_t *, u_32_t)); -static ipstate_t *ipf_checkicmpmatchingstate __P((fr_info_t *)); -static int ipf_state_flush_entry __P((ipf_main_softc_t *, void *)); -static ips_stat_t *ipf_state_stats __P((ipf_main_softc_t *)); -static int ipf_state_del __P((ipf_main_softc_t *, ipstate_t *, int)); -static int ipf_state_remove __P((ipf_main_softc_t *, caddr_t)); -static int ipf_state_match __P((ipstate_t *is1, ipstate_t *is2)); -static int ipf_state_matchaddresses __P((ipstate_t *is1, ipstate_t *is2)); -static int ipf_state_matchipv4addrs __P((ipstate_t *is1, ipstate_t *is2)); -static int ipf_state_matchipv6addrs __P((ipstate_t *is1, ipstate_t *is2)); -static int ipf_state_matchisps __P((ipstate_t *is1, ipstate_t *is2)); -static int ipf_state_matchports __P((udpinfo_t *is1, udpinfo_t *is2)); -static int ipf_state_matcharray __P((ipstate_t *, int *, u_long)); -static void ipf_ipsmove __P((ipf_state_softc_t *, ipstate_t *, u_int)); -static int ipf_state_tcp __P((ipf_main_softc_t *, ipf_state_softc_t *, - fr_info_t *, tcphdr_t *, ipstate_t *)); -static int ipf_tcpoptions __P((ipf_state_softc_t *, fr_info_t *, - tcphdr_t *, tcpdata_t *)); -static ipstate_t *ipf_state_clone __P((fr_info_t *, tcphdr_t *, ipstate_t *)); -static void ipf_fixinisn __P((fr_info_t *, ipstate_t *)); -static void ipf_fixoutisn __P((fr_info_t *, ipstate_t *)); -static void ipf_checknewisn __P((fr_info_t *, ipstate_t *)); -static int ipf_state_iter __P((ipf_main_softc_t *, ipftoken_t *, - ipfgeniter_t *, ipfobj_t *)); -static int ipf_state_gettable __P((ipf_main_softc_t *, ipf_state_softc_t *, - char *)); -static int ipf_state_tcpinwindow __P((struct fr_info *, struct tcpdata *, - struct tcpdata *, tcphdr_t *, int)); - -static int ipf_state_getent __P((ipf_main_softc_t *, ipf_state_softc_t *, - caddr_t)); -static int ipf_state_putent __P((ipf_main_softc_t *, ipf_state_softc_t *, - caddr_t)); +static int ipf_allowstateicmp(fr_info_t *, ipstate_t *, i6addr_t *); +static ipstate_t *ipf_matchsrcdst(fr_info_t *, ipstate_t *, i6addr_t *, + i6addr_t *, tcphdr_t *, u_32_t); +static ipstate_t *ipf_checkicmpmatchingstate(fr_info_t *); +static int ipf_state_flush_entry(ipf_main_softc_t *, void *); +static ips_stat_t *ipf_state_stats(ipf_main_softc_t *); +static int ipf_state_del(ipf_main_softc_t *, ipstate_t *, int); +static int ipf_state_remove(ipf_main_softc_t *, caddr_t); +static int ipf_state_match(ipstate_t *is1, ipstate_t *is2); +static int ipf_state_matchaddresses(ipstate_t *is1, ipstate_t *is2); +static int ipf_state_matchipv4addrs(ipstate_t *is1, ipstate_t *is2); +static int ipf_state_matchipv6addrs(ipstate_t *is1, ipstate_t *is2); +static int ipf_state_matchisps(ipstate_t *is1, ipstate_t *is2); +static int ipf_state_matchports(udpinfo_t *is1, udpinfo_t *is2); +static int ipf_state_matcharray(ipstate_t *, int *, u_long); +static void ipf_ipsmove(ipf_state_softc_t *, ipstate_t *, u_int); +static int ipf_state_tcp(ipf_main_softc_t *, ipf_state_softc_t *, + fr_info_t *, tcphdr_t *, ipstate_t *); +static int ipf_tcpoptions(ipf_state_softc_t *, fr_info_t *, + tcphdr_t *, tcpdata_t *); +static ipstate_t *ipf_state_clone(fr_info_t *, tcphdr_t *, ipstate_t *); +static void ipf_fixinisn(fr_info_t *, ipstate_t *); +static void ipf_fixoutisn(fr_info_t *, ipstate_t *); +static void ipf_checknewisn(fr_info_t *, ipstate_t *); +static int ipf_state_iter(ipf_main_softc_t *, ipftoken_t *, + ipfgeniter_t *, ipfobj_t *); +static int ipf_state_gettable(ipf_main_softc_t *, ipf_state_softc_t *, + char *); +static int ipf_state_tcpinwindow(struct fr_info *, struct tcpdata *, + struct tcpdata *, tcphdr_t *, int); + +static int ipf_state_getent(ipf_main_softc_t *, ipf_state_softc_t *, + caddr_t); +static int ipf_state_putent(ipf_main_softc_t *, ipf_state_softc_t *, + caddr_t); #define ONE_DAY IPF_TTLVAL(1 * 86400) /* 1 day */ #define FIVE_DAYS (5 * ONE_DAY) diff --git a/sys/contrib/ipfilter/netinet/ip_state.h b/sys/contrib/ipfilter/netinet/ip_state.h index e541cff52183..26377bc7f5d2 100644 --- a/sys/contrib/ipfilter/netinet/ip_state.h +++ b/sys/contrib/ipfilter/netinet/ip_state.h @@ -293,41 +293,41 @@ typedef struct ipf_state_softc_s { #ifndef _KERNEL -extern void ipf_state_dump __P((ipf_main_softc_t *, void *)); +extern void ipf_state_dump(ipf_main_softc_t *, void *); #endif -extern int ipf_tcp_age __P((struct ipftqent *, struct fr_info *, - struct ipftq *, int, int)); -extern int ipf_tcpinwindow __P((struct fr_info *, struct tcpdata *, - struct tcpdata *, tcphdr_t *, int)); +extern int ipf_tcp_age(struct ipftqent *, struct fr_info *, + struct ipftq *, int, int); +extern int ipf_tcpinwindow(struct fr_info *, struct tcpdata *, + struct tcpdata *, tcphdr_t *, int); -extern int ipf_state_add __P((ipf_main_softc_t *, fr_info_t *, - ipstate_t **, u_int)); -extern frentry_t *ipf_state_check __P((struct fr_info *, u_32_t *)); -extern void ipf_state_deref __P((ipf_main_softc_t *, ipstate_t **)); -extern void ipf_state_expire __P((ipf_main_softc_t *)); -extern int ipf_state_flush __P((ipf_main_softc_t *, int, int)); -extern ipstate_t *ipf_state_lookup __P((fr_info_t *, tcphdr_t *, ipftq_t **)); -extern int ipf_state_init __P((void)); -extern int ipf_state_insert __P((ipf_main_softc_t *, struct ipstate *, int)); -extern int ipf_state_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, int, void *)); -extern void ipf_state_log __P((ipf_main_softc_t *, struct ipstate *, u_int)); -extern int ipf_state_matchflush __P((ipf_main_softc_t *, caddr_t)); -extern int ipf_state_rehash __P((ipf_main_softc_t *, ipftuneable_t *, ipftuneval_t *)); -extern void ipf_state_setqueue __P((ipf_main_softc_t *, ipstate_t *, int)); -extern void ipf_state_setpending __P((ipf_main_softc_t *, ipstate_t *)); -extern int ipf_state_settimeout __P((struct ipf_main_softc_s *, ipftuneable_t *, ipftuneval_t *)); -extern void ipf_state_sync __P((ipf_main_softc_t *, void *)); -extern void ipf_state_update __P((fr_info_t *, ipstate_t *)); +extern int ipf_state_add(ipf_main_softc_t *, fr_info_t *, + ipstate_t **, u_int); +extern frentry_t *ipf_state_check(struct fr_info *, u_32_t *); +extern void ipf_state_deref(ipf_main_softc_t *, ipstate_t **); +extern void ipf_state_expire(ipf_main_softc_t *); +extern int ipf_state_flush(ipf_main_softc_t *, int, int); +extern ipstate_t *ipf_state_lookup(fr_info_t *, tcphdr_t *, ipftq_t **); +extern int ipf_state_init(void); +extern int ipf_state_insert(ipf_main_softc_t *, struct ipstate *, int); +extern int ipf_state_ioctl(ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, int, void *); +extern void ipf_state_log(ipf_main_softc_t *, struct ipstate *, u_int); +extern int ipf_state_matchflush(ipf_main_softc_t *, caddr_t); +extern int ipf_state_rehash(ipf_main_softc_t *, ipftuneable_t *, ipftuneval_t *); +extern void ipf_state_setqueue(ipf_main_softc_t *, ipstate_t *, int); +extern void ipf_state_setpending(ipf_main_softc_t *, ipstate_t *); +extern int ipf_state_settimeout(struct ipf_main_softc_s *, ipftuneable_t *, ipftuneval_t *); +extern void ipf_state_sync(ipf_main_softc_t *, void *); +extern void ipf_state_update(fr_info_t *, ipstate_t *); -extern void ipf_sttab_init __P((ipf_main_softc_t *, struct ipftq *)); -extern void ipf_sttab_destroy __P((struct ipftq *)); -extern void ipf_state_setlock __P((void *, int)); -extern int ipf_state_main_load __P((void)); -extern int ipf_state_main_unload __P((void)); -extern void *ipf_state_soft_create __P((ipf_main_softc_t *)); -extern void ipf_state_soft_destroy __P((ipf_main_softc_t *, void *)); -extern int ipf_state_soft_init __P((ipf_main_softc_t *, void *)); -extern int ipf_state_soft_fini __P((ipf_main_softc_t *, void *)); -extern ipftq_t *ipf_state_add_tq __P((ipf_main_softc_t *, int)); +extern void ipf_sttab_init(ipf_main_softc_t *, struct ipftq *); +extern void ipf_sttab_destroy(struct ipftq *); +extern void ipf_state_setlock(void *, int); +extern int ipf_state_main_load(void); +extern int ipf_state_main_unload(void); +extern void *ipf_state_soft_create(ipf_main_softc_t *); +extern void ipf_state_soft_destroy(ipf_main_softc_t *, void *); +extern int ipf_state_soft_init(ipf_main_softc_t *, void *); +extern int ipf_state_soft_fini(ipf_main_softc_t *, void *); +extern ipftq_t *ipf_state_add_tq(ipf_main_softc_t *, int); #endif /* __IP_STATE_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_sync.c b/sys/contrib/ipfilter/netinet/ip_sync.c index 95c383c08d8f..f95cd824544b 100644 --- a/sys/contrib/ipfilter/netinet/ip_sync.c +++ b/sys/contrib/ipfilter/netinet/ip_sync.c @@ -125,17 +125,17 @@ typedef struct ipf_sync_softc_s { int ipf_sync_inited; } ipf_sync_softc_t; -static int ipf_sync_flush_table __P((ipf_sync_softc_t *, int, synclist_t **)); -static void ipf_sync_wakeup __P((ipf_main_softc_t *)); -static void ipf_sync_del __P((ipf_sync_softc_t *, synclist_t *)); -static void ipf_sync_poll_wakeup __P((ipf_main_softc_t *)); -static int ipf_sync_nat __P((ipf_main_softc_t *, synchdr_t *, void *)); -static int ipf_sync_state __P((ipf_main_softc_t *, synchdr_t *, void *)); +static int ipf_sync_flush_table(ipf_sync_softc_t *, int, synclist_t **); +static void ipf_sync_wakeup(ipf_main_softc_t *); +static void ipf_sync_del(ipf_sync_softc_t *, synclist_t *); +static void ipf_sync_poll_wakeup(ipf_main_softc_t *); +static int ipf_sync_nat(ipf_main_softc_t *, synchdr_t *, void *); +static int ipf_sync_state(ipf_main_softc_t *, synchdr_t *, void *); # if !defined(sparc) && !defined(__hppa) -void ipf_sync_tcporder __P((int, struct tcpdata *)); -void ipf_sync_natorder __P((int, struct nat *)); -void ipf_sync_storder __P((int, struct ipstate *)); +void ipf_sync_tcporder(int, struct tcpdata *); +void ipf_sync_natorder(int, struct nat *); +void ipf_sync_storder(int, struct ipstate *); # endif diff --git a/sys/contrib/ipfilter/netinet/ip_sync.h b/sys/contrib/ipfilter/netinet/ip_sync.h index d9d6d41046e8..ad9c8627e8dd 100644 --- a/sys/contrib/ipfilter/netinet/ip_sync.h +++ b/sys/contrib/ipfilter/netinet/ip_sync.h @@ -100,22 +100,22 @@ typedef struct syncupdent { /* 28 or 32 bytes */ struct synctcp_update sup_tcp; } syncupdent_t; -extern void *ipf_sync_create __P((ipf_main_softc_t *)); -extern int ipf_sync_soft_init __P((ipf_main_softc_t *, void *)); -extern int ipf_sync_soft_fini __P((ipf_main_softc_t *, void *)); -extern int ipf_sync_canread __P((void *)); -extern int ipf_sync_canwrite __P((void *)); -extern void ipf_sync_del_nat __P((void *, synclist_t *)); -extern void ipf_sync_del_state __P((void *, synclist_t *)); -extern int ipf_sync_init __P((void)); -extern int ipf_sync_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, int, void *)); -extern synclist_t *ipf_sync_new __P((ipf_main_softc_t *, int, fr_info_t *, void *)); -extern int ipf_sync_read __P((ipf_main_softc_t *, struct uio *uio)); -extern int ipf_sync_write __P((ipf_main_softc_t *, struct uio *uio)); -extern int ipf_sync_main_unload __P((void)); -extern void ipf_sync_update __P((ipf_main_softc_t *, int, fr_info_t *, synclist_t *)); -extern void ipf_sync_expire __P((ipf_main_softc_t *)); -extern void ipf_sync_soft_destroy __P((ipf_main_softc_t *, void *)); -extern void *ipf_sync_soft_create __P((ipf_main_softc_t *)); +extern void *ipf_sync_create(ipf_main_softc_t *); +extern int ipf_sync_soft_init(ipf_main_softc_t *, void *); +extern int ipf_sync_soft_fini(ipf_main_softc_t *, void *); +extern int ipf_sync_canread(void *); +extern int ipf_sync_canwrite(void *); +extern void ipf_sync_del_nat(void *, synclist_t *); +extern void ipf_sync_del_state(void *, synclist_t *); +extern int ipf_sync_init(void); +extern int ipf_sync_ioctl(ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, int, void *); +extern synclist_t *ipf_sync_new(ipf_main_softc_t *, int, fr_info_t *, void *); +extern int ipf_sync_read(ipf_main_softc_t *, struct uio *uio); +extern int ipf_sync_write(ipf_main_softc_t *, struct uio *uio); +extern int ipf_sync_main_unload(void); +extern void ipf_sync_update(ipf_main_softc_t *, int, fr_info_t *, synclist_t *); +extern void ipf_sync_expire(ipf_main_softc_t *); +extern void ipf_sync_soft_destroy(ipf_main_softc_t *, void *); +extern void *ipf_sync_soft_create(ipf_main_softc_t *); #endif /* __IP_SYNC_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c b/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c index 9c0ef91ec9cf..6f6648899a44 100644 --- a/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c +++ b/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c @@ -13,19 +13,19 @@ typedef struct ipf_tftp_softc_s { ipftuneable_t *ipf_p_tftp_tune; } ipf_tftp_softc_t; -int ipf_p_tftp_backchannel __P((fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_tftp_client __P((ipf_tftp_softc_t *, fr_info_t *, ap_session_t *, - nat_t *)); -int ipf_p_tftp_in __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -void ipf_p_tftp_main_load __P((void)); -void ipf_p_tftp_main_unload __P((void)); -int ipf_p_tftp_new __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -void ipf_p_tftp_del __P((ipf_main_softc_t *, ap_session_t *)); -int ipf_p_tftp_out __P((void *, fr_info_t *, ap_session_t *, nat_t *)); -int ipf_p_tftp_server __P((ipf_tftp_softc_t *, fr_info_t *, ap_session_t *, - nat_t *)); -void *ipf_p_tftp_soft_create __P((ipf_main_softc_t *)); -void ipf_p_tftp_soft_destroy __P((ipf_main_softc_t *, void *)); +int ipf_p_tftp_backchannel(fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_tftp_client(ipf_tftp_softc_t *, fr_info_t *, ap_session_t *, + nat_t *); +int ipf_p_tftp_in(void *, fr_info_t *, ap_session_t *, nat_t *); +void ipf_p_tftp_main_load(void); +void ipf_p_tftp_main_unload(void); +int ipf_p_tftp_new(void *, fr_info_t *, ap_session_t *, nat_t *); +void ipf_p_tftp_del(ipf_main_softc_t *, ap_session_t *); +int ipf_p_tftp_out(void *, fr_info_t *, ap_session_t *, nat_t *); +int ipf_p_tftp_server(ipf_tftp_softc_t *, fr_info_t *, ap_session_t *, + nat_t *); +void *ipf_p_tftp_soft_create(ipf_main_softc_t *); +void ipf_p_tftp_soft_destroy(ipf_main_softc_t *, void *); static frentry_t tftpfr; static int tftp_proxy_init = 0; diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c index f6f6d2ce6d64..0b9fdb76263e 100644 --- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c +++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.c @@ -69,15 +69,15 @@ static int ipf_fbsd_sysctl_create(void); static int ipf_fbsd_sysctl_destroy(void); #ifdef __FreeBSD_version -static int ipfopen __P((struct cdev*, int, int, struct thread *)); -static int ipfclose __P((struct cdev*, int, int, struct thread *)); -static int ipfread __P((struct cdev*, struct uio *, int)); -static int ipfwrite __P((struct cdev*, struct uio *, int)); +static int ipfopen(struct cdev*, int, int, struct thread *); +static int ipfclose(struct cdev*, int, int, struct thread *); +static int ipfread(struct cdev*, struct uio *, int); +static int ipfwrite(struct cdev*, struct uio *, int); #else -static int ipfopen __P((dev_t, int, int, struct proc *)); -static int ipfclose __P((dev_t, int, int, struct proc *)); -static int ipfread __P((dev_t, struct uio *, int)); -static int ipfwrite __P((dev_t, struct uio *, int)); +static int ipfopen(dev_t, int, int, struct proc *); +static int ipfclose(dev_t, int, int, struct proc *); +static int ipfread(dev_t, struct uio *, int); +static int ipfwrite(dev_t, struct uio *, int); #endif diff --git a/sys/contrib/ipfilter/netinet/radix_ipf.c b/sys/contrib/ipfilter/netinet/radix_ipf.c index ac7c88ce2847..df0932de4181 100644 --- a/sys/contrib/ipfilter/netinet/radix_ipf.c +++ b/sys/contrib/ipfilter/netinet/radix_ipf.c @@ -29,16 +29,16 @@ #define ADF_OFF offsetof(addrfamily_t, adf_addr) #define ADF_OFF_BITS (ADF_OFF << 3) -static ipf_rdx_node_t *ipf_rx_insert __P((ipf_rdx_head_t *, - ipf_rdx_node_t nodes[2], int *)); -static void ipf_rx_attach_mask __P((ipf_rdx_node_t *, ipf_rdx_mask_t *)); -static int count_mask_bits __P((addrfamily_t *, u_32_t **)); -static void buildnodes __P((addrfamily_t *, addrfamily_t *, - ipf_rdx_node_t n[2])); -static ipf_rdx_node_t *ipf_rx_find_addr __P((ipf_rdx_node_t *, u_32_t *)); -static ipf_rdx_node_t *ipf_rx_lookup __P((ipf_rdx_head_t *, addrfamily_t *, - addrfamily_t *)); -static ipf_rdx_node_t *ipf_rx_match __P((ipf_rdx_head_t *, addrfamily_t *)); +static ipf_rdx_node_t *ipf_rx_insert(ipf_rdx_head_t *, + ipf_rdx_node_t nodes[2], int *); +static void ipf_rx_attach_mask(ipf_rdx_node_t *, ipf_rdx_mask_t *); +static int count_mask_bits(addrfamily_t *, u_32_t **); +static void buildnodes(addrfamily_t *, addrfamily_t *, + ipf_rdx_node_t n[2]); +static ipf_rdx_node_t *ipf_rx_find_addr(ipf_rdx_node_t *, u_32_t *); +static ipf_rdx_node_t *ipf_rx_lookup(ipf_rdx_head_t *, addrfamily_t *, + addrfamily_t *); +static ipf_rdx_node_t *ipf_rx_match(ipf_rdx_head_t *, addrfamily_t *); /* * Foreword. diff --git a/sys/contrib/ipfilter/netinet/radix_ipf.h b/sys/contrib/ipfilter/netinet/radix_ipf.h index 73e66b0aa169..6d6d346d8c77 100644 --- a/sys/contrib/ipfilter/netinet/radix_ipf.h +++ b/sys/contrib/ipfilter/netinet/radix_ipf.h @@ -79,17 +79,17 @@ typedef struct radix_softc { # define RADIX_NODE_HEAD_UNLOCK(x) #endif -extern void *ipf_rx_create __P((void)); -extern int ipf_rx_init __P((void *)); -extern void ipf_rx_destroy __P((void *)); -extern int ipf_rx_inithead __P((radix_softc_t *, ipf_rdx_head_t **)); -extern void ipf_rx_freehead __P((ipf_rdx_head_t *)); -extern ipf_rdx_node_t *ipf_rx_addroute __P((ipf_rdx_head_t *, +extern void *ipf_rx_create(void); +extern int ipf_rx_init(void *); +extern void ipf_rx_destroy(void *); +extern int ipf_rx_inithead(radix_softc_t *, ipf_rdx_head_t **); +extern void ipf_rx_freehead(ipf_rdx_head_t *); +extern ipf_rdx_node_t *ipf_rx_addroute(ipf_rdx_head_t *, addrfamily_t *, addrfamily_t *, - ipf_rdx_node_t *)); -extern ipf_rdx_node_t *ipf_rx_delete __P((ipf_rdx_head_t *, addrfamily_t *, - addrfamily_t *)); -extern void ipf_rx_walktree __P((ipf_rdx_head_t *, radix_walk_func_t, - void *)); + ipf_rdx_node_t *); +extern ipf_rdx_node_t *ipf_rx_delete(ipf_rdx_head_t *, addrfamily_t *, + addrfamily_t *); +extern void ipf_rx_walktree(ipf_rdx_head_t *, radix_walk_func_t, + void *); #endif /* __RADIX_IPF_H__ */ |