git: 4cd1807c7d2a - main - Retire the K&R/STD C __P prototype declarations.
Cy Schubert
cy at FreeBSD.org
Tue Feb 2 01:19:20 UTC 2021
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=4cd1807c7d2a67b633dd0c0bfde15091543a2514
commit 4cd1807c7d2a67b633dd0c0bfde15091543a2514
Author: Cy Schubert <cy at FreeBSD.org>
AuthorDate: 2021-01-26 06:24:28 +0000
Commit: Cy Schubert <cy at FreeBSD.org>
CommitDate: 2021-02-02 01:19:15 +0000
Retire the K&R/STD C __P prototype declarations.
In the old days when K&R C and STD C were each in use a workaround
(read hack) was required to allow the same code to work on each
without modification. All C compilers support STD C. We can finally
put the __P prototype to rest.
MFC after: 1 week
---
contrib/ipfilter/bpf_filter.c | 4 +-
contrib/ipfilter/ip_dstlist.c | 70 ++---
contrib/ipfilter/ip_dstlist.h | 4 +-
contrib/ipfilter/ip_fil.c | 12 +-
contrib/ipfilter/ip_fil_compat.c | 122 ++++----
contrib/ipfilter/ip_msnrpc_pxy.c | 12 +-
contrib/ipfilter/ipf.h | 340 ++++++++++-----------
contrib/ipfilter/iplang/iplang.h | 2 +-
contrib/ipfilter/iplang/iplang_l.l | 16 +-
contrib/ipfilter/iplang/iplang_y.y | 162 +++++-----
contrib/ipfilter/ipmon.h | 14 +-
contrib/ipfilter/ipsend/ipresend.c | 4 +-
contrib/ipfilter/ipsend/ipsend.c | 8 +-
contrib/ipfilter/ipsend/ipsend.h | 52 ++--
contrib/ipfilter/ipsend/iptest.c | 4 +-
contrib/ipfilter/ipsend/resend.c | 2 +-
contrib/ipfilter/ipsend/sock.c | 4 +-
contrib/ipfilter/ipt.h | 6 +-
contrib/ipfilter/kmem.h | 6 +-
contrib/ipfilter/lib/facpri.h | 8 +-
contrib/ipfilter/lib/inet_addr.c | 2 +-
contrib/ipfilter/lib/initparse.c | 2 +-
contrib/ipfilter/lib/interror.c | 2 +-
contrib/ipfilter/lib/ipft_hx.c | 8 +-
contrib/ipfilter/lib/ipft_pc.c | 10 +-
contrib/ipfilter/lib/ipft_tx.c | 12 +-
contrib/ipfilter/lib/kmem.h | 6 +-
contrib/ipfilter/lib/printipfexpr.c | 8 +-
contrib/ipfilter/lib/save_execute.c | 8 +-
contrib/ipfilter/lib/save_file.c | 12 +-
contrib/ipfilter/lib/save_nothing.c | 6 +-
contrib/ipfilter/lib/save_syslog.c | 8 +-
contrib/ipfilter/lib/save_v1trap.c | 20 +-
contrib/ipfilter/lib/save_v2trap.c | 24 +-
contrib/ipfilter/lib/var.c | 4 +-
contrib/ipfilter/man/ipf.4 | 2 +-
contrib/ipfilter/md5.c | 2 +-
contrib/ipfilter/md5.h | 6 +-
contrib/ipfilter/radix_ipf.c | 20 +-
contrib/ipfilter/radix_ipf.h | 24 +-
contrib/ipfilter/tools/ipf.c | 32 +-
contrib/ipfilter/tools/ipf_y.y | 52 ++--
contrib/ipfilter/tools/ipfcomp.c | 38 +--
contrib/ipfilter/tools/ipfs.c | 28 +-
contrib/ipfilter/tools/ipfstat.c | 76 ++---
contrib/ipfilter/tools/ipfsyncd.c | 22 +-
contrib/ipfilter/tools/ipftest.c | 40 +--
contrib/ipfilter/tools/ipmon.c | 48 +--
contrib/ipfilter/tools/ipmon_y.y | 22 +-
contrib/ipfilter/tools/ipnat.c | 24 +-
contrib/ipfilter/tools/ipnat_y.y | 38 +--
contrib/ipfilter/tools/ippool.c | 34 +--
contrib/ipfilter/tools/ippool_y.y | 10 +-
contrib/ipfilter/tools/ipscan_y.y | 32 +-
contrib/ipfilter/tools/ipsyncm.c | 4 +-
contrib/ipfilter/tools/ipsyncs.c | 4 +-
contrib/ipfilter/tools/lexer.c | 14 +-
contrib/ipfilter/tools/lexer.h | 14 +-
sys/contrib/ipfilter/netinet/fil.c | 148 +++++-----
sys/contrib/ipfilter/netinet/ip_auth.c | 14 +-
sys/contrib/ipfilter/netinet/ip_auth.h | 40 +--
sys/contrib/ipfilter/netinet/ip_compat.h | 38 ++-
sys/contrib/ipfilter/netinet/ip_dns_pxy.c | 20 +-
sys/contrib/ipfilter/netinet/ip_dstlist.c | 70 ++---
sys/contrib/ipfilter/netinet/ip_dstlist.h | 4 +-
sys/contrib/ipfilter/netinet/ip_fil.h | 408 +++++++++++++-------------
sys/contrib/ipfilter/netinet/ip_fil_freebsd.c | 6 +-
sys/contrib/ipfilter/netinet/ip_frag.c | 28 +-
sys/contrib/ipfilter/netinet/ip_frag.h | 54 ++--
sys/contrib/ipfilter/netinet/ip_ftp_pxy.c | 78 ++---
sys/contrib/ipfilter/netinet/ip_htable.c | 76 ++---
sys/contrib/ipfilter/netinet/ip_htable.h | 6 +-
sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c | 20 +-
sys/contrib/ipfilter/netinet/ip_irc_pxy.c | 14 +-
sys/contrib/ipfilter/netinet/ip_lookup.c | 16 +-
sys/contrib/ipfilter/netinet/ip_lookup.h | 92 +++---
sys/contrib/ipfilter/netinet/ip_nat.c | 98 +++----
sys/contrib/ipfilter/netinet/ip_nat.h | 176 +++++------
sys/contrib/ipfilter/netinet/ip_nat6.c | 30 +-
sys/contrib/ipfilter/netinet/ip_netbios_pxy.c | 6 +-
sys/contrib/ipfilter/netinet/ip_pool.c | 74 ++---
sys/contrib/ipfilter/netinet/ip_pool.h | 2 +-
sys/contrib/ipfilter/netinet/ip_pptp_pxy.c | 18 +-
sys/contrib/ipfilter/netinet/ip_proxy.c | 4 +-
sys/contrib/ipfilter/netinet/ip_proxy.h | 76 ++---
sys/contrib/ipfilter/netinet/ip_raudio_pxy.c | 10 +-
sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c | 22 +-
sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c | 60 ++--
sys/contrib/ipfilter/netinet/ip_rules.h | 16 +-
sys/contrib/ipfilter/netinet/ip_scan.c | 12 +-
sys/contrib/ipfilter/netinet/ip_scan.h | 16 +-
sys/contrib/ipfilter/netinet/ip_state.c | 72 ++---
sys/contrib/ipfilter/netinet/ip_state.h | 66 ++---
sys/contrib/ipfilter/netinet/ip_sync.c | 18 +-
sys/contrib/ipfilter/netinet/ip_sync.h | 34 +--
sys/contrib/ipfilter/netinet/ip_tftp_pxy.c | 26 +-
sys/contrib/ipfilter/netinet/mlfk_ipl.c | 16 +-
sys/contrib/ipfilter/netinet/radix_ipf.c | 20 +-
sys/contrib/ipfilter/netinet/radix_ipf.h | 22 +-
99 files changed, 1795 insertions(+), 1801 deletions(-)
diff --git a/contrib/ipfilter/bpf_filter.c b/contrib/ipfilter/bpf_filter.c
index bd465761a34e..85a38a88bf57 100644
--- a/contrib/ipfilter/bpf_filter.c
+++ b/contrib/ipfilter/bpf_filter.c
@@ -71,8 +71,8 @@ static const char rcsid[] =
#define int32 bpf_int32
#define u_int32 bpf_u_int32
-static int m_xword __P((mb_t *, int, int *));
-static int m_xhalf __P((mb_t *, int, int *));
+static int m_xword(mb_t *, int, int *);
+static int m_xhalf(mb_t *, int, int *);
#ifndef LBL_ALIGN
/*
diff --git a/contrib/ipfilter/ip_dstlist.c b/contrib/ipfilter/ip_dstlist.c
index 99c7a22668df..14b071b0b95f 100644
--- a/contrib/ipfilter/ip_dstlist.c
+++ b/contrib/ipfilter/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/contrib/ipfilter/ip_dstlist.h b/contrib/ipfilter/ip_dstlist.h
index e2885e5c47ad..c4acd78dfd94 100644
--- a/contrib/ipfilter/ip_dstlist.h
+++ b/contrib/ipfilter/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/contrib/ipfilter/ip_fil.c b/contrib/ipfilter/ip_fil.c
index 794d7e205bb3..327f90fc356c 100644
--- a/contrib/ipfilter/ip_fil.c
+++ b/contrib/ipfilter/ip_fil.c
@@ -23,12 +23,12 @@ static int nifs = 0;
struct rtentry;
-static void ipf_setifpaddr __P((struct ifnet *, char *));
-void init_ifp __P((void));
-static int no_output __P((struct ifnet *, struct mbuf *,
- struct sockaddr *, struct rtentry *));
-static int write_output __P((struct ifnet *, struct mbuf *,
- struct sockaddr *, struct rtentry *));
+static void ipf_setifpaddr(struct ifnet *, char *);
+void init_ifp(void);
+static int no_output(struct ifnet *, struct mbuf *,
+ struct sockaddr *, struct rtentry *);
+static int write_output(struct ifnet *, struct mbuf *,
+ struct sockaddr *, struct rtentry *);
struct ifaddr {
struct sockaddr_storage ifa_addr;
diff --git a/contrib/ipfilter/ip_fil_compat.c b/contrib/ipfilter/ip_fil_compat.c
index 271c2e065738..fbcfc8a0088f 100644
--- a/contrib/ipfilter/ip_fil_compat.c
+++ b/contrib/ipfilter/ip_fil_compat.c
@@ -73,7 +73,7 @@ typedef struct tcpinfo4 {
tcpdata_t ts_data[2];
} tcpinfo4_t;
-static void ipf_v5tcpinfoto4 __P((tcpinfo_t *, tcpinfo4_t *));
+static void ipf_v5tcpinfoto4(tcpinfo_t *, tcpinfo4_t *);
static void
ipf_v5tcpinfoto4(v5, v4)
@@ -1190,66 +1190,66 @@ typedef struct ipfrstat_4_1_1 {
} ipfrstat_4_1_1_t;
/* ------------------------------------------------------------------------ */
-static int ipf_addfrstr __P((char *, int, char *, int));
-static void ipf_v4iptov5 __P((frip4_t *, fr_ip_t *));
-static void ipf_v5iptov4 __P((fr_ip_t *, frip4_t *));
-static void ipfv4tuctov5 __P((frtuc4_t *, frtuc_t *));
-static void ipfv5tuctov4 __P((frtuc_t *, frtuc4_t *));
-static int ipf_v4fripftov5 __P((fripf4_t *, char *));
-static void ipf_v5fripftov4 __P((fripf_t *, fripf4_t *));
-static int fr_frflags4to5 __P((u_32_t));
-static int fr_frflags5to4 __P((u_32_t));
-
-static void friostat_current_to_4_1_0 __P((void *, friostat_4_1_0_t *, int));
-static void friostat_current_to_4_1_33 __P((void *, friostat_4_1_33_t *, int));
-static void ipstate_current_to_4_1_0 __P((void *, ipstate_4_1_0_t *));
-static void ipstate_current_to_4_1_16 __P((void *, ipstate_4_1_16_t *));
-static void ipnat_current_to_4_1_0 __P((void *, ipnat_4_1_0_t *));
-static void ipnat_current_to_4_1_14 __P((void *, ipnat_4_1_14_t *));
-static void frauth_current_to_4_1_11 __P((void *, frauth_4_1_11_t *));
-static void frauth_current_to_4_1_23 __P((void *, frauth_4_1_23_t *));
-static void frauth_current_to_4_1_24 __P((void *, frauth_4_1_24_t *));
-static void frauth_current_to_4_1_29 __P((void *, frauth_4_1_29_t *));
-static void frentry_current_to_4_1_0 __P((void *, frentry_4_1_0_t *));
-static void frentry_current_to_4_1_16 __P((void *, frentry_4_1_16_t *));
-static void frentry_current_to_4_1_34 __P((void *, frentry_4_1_34_t *));
-static void fr_info_current_to_4_1_11 __P((void *, fr_info_4_1_11_t *));
-static void fr_info_current_to_4_1_23 __P((void *, fr_info_4_1_23_t *));
-static void fr_info_current_to_4_1_24 __P((void *, fr_info_4_1_24_t *));
-static void nat_save_current_to_4_1_3 __P((void *, nat_save_4_1_3_t *));
-static void nat_save_current_to_4_1_14 __P((void *, nat_save_4_1_14_t *));
-static void nat_save_current_to_4_1_16 __P((void *, nat_save_4_1_16_t *));
-static void ipstate_save_current_to_4_1_0 __P((void *, ipstate_save_4_1_0_t *));
-static void ipstate_save_current_to_4_1_16 __P((void *, ipstate_save_4_1_16_t *));
-static void ips_stat_current_to_4_1_0 __P((void *, ips_stat_4_1_0_t *));
-static void ips_stat_current_to_4_1_21 __P((void *, ips_stat_4_1_21_t *));
-static void natstat_current_to_4_1_0 __P((void *, natstat_4_1_0_t *));
-static void natstat_current_to_4_1_16 __P((void *, natstat_4_1_16_t *));
-static void natstat_current_to_4_1_27 __P((void *, natstat_4_1_27_t *));
-static void natstat_current_to_4_1_32 __P((void *, natstat_4_1_32_t *));
-static void nat_current_to_4_1_3 __P((void *, nat_4_1_3_t *));
-static void nat_current_to_4_1_14 __P((void *, nat_4_1_14_t *));
-static void nat_current_to_4_1_25 __P((void *, nat_4_1_25_t *));
-
-static void friostat_4_1_0_to_current __P((friostat_4_1_0_t *, void *));
-static void friostat_4_1_33_to_current __P((friostat_4_1_33_t *, void *));
-static void ipnat_4_1_0_to_current __P((ipnat_4_1_0_t *, void *, int));
-static void ipnat_4_1_14_to_current __P((ipnat_4_1_14_t *, void *, int));
-static void frauth_4_1_11_to_current __P((frauth_4_1_11_t *, void *));
-static void frauth_4_1_23_to_current __P((frauth_4_1_23_t *, void *));
-static void frauth_4_1_24_to_current __P((frauth_4_1_24_t *, void *));
-static void frauth_4_1_29_to_current __P((frauth_4_1_29_t *, void *));
-static void frauth_4_1_32_to_current __P((frauth_4_1_32_t *, void *));
-static void frentry_4_1_0_to_current __P((ipf_main_softc_t *, frentry_4_1_0_t *, void *, int));
-static void frentry_4_1_16_to_current __P((ipf_main_softc_t *, frentry_4_1_16_t *, void *, int));
-static void frentry_4_1_34_to_current __P((ipf_main_softc_t *, frentry_4_1_34_t *, void *, int));
-static void fr_info_4_1_11_to_current __P((fr_info_4_1_11_t *, void *));
-static void fr_info_4_1_23_to_current __P((fr_info_4_1_23_t *, void *));
-static void fr_info_4_1_24_to_current __P((fr_info_4_1_24_t *, void *));
-static void fr_info_4_1_32_to_current __P((fr_info_4_1_32_t *, void *));
-static void nat_save_4_1_3_to_current __P((ipf_main_softc_t *, nat_save_4_1_3_t *, void *));
-static void nat_save_4_1_14_to_current __P((ipf_main_softc_t *, nat_save_4_1_14_t *, void *));
-static void nat_save_4_1_16_to_current __P((ipf_main_softc_t *, nat_save_4_1_16_t *, void *));
+static int ipf_addfrstr(char *, int, char *, int);
+static void ipf_v4iptov5(frip4_t *, fr_ip_t *);
+static void ipf_v5iptov4(fr_ip_t *, frip4_t *);
+static void ipfv4tuctov5(frtuc4_t *, frtuc_t *);
+static void ipfv5tuctov4(frtuc_t *, frtuc4_t *);
+static int ipf_v4fripftov5(fripf4_t *, char *);
+static void ipf_v5fripftov4(fripf_t *, fripf4_t *);
+static int fr_frflags4to5(u_32_t);
+static int fr_frflags5to4(u_32_t);
+
+static void friostat_current_to_4_1_0(void *, friostat_4_1_0_t *, int);
+static void friostat_current_to_4_1_33(void *, friostat_4_1_33_t *, int);
+static void ipstate_current_to_4_1_0(void *, ipstate_4_1_0_t *);
+static void ipstate_current_to_4_1_16(void *, ipstate_4_1_16_t *);
+static void ipnat_current_to_4_1_0(void *, ipnat_4_1_0_t *);
+static void ipnat_current_to_4_1_14(void *, ipnat_4_1_14_t *);
+static void frauth_current_to_4_1_11(void *, frauth_4_1_11_t *);
+static void frauth_current_to_4_1_23(void *, frauth_4_1_23_t *);
+static void frauth_current_to_4_1_24(void *, frauth_4_1_24_t *);
+static void frauth_current_to_4_1_29(void *, frauth_4_1_29_t *);
+static void frentry_current_to_4_1_0(void *, frentry_4_1_0_t *);
+static void frentry_current_to_4_1_16(void *, frentry_4_1_16_t *);
+static void frentry_current_to_4_1_34(void *, frentry_4_1_34_t *);
+static void fr_info_current_to_4_1_11(void *, fr_info_4_1_11_t *);
+static void fr_info_current_to_4_1_23(void *, fr_info_4_1_23_t *);
+static void fr_info_current_to_4_1_24(void *, fr_info_4_1_24_t *);
+static void nat_save_current_to_4_1_3(void *, nat_save_4_1_3_t *);
+static void nat_save_current_to_4_1_14(void *, nat_save_4_1_14_t *);
+static void nat_save_current_to_4_1_16(void *, nat_save_4_1_16_t *);
+static void ipstate_save_current_to_4_1_0(void *, ipstate_save_4_1_0_t *);
+static void ipstate_save_current_to_4_1_16(void *, ipstate_save_4_1_16_t *);
+static void ips_stat_current_to_4_1_0(void *, ips_stat_4_1_0_t *);
+static void ips_stat_current_to_4_1_21(void *, ips_stat_4_1_21_t *);
+static void natstat_current_to_4_1_0(void *, natstat_4_1_0_t *);
+static void natstat_current_to_4_1_16(void *, natstat_4_1_16_t *);
+static void natstat_current_to_4_1_27(void *, natstat_4_1_27_t *);
+static void natstat_current_to_4_1_32(void *, natstat_4_1_32_t *);
+static void nat_current_to_4_1_3(void *, nat_4_1_3_t *);
+static void nat_current_to_4_1_14(void *, nat_4_1_14_t *);
+static void nat_current_to_4_1_25(void *, nat_4_1_25_t *);
+
+static void friostat_4_1_0_to_current(friostat_4_1_0_t *, void *);
+static void friostat_4_1_33_to_current(friostat_4_1_33_t *, void *);
+static void ipnat_4_1_0_to_current(ipnat_4_1_0_t *, void *, int);
+static void ipnat_4_1_14_to_current(ipnat_4_1_14_t *, void *, int);
+static void frauth_4_1_11_to_current(frauth_4_1_11_t *, void *);
+static void frauth_4_1_23_to_current(frauth_4_1_23_t *, void *);
+static void frauth_4_1_24_to_current(frauth_4_1_24_t *, void *);
+static void frauth_4_1_29_to_current(frauth_4_1_29_t *, void *);
+static void frauth_4_1_32_to_current(frauth_4_1_32_t *, void *);
+static void frentry_4_1_0_to_current(ipf_main_softc_t *, frentry_4_1_0_t *, void *, int);
+static void frentry_4_1_16_to_current(ipf_main_softc_t *, frentry_4_1_16_t *, void *, int);
+static void frentry_4_1_34_to_current(ipf_main_softc_t *, frentry_4_1_34_t *, void *, int);
+static void fr_info_4_1_11_to_current(fr_info_4_1_11_t *, void *);
+static void fr_info_4_1_23_to_current(fr_info_4_1_23_t *, void *);
+static void fr_info_4_1_24_to_current(fr_info_4_1_24_t *, void *);
+static void fr_info_4_1_32_to_current(fr_info_4_1_32_t *, void *);
+static void nat_save_4_1_3_to_current(ipf_main_softc_t *, nat_save_4_1_3_t *, void *);
+static void nat_save_4_1_14_to_current(ipf_main_softc_t *, nat_save_4_1_14_t *, void *);
+static void nat_save_4_1_16_to_current(ipf_main_softc_t *, nat_save_4_1_16_t *, void *);
/* ------------------------------------------------------------------------ */
/* In this section is a series of short routines that deal with translating */
diff --git a/contrib/ipfilter/ip_msnrpc_pxy.c b/contrib/ipfilter/ip_msnrpc_pxy.c
index 40bc084cbb5d..9cddd398edde 100644
--- a/contrib/ipfilter/ip_msnrpc_pxy.c
+++ b/contrib/ipfilter/ip_msnrpc_pxy.c
@@ -33,12 +33,12 @@ typedef struct msnrpchdr {
u_char mrh_ans;
} msnrpchdr_t;
-int ippr_msnrpc_init __P((void));
-void ippr_msnrpc_fini __P((void));
-int ippr_msnrpc_new __P((fr_info_t *, ap_session_t *, nat_t *));
-int ippr_msnrpc_out __P((fr_info_t *, ap_session_t *, nat_t *));
-int ippr_msnrpc_in __P((fr_info_t *, ap_session_t *, nat_t *));
-int ippr_msnrpc_check __P((ip_t *, msnrpchdr_t *));
+int ippr_msnrpc_init(void);
+void ippr_msnrpc_fini(void);
+int ippr_msnrpc_new(fr_info_t *, ap_session_t *, nat_t *);
+int ippr_msnrpc_out(fr_info_t *, ap_session_t *, nat_t *);
+int ippr_msnrpc_in(fr_info_t *, ap_session_t *, nat_t *);
+int ippr_msnrpc_check(ip_t *, msnrpchdr_t *);
static frentry_t msnfr;
diff --git a/contrib/ipfilter/ipf.h b/contrib/ipfilter/ipf.h
index 834ba83f51f0..c7f7308a9ba9 100644
--- a/contrib/ipfilter/ipf.h
+++ b/contrib/ipfilter/ipf.h
@@ -175,12 +175,12 @@ typedef struct proxyrule {
#if defined(__NetBSD__) || defined(__FreeBSD_version) || \
SOLARIS
# include <stdarg.h>
-typedef int (* ioctlfunc_t) __P((int, ioctlcmd_t, ...));
+typedef int (* ioctlfunc_t)(int, ioctlcmd_t, ...);
#else
-typedef int (* ioctlfunc_t) __P((dev_t, ioctlcmd_t, void *));
+typedef int (* ioctlfunc_t)(dev_t, ioctlcmd_t, void *);
#endif
-typedef int (* addfunc_t) __P((int, ioctlfunc_t, void *));
-typedef int (* copyfunc_t) __P((void *, void *, size_t));
+typedef int (* addfunc_t)(int, ioctlfunc_t, void *);
+typedef int (* copyfunc_t)(void *, void *, size_t);
extern char thishost[MAXHOSTNAMELEN];
@@ -200,178 +200,178 @@ extern wordtab_t natfields[];
extern wordtab_t poolfields[];
-extern int addicmp __P((char ***, struct frentry *, int));
-extern int addipopt __P((char *, struct ipopt_names *, int, char *));
-extern int addkeep __P((char ***, struct frentry *, int));
-extern alist_t *alist_new __P((int, char *));
-extern void alist_free __P((alist_t *));
-extern void assigndefined __P((char *));
-extern void binprint __P((void *, size_t));
-extern u_32_t buildopts __P((char *, char *, int));
-extern int checkrev __P((char *));
-extern int connecttcp __P((char *, int));
-extern int count6bits __P((u_32_t *));
-extern int count4bits __P((u_32_t));
-extern char *fac_toname __P((int));
-extern int fac_findname __P((char *));
-extern const char *familyname __P((const int));
-extern void fill6bits __P((int, u_int *));
-extern wordtab_t *findword __P((wordtab_t *, char *));
-extern int ftov __P((int));
-extern char *ipf_geterror __P((int, ioctlfunc_t *));
-extern int genmask __P((int, char *, i6addr_t *));
-extern int gethost __P((int, char *, i6addr_t *));
-extern int geticmptype __P((int, char *));
-extern int getport __P((struct frentry *, char *, u_short *, char *));
-extern int getportproto __P((char *, int));
-extern int getproto __P((char *));
-extern char *getnattype __P((struct nat *));
-extern char *getsumd __P((u_32_t));
-extern u_32_t getoptbyname __P((char *));
-extern u_32_t getoptbyvalue __P((int));
-extern u_32_t getv6optbyname __P((char *));
-extern u_32_t getv6optbyvalue __P((int));
-extern char *icmptypename __P((int, int));
-extern void initparse __P((void));
-extern void ipf_dotuning __P((int, char *, ioctlfunc_t));
-extern int ipf_addrule __P((int, ioctlfunc_t, void *));
-extern void ipf_mutex_clean __P((void));
-extern int ipf_parsefile __P((int, addfunc_t, ioctlfunc_t *, char *));
-extern int ipf_parsesome __P((int, addfunc_t, ioctlfunc_t *, FILE *));
-extern void ipf_perror __P((int, char *));
-extern int ipf_perror_fd __P(( int, ioctlfunc_t, char *));
-extern void ipf_rwlock_clean __P((void));
-extern char *ipf_strerror __P((int));
-extern void ipferror __P((int, char *));
-extern int ipmon_parsefile __P((char *));
-extern int ipmon_parsesome __P((FILE *));
-extern int ipnat_addrule __P((int, ioctlfunc_t, void *));
-extern int ipnat_parsefile __P((int, addfunc_t, ioctlfunc_t, char *));
-extern int ipnat_parsesome __P((int, addfunc_t, ioctlfunc_t, FILE *));
-extern int ippool_parsefile __P((int, char *, ioctlfunc_t));
-extern int ippool_parsesome __P((int, FILE *, ioctlfunc_t));
-extern int kmemcpywrap __P((void *, void *, size_t));
-extern char *kvatoname __P((ipfunc_t, ioctlfunc_t));
-extern int load_dstlist __P((struct ippool_dst *, ioctlfunc_t,
- ipf_dstnode_t *));
-extern int load_dstlistnode __P((int, char *, struct ipf_dstnode *,
- ioctlfunc_t));
-extern alist_t *load_file __P((char *));
-extern int load_hash __P((struct iphtable_s *, struct iphtent_s *,
- ioctlfunc_t));
-extern int load_hashnode __P((int, char *, struct iphtent_s *, int,
- ioctlfunc_t));
-extern alist_t *load_http __P((char *));
-extern int load_pool __P((struct ip_pool_s *list, ioctlfunc_t));
-extern int load_poolnode __P((int, char *, ip_pool_node_t *, int, ioctlfunc_t));
-extern alist_t *load_url __P((char *));
-extern alist_t *make_range __P((int, struct in_addr, struct in_addr));
-extern void mb_hexdump __P((mb_t *, FILE *));
-extern ipfunc_t nametokva __P((char *, ioctlfunc_t));
-extern void nat_setgroupmap __P((struct ipnat *));
-extern int ntomask __P((int, int, u_32_t *));
-extern u_32_t optname __P((char ***, u_short *, int));
-extern wordtab_t *parsefields __P((wordtab_t *, char *));
-extern int *parseipfexpr __P((char *, char **));
-extern int parsewhoisline __P((char *, addrfamily_t *, addrfamily_t *));
-extern void pool_close __P((void));
-extern int pool_fd __P((void));
-extern int pool_ioctl __P((ioctlfunc_t, ioctlcmd_t, void *));
-extern int pool_open __P((void));
-extern char *portname __P((int, int));
-extern int pri_findname __P((char *));
-extern char *pri_toname __P((int));
-extern void print_toif __P((int, char *, char *, struct frdest *));
-extern void printaps __P((ap_session_t *, int, int));
-extern void printaddr __P((int, int, char *, int, u_32_t *, u_32_t *));
-extern void printbuf __P((char *, int, int));
-extern void printfieldhdr __P((wordtab_t *, wordtab_t *));
-extern void printfr __P((struct frentry *, ioctlfunc_t));
-extern struct iphtable_s *printhash __P((struct iphtable_s *, copyfunc_t,
- char *, int, wordtab_t *));
-extern struct iphtable_s *printhash_live __P((iphtable_t *, int, char *,
- int, wordtab_t *));
-extern ippool_dst_t *printdstl_live __P((ippool_dst_t *, int, char *,
- int, wordtab_t *));
-extern void printhashdata __P((iphtable_t *, int));
-extern struct iphtent_s *printhashnode __P((struct iphtable_s *,
+extern int addicmp(char ***, struct frentry *, int);
+extern int addipopt(char *, struct ipopt_names *, int, char *);
+extern int addkeep(char ***, struct frentry *, int);
+extern alist_t *alist_new(int, char *);
+extern void alist_free(alist_t *);
+extern void assigndefined(char *);
+extern void binprint(void *, size_t);
+extern u_32_t buildopts(char *, char *, int);
+extern int checkrev(char *);
+extern int connecttcp(char *, int);
+extern int count6bits(u_32_t *);
+extern int count4bits(u_32_t);
+extern char *fac_toname(int);
+extern int fac_findname(char *);
+extern const char *familyname(const int);
+extern void fill6bits(int, u_int *);
+extern wordtab_t *findword(wordtab_t *, char *);
+extern int ftov(int);
+extern char *ipf_geterror(int, ioctlfunc_t *);
+extern int genmask(int, char *, i6addr_t *);
+extern int gethost(int, char *, i6addr_t *);
+extern int geticmptype(int, char *);
+extern int getport(struct frentry *, char *, u_short *, char *);
+extern int getportproto(char *, int);
+extern int getproto(char *);
+extern char *getnattype(struct nat *);
+extern char *getsumd(u_32_t);
+extern u_32_t getoptbyname(char *);
+extern u_32_t getoptbyvalue(int);
+extern u_32_t getv6optbyname(char *);
+extern u_32_t getv6optbyvalue(int);
+extern char *icmptypename(int, int);
+extern void initparse(void);
+extern void ipf_dotuning(int, char *, ioctlfunc_t);
+extern int ipf_addrule(int, ioctlfunc_t, void *);
+extern void ipf_mutex_clean(void);
+extern int ipf_parsefile(int, addfunc_t, ioctlfunc_t *, char *);
+extern int ipf_parsesome(int, addfunc_t, ioctlfunc_t *, FILE *);
+extern void ipf_perror(int, char *);
+extern int ipf_perror_fd( int, ioctlfunc_t, char *);
+extern void ipf_rwlock_clean(void);
+extern char *ipf_strerror(int);
+extern void ipferror(int, char *);
+extern int ipmon_parsefile(char *);
+extern int ipmon_parsesome(FILE *);
+extern int ipnat_addrule(int, ioctlfunc_t, void *);
+extern int ipnat_parsefile(int, addfunc_t, ioctlfunc_t, char *);
+extern int ipnat_parsesome(int, addfunc_t, ioctlfunc_t, FILE *);
+extern int ippool_parsefile(int, char *, ioctlfunc_t);
+extern int ippool_parsesome(int, FILE *, ioctlfunc_t);
+extern int kmemcpywrap(void *, void *, size_t);
+extern char *kvatoname(ipfunc_t, ioctlfunc_t);
+extern int load_dstlist(struct ippool_dst *, ioctlfunc_t,
+ ipf_dstnode_t *);
+extern int load_dstlistnode(int, char *, struct ipf_dstnode *,
+ ioctlfunc_t);
+extern alist_t *load_file(char *);
+extern int load_hash(struct iphtable_s *, struct iphtent_s *,
+ ioctlfunc_t);
+extern int load_hashnode(int, char *, struct iphtent_s *, int,
+ ioctlfunc_t);
+extern alist_t *load_http(char *);
+extern int load_pool(struct ip_pool_s *list, ioctlfunc_t);
+extern int load_poolnode(int, char *, ip_pool_node_t *, int, ioctlfunc_t);
+extern alist_t *load_url(char *);
+extern alist_t *make_range(int, struct in_addr, struct in_addr);
+extern void mb_hexdump(mb_t *, FILE *);
+extern ipfunc_t nametokva(char *, ioctlfunc_t);
+extern void nat_setgroupmap(struct ipnat *);
+extern int ntomask(int, int, u_32_t *);
+extern u_32_t optname(char ***, u_short *, int);
+extern wordtab_t *parsefields(wordtab_t *, char *);
+extern int *parseipfexpr(char *, char **);
+extern int parsewhoisline(char *, addrfamily_t *, addrfamily_t *);
+extern void pool_close(void);
+extern int pool_fd(void);
+extern int pool_ioctl(ioctlfunc_t, ioctlcmd_t, void *);
+extern int pool_open(void);
+extern char *portname(int, int);
+extern int pri_findname(char *);
+extern char *pri_toname(int);
+extern void print_toif(int, char *, char *, struct frdest *);
+extern void printaps(ap_session_t *, int, int);
+extern void printaddr(int, int, char *, int, u_32_t *, u_32_t *);
+extern void printbuf(char *, int, int);
+extern void printfieldhdr(wordtab_t *, wordtab_t *);
+extern void printfr(struct frentry *, ioctlfunc_t);
+extern struct iphtable_s *printhash(struct iphtable_s *, copyfunc_t,
+ char *, int, wordtab_t *);
+extern struct iphtable_s *printhash_live(iphtable_t *, int, char *,
+ int, wordtab_t *);
+extern ippool_dst_t *printdstl_live(ippool_dst_t *, int, char *,
+ int, wordtab_t *);
+extern void printhashdata(iphtable_t *, int);
+extern struct iphtent_s *printhashnode(struct iphtable_s *,
struct iphtent_s *,
- copyfunc_t, int, wordtab_t *));
-extern void printhost __P((int, u_32_t *));
-extern void printhostmask __P((int, u_32_t *, u_32_t *));
-extern void printip __P((int, u_32_t *));
-extern void printlog __P((struct frentry *));
-extern void printlookup __P((char *, i6addr_t *addr, i6addr_t *mask));
-extern void printmask __P((int, u_32_t *));
-extern void printnataddr __P((int, char *, nat_addr_t *, int));
-extern void printnatfield __P((nat_t *, int));
-extern void printnatside __P((char *, nat_stat_side_t *));
-extern void printpacket __P((int, mb_t *));
-extern void printpacket6 __P((int, mb_t *));
-extern struct ippool_dst *printdstlist __P((struct ippool_dst *, copyfunc_t,
+ copyfunc_t, int, wordtab_t *);
+extern void printhost(int, u_32_t *);
+extern void printhostmask(int, u_32_t *, u_32_t *);
+extern void printip(int, u_32_t *);
+extern void printlog(struct frentry *);
+extern void printlookup(char *, i6addr_t *addr, i6addr_t *mask);
+extern void printmask(int, u_32_t *);
+extern void printnataddr(int, char *, nat_addr_t *, int);
+extern void printnatfield(nat_t *, int);
+extern void printnatside(char *, nat_stat_side_t *);
+extern void printpacket(int, mb_t *);
+extern void printpacket6(int, mb_t *);
+extern struct ippool_dst *printdstlist(struct ippool_dst *, copyfunc_t,
char *, int, ipf_dstnode_t *,
- wordtab_t *));
-extern void printdstlistdata __P((ippool_dst_t *, int));
-extern ipf_dstnode_t *printdstlistnode __P((ipf_dstnode_t *, copyfunc_t,
- int, wordtab_t *));
-extern void printdstlistpolicy __P((ippool_policy_t));
-extern struct ip_pool_s *printpool __P((struct ip_pool_s *, copyfunc_t,
- char *, int, wordtab_t *));
-extern struct ip_pool_s *printpool_live __P((struct ip_pool_s *, int,
- char *, int, wordtab_t *));
-extern void printpooldata __P((ip_pool_t *, int));
-extern void printpoolfield __P((void *, int, int));
-extern struct ip_pool_node *printpoolnode __P((struct ip_pool_node *,
- int, wordtab_t *));
-extern void printproto __P((struct protoent *, int, struct ipnat *));
-extern void printportcmp __P((int, struct frpcmp *));
-extern void printstatefield __P((ipstate_t *, int));
-extern void printtqtable __P((ipftq_t *));
-extern void printtunable __P((ipftune_t *));
-extern void printunit __P((int));
-extern void optprint __P((u_short *, u_long, u_long));
+ wordtab_t *);
+extern void printdstlistdata(ippool_dst_t *, int);
+extern ipf_dstnode_t *printdstlistnode(ipf_dstnode_t *, copyfunc_t,
+ int, wordtab_t *);
+extern void printdstlistpolicy(ippool_policy_t);
+extern struct ip_pool_s *printpool(struct ip_pool_s *, copyfunc_t,
+ char *, int, wordtab_t *);
+extern struct ip_pool_s *printpool_live(struct ip_pool_s *, int,
+ char *, int, wordtab_t *);
+extern void printpooldata(ip_pool_t *, int);
+extern void printpoolfield(void *, int, int);
+extern struct ip_pool_node *printpoolnode(struct ip_pool_node *,
+ int, wordtab_t *);
+extern void printproto(struct protoent *, int, struct ipnat *);
+extern void printportcmp(int, struct frpcmp *);
+extern void printstatefield(ipstate_t *, int);
+extern void printtqtable(ipftq_t *);
+extern void printtunable(ipftune_t *);
+extern void printunit(int);
+extern void optprint(u_short *, u_long, u_long);
#ifdef USE_INET6
-extern void optprintv6 __P((u_short *, u_long, u_long));
+extern void optprintv6(u_short *, u_long, u_long);
#endif
-extern int remove_hash __P((struct iphtable_s *, ioctlfunc_t));
-extern int remove_hashnode __P((int, char *, struct iphtent_s *, ioctlfunc_t));
-extern int remove_pool __P((ip_pool_t *, ioctlfunc_t));
-extern int remove_poolnode __P((int, char *, ip_pool_node_t *, ioctlfunc_t));
-extern u_char tcpflags __P((char *));
-extern void printc __P((struct frentry *));
-extern void printC __P((int));
-extern void emit __P((int, int, void *, struct frentry *));
-extern u_char secbit __P((int));
-extern u_char seclevel __P((char *));
-extern void printfraginfo __P((char *, struct ipfr *));
-extern void printifname __P((char *, char *, void *));
-extern char *hostname __P((int, void *));
-extern struct ipstate *printstate __P((struct ipstate *, int, u_long));
-extern void printsbuf __P((char *));
-extern void printnat __P((struct ipnat *, int));
-extern void printactiveaddress __P((int, char *, i6addr_t *, char *));
-extern void printactivenat __P((struct nat *, int, u_long));
-extern void printhostmap __P((struct hostmap *, u_int));
-extern void printtcpflags __P((u_32_t, u_32_t));
-extern void printipfexpr __P((int *));
-extern void printstatefield __P((ipstate_t *, int));
-extern void printstatefieldhdr __P((int));
-extern int sendtrap_v1_0 __P((int, char *, char *, int, time_t));
-extern int sendtrap_v2_0 __P((int, char *, char *, int));
-extern int vtof __P((int));
-
-extern void set_variable __P((char *, char *));
-extern char *get_variable __P((char *, char **, int));
-extern void resetlexer __P((void));
-
-extern void debug __P((int, char *, ...));
-extern void verbose __P((int, char *, ...));
-extern void ipfkdebug __P((char *, ...));
-extern void ipfkverbose __P((char *, ...));
+extern int remove_hash(struct iphtable_s *, ioctlfunc_t);
+extern int remove_hashnode(int, char *, struct iphtent_s *, ioctlfunc_t);
+extern int remove_pool(ip_pool_t *, ioctlfunc_t);
+extern int remove_poolnode(int, char *, ip_pool_node_t *, ioctlfunc_t);
+extern u_char tcpflags(char *);
+extern void printc(struct frentry *);
+extern void printC(int);
+extern void emit(int, int, void *, struct frentry *);
+extern u_char secbit(int);
+extern u_char seclevel(char *);
+extern void printfraginfo(char *, struct ipfr *);
+extern void printifname(char *, char *, void *);
+extern char *hostname(int, void *);
+extern struct ipstate *printstate(struct ipstate *, int, u_long);
+extern void printsbuf(char *);
+extern void printnat(struct ipnat *, int);
+extern void printactiveaddress(int, char *, i6addr_t *, char *);
+extern void printactivenat(struct nat *, int, u_long);
+extern void printhostmap(struct hostmap *, u_int);
+extern void printtcpflags(u_32_t, u_32_t);
+extern void printipfexpr(int *);
+extern void printstatefield(ipstate_t *, int);
+extern void printstatefieldhdr(int);
+extern int sendtrap_v1_0(int, char *, char *, int, time_t);
+extern int sendtrap_v2_0(int, char *, char *, int);
+extern int vtof(int);
+
+extern void set_variable(char *, char *);
+extern char *get_variable(char *, char **, int);
+extern void resetlexer(void);
+
+extern void debug(int, char *, ...);
+extern void verbose(int, char *, ...);
+extern void ipfkdebug(char *, ...);
+extern void ipfkverbose(char *, ...);
#if SOLARIS
-extern int gethostname __P((char *, int ));
-extern void sync __P((void));
+extern int gethostname(char *, int );
+extern void sync(void);
#endif
#endif /* __IPF_H__ */
diff --git a/contrib/ipfilter/iplang/iplang.h b/contrib/ipfilter/iplang/iplang.h
index 63cc078322a3..f38ef9671701 100644
--- a/contrib/ipfilter/iplang/iplang.h
+++ b/contrib/ipfilter/iplang/iplang.h
@@ -50,5 +50,5 @@ typedef struct aniphdr {
#define ah_udp ah_un.ahu_udp
#define ah_icmp ah_un.ahu_icmp
-extern int get_arpipv4 __P((char *, char *));
+extern int get_arpipv4(char *, char *);
diff --git a/contrib/ipfilter/iplang/iplang_l.l b/contrib/ipfilter/iplang/iplang_l.l
index e66867e2a455..f8b1b82d4707 100644
--- a/contrib/ipfilter/iplang/iplang_l.l
+++ b/contrib/ipfilter/iplang/iplang_l.l
@@ -29,14 +29,14 @@ extern int opts;
int lineNum = 0, ipproto = 0, oldipproto = 0, next = -1, laststate = 0;
int *prstack = NULL, numpr = 0, state = 0, token = 0;
-void yyerror __P((char *));
-void push_proto __P((void));
-void pop_proto __P((void));
-int next_state __P((int, int));
-int next_item __P((int));
-int save_token __P((void));
-void swallow __P((void));
-int yylex __P((void));
+void yyerror(char *);
+void push_proto(void);
+void pop_proto(void);
+int next_state(int, int);
+int next_item(int);
+int save_token(void);
+void swallow(void);
+int yylex(void);
struct lwordtab {
char *word;
diff --git a/contrib/ipfilter/iplang/iplang_y.y b/contrib/ipfilter/iplang/iplang_y.y
index b4570d390530..f3335636cee1 100644
--- a/contrib/ipfilter/iplang/iplang_y.y
+++ b/contrib/ipfilter/iplang/iplang_y.y
@@ -59,8 +59,8 @@ arp_t *arplist = NULL, **arptail = &arplist, *carp = NULL;
struct in_addr defrouter;
send_t sending;
char *sclass = NULL;
-u_short c_chksum __P((u_short *, u_int, u_long));
-u_long p_chksum __P((u_short *, u_int));
+u_short c_chksum(u_short *, u_int, u_long);
+u_long p_chksum(u_short *, u_int);
u_long ipbuffer[67584/sizeof(u_long)]; /* 66K */
aniphdr_t *aniphead = NULL, *canip = NULL, **aniptail = &aniphead;
@@ -74,85 +74,85 @@ struct statetoopt {
int sto_op;
};
-struct in_addr getipv4addr __P((char *arg));
-u_short getportnum __P((char *, char *));
-struct ether_addr *geteaddr __P((char *, struct ether_addr *));
-void *new_header __P((int));
-void free_aniplist __P((void));
-void inc_anipheaders __P((int));
-void new_data __P((void));
-void set_datalen __P((char **));
-void set_datafile __P((char **));
-void set_data __P((char **));
-void new_packet __P((void));
-void set_ipv4proto __P((char **));
-void set_ipv4src __P((char **));
-void set_ipv4dst __P((char **));
-void set_ipv4off __P((char **));
-void set_ipv4v __P((char **));
-void set_ipv4hl __P((char **));
-void set_ipv4ttl __P((char **));
-void set_ipv4tos __P((char **));
-void set_ipv4id __P((char **));
-void set_ipv4sum __P((char **));
-void set_ipv4len __P((char **));
-void new_tcpheader __P((void));
-void set_tcpsport __P((char **));
-void set_tcpdport __P((char **));
-void set_tcpseq __P((char **));
-void set_tcpack __P((char **));
-void set_tcpoff __P((char **));
-void set_tcpurp __P((char **));
-void set_tcpwin __P((char **));
-void set_tcpsum __P((char **));
-void set_tcpflags __P((char **));
-void set_tcpopt __P((int, char **));
-void end_tcpopt __P((void));
-void new_udpheader __P((void));
-void set_udplen __P((char **));
-void set_udpsum __P((char **));
-void prep_packet __P((void));
-void packet_done __P((void));
-void new_interface __P((void));
-void check_interface __P((void));
-void set_ifname __P((char **));
-void set_ifmtu __P((int));
-void set_ifv4addr __P((char **));
-void set_ifeaddr __P((char **));
-void new_arp __P((void));
-void set_arpeaddr __P((char **));
-void set_arpv4addr __P((char **));
-void reset_send __P((void));
-void set_sendif __P((char **));
-void set_sendvia __P((char **));
-void set_defaultrouter __P((char **));
-void new_icmpheader __P((void));
-void set_icmpcode __P((int));
-void set_icmptype __P((int));
-void set_icmpcodetok __P((char **));
-void set_icmptypetok __P((char **));
-void set_icmpid __P((int));
-void set_icmpseq __P((int));
-void set_icmpotime __P((int));
-void set_icmprtime __P((int));
-void set_icmpttime __P((int));
-void set_icmpmtu __P((int));
-void set_redir __P((int, char **));
-void new_ipv4opt __P((void));
-void set_icmppprob __P((int));
-void add_ipopt __P((int, void *));
-void end_ipopt __P((void));
-void set_secclass __P((char **));
-void free_anipheader __P((void));
-void end_ipv4 __P((void));
-void end_icmp __P((void));
-void end_udp __P((void));
-void end_tcp __P((void));
-void end_data __P((void));
-void yyerror __P((char *));
-void iplang __P((FILE *));
-int arp_getipv4 __P((char *, char *));
-int yyparse __P((void));
+struct in_addr getipv4addr(char *arg);
+u_short getportnum(char *, char *);
+struct ether_addr *geteaddr(char *, struct ether_addr *);
+void *new_header(int);
+void free_aniplist(void);
+void inc_anipheaders(int);
+void new_data(void);
+void set_datalen(char **);
+void set_datafile(char **);
+void set_data(char **);
+void new_packet(void);
+void set_ipv4proto(char **);
+void set_ipv4src(char **);
+void set_ipv4dst(char **);
+void set_ipv4off(char **);
+void set_ipv4v(char **);
+void set_ipv4hl(char **);
+void set_ipv4ttl(char **);
+void set_ipv4tos(char **);
+void set_ipv4id(char **);
+void set_ipv4sum(char **);
+void set_ipv4len(char **);
+void new_tcpheader(void);
+void set_tcpsport(char **);
+void set_tcpdport(char **);
+void set_tcpseq(char **);
+void set_tcpack(char **);
+void set_tcpoff(char **);
+void set_tcpurp(char **);
+void set_tcpwin(char **);
+void set_tcpsum(char **);
+void set_tcpflags(char **);
+void set_tcpopt(int, char **);
+void end_tcpopt(void);
+void new_udpheader(void);
+void set_udplen(char **);
+void set_udpsum(char **);
+void prep_packet(void);
+void packet_done(void);
+void new_interface(void);
+void check_interface(void);
+void set_ifname(char **);
+void set_ifmtu(int);
+void set_ifv4addr(char **);
+void set_ifeaddr(char **);
+void new_arp(void);
+void set_arpeaddr(char **);
+void set_arpv4addr(char **);
+void reset_send(void);
+void set_sendif(char **);
+void set_sendvia(char **);
+void set_defaultrouter(char **);
+void new_icmpheader(void);
+void set_icmpcode(int);
+void set_icmptype(int);
+void set_icmpcodetok(char **);
+void set_icmptypetok(char **);
+void set_icmpid(int);
+void set_icmpseq(int);
+void set_icmpotime(int);
+void set_icmprtime(int);
+void set_icmpttime(int);
+void set_icmpmtu(int);
+void set_redir(int, char **);
+void new_ipv4opt(void);
+void set_icmppprob(int);
+void add_ipopt(int, void *);
+void end_ipopt(void);
+void set_secclass(char **);
*** 4114 LINES SKIPPED ***
More information about the dev-commits-src-all
mailing list