aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/ipfilter/netinet
diff options
context:
space:
mode:
Diffstat (limited to 'sys/contrib/ipfilter/netinet')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_compat.h12
-rw-r--r--sys/contrib/ipfilter/netinet/ip_fil.h46
-rw-r--r--sys/contrib/ipfilter/netinet/ip_lookup.h12
-rw-r--r--sys/contrib/ipfilter/netinet/ip_nat.h8
-rw-r--r--sys/contrib/ipfilter/netinet/ip_proxy.h4
-rw-r--r--sys/contrib/ipfilter/netinet/ip_scan.h6
-rw-r--r--sys/contrib/ipfilter/netinet/ip_state.h4
7 files changed, 0 insertions, 92 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h
index 29590298d79f..ac20b527ab34 100644
--- a/sys/contrib/ipfilter/netinet/ip_compat.h
+++ b/sys/contrib/ipfilter/netinet/ip_compat.h
@@ -12,15 +12,7 @@
#define __IP_COMPAT_H__
#ifndef __P
-# ifdef __STDC__
# define __P(x) x
-# else
-# define __P(x) ()
-# endif
-#endif
-#ifndef __STDC__
-# undef const
-# define const
#endif
#if defined(_KERNEL) || defined(KERNEL) || defined(__KERNEL__)
@@ -63,11 +55,7 @@
#endif
-# ifdef __STDC__
# define IPL_EXTERN(ep) ipl##ep
-# else
-# define IPL_EXTERN(ep) ipl/**/ep
-# endif
/*
* This is a workaround for <sys/uio.h> troubles on FreeBSD and OpenBSD.
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/contrib/ipfilter/netinet/ip_fil.h
index 7d70f5135da8..0c7448492464 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.h
+++ b/sys/contrib/ipfilter/netinet/ip_fil.h
@@ -31,14 +31,9 @@
#endif
#ifndef __P
-# ifdef __STDC__
# define __P(x) x
-# else
-# define __P(x) ()
-# endif
#endif
-#if defined(__STDC__) || defined(__GNUC__)
# define SIOCADAFR _IOW('r', 60, struct ipfobj)
# define SIOCRMAFR _IOW('r', 61, struct ipfobj)
# define SIOCSETFF _IOW('r', 62, u_int)
@@ -78,47 +73,6 @@
# define SIOCGTQTAB _IOWR('r', 96, struct ipfobj)
# define SIOCMATCHFLUSH _IOWR('r', 97, struct ipfobj)
# define SIOCIPFINTERROR _IOR('r', 98, int)
-#else
-# define SIOCADAFR _IOW(r, 60, struct ipfobj)
-# define SIOCRMAFR _IOW(r, 61, struct ipfobj)
-# define SIOCSETFF _IOW(r, 62, u_int)
-# define SIOCGETFF _IOR(r, 63, u_int)
-# define SIOCGETFS _IOWR(r, 64, struct ipfobj)
-# define SIOCIPFFL _IOWR(r, 65, int)
-# define SIOCIPFFB _IOR(r, 66, int)
-# define SIOCADIFR _IOW(r, 67, struct ipfobj)
-# define SIOCRMIFR _IOW(r, 68, struct ipfobj)
-# define SIOCSWAPA _IOR(r, 69, u_int)
-# define SIOCINAFR _IOW(r, 70, struct ipfobj)
-# define SIOCINIFR _IOW(r, 71, struct ipfobj)
-# define SIOCFRENB _IOW(r, 72, u_int)
-# define SIOCFRSYN _IOW(r, 73, u_int)
-# define SIOCFRZST _IOWR(r, 74, struct ipfobj)
-# define SIOCZRLST _IOWR(r, 75, struct ipfobj)
-# define SIOCAUTHW _IOWR(r, 76, struct ipfobj)
-# define SIOCAUTHR _IOWR(r, 77, struct ipfobj)
-# define SIOCSTAT1 _IOWR(r, 78, struct ipfobj)
-# define SIOCSTLCK _IOWR(r, 79, u_int)
-# define SIOCSTPUT _IOWR(r, 80, struct ipfobj)
-# define SIOCSTGET _IOWR(r, 81, struct ipfobj)
-# define SIOCSTGSZ _IOWR(r, 82, struct ipfobj)
-# define SIOCSTAT2 _IOWR(r, 83, struct ipfobj)
-# define SIOCSETLG _IOWR(r, 84, int)
-# define SIOCGETLG _IOWR(r, 85, int)
-# define SIOCFUNCL _IOWR(r, 86, struct ipfunc_resolve)
-# define SIOCIPFGETNEXT _IOWR(r, 87, struct ipfobj)
-# define SIOCIPFGET _IOWR(r, 88, struct ipfobj)
-# define SIOCIPFSET _IOWR(r, 89, struct ipfobj)
-# define SIOCIPFL6 _IOWR(r, 90, int)
-# define SIOCIPFITER _IOWR(r, 91, struct ipfobj)
-# define SIOCGENITER _IOWR(r, 92, struct ipfobj)
-# define SIOCGTABL _IOWR(r, 93, struct ipfobj)
-# define SIOCIPFDELTOK _IOWR(r, 94, int)
-# define SIOCLOOKUPITER _IOWR(r, 95, struct ipfobj)
-# define SIOCGTQTAB _IOWR(r, 96, struct ipfobj)
-# define SIOCMATCHFLUSH _IOWR(r, 97, struct ipfobj)
-# define SIOCIPFINTERROR _IOR(r, 98, int)
-#endif
#define SIOCADDFR SIOCADAFR
#define SIOCDELFR SIOCRMAFR
#define SIOCINSFR SIOCINAFR
diff --git a/sys/contrib/ipfilter/netinet/ip_lookup.h b/sys/contrib/ipfilter/netinet/ip_lookup.h
index 181e1bc5d176..6b1642a91ec0 100644
--- a/sys/contrib/ipfilter/netinet/ip_lookup.h
+++ b/sys/contrib/ipfilter/netinet/ip_lookup.h
@@ -8,7 +8,6 @@
#ifndef __IP_LOOKUP_H__
#define __IP_LOOKUP_H__
-#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
# define SIOCLOOKUPADDTABLE _IOWR('r', 60, struct iplookupop)
# define SIOCLOOKUPDELTABLE _IOWR('r', 61, struct iplookupop)
# define SIOCLOOKUPSTAT _IOWR('r', 64, struct iplookupop)
@@ -18,17 +17,6 @@
# define SIOCLOOKUPADDNODEW _IOW('r', 67, struct iplookupop)
# define SIOCLOOKUPDELNODE _IOWR('r', 68, struct iplookupop)
# define SIOCLOOKUPDELNODEW _IOW('r', 68, struct iplookupop)
-#else
-# define SIOCLOOKUPADDTABLE _IOWR(r, 60, struct iplookupop)
-# define SIOCLOOKUPDELTABLE _IOWR(r, 61, struct iplookupop)
-# define SIOCLOOKUPSTAT _IOWR(r, 64, struct iplookupop)
-# define SIOCLOOKUPSTATW _IOW(r, 64, struct iplookupop)
-# define SIOCLOOKUPFLUSH _IOWR(r, 65, struct iplookupflush)
-# define SIOCLOOKUPADDNODE _IOWR(r, 67, struct iplookupop)
-# define SIOCLOOKUPADDNODEW _IOW(r, 67, struct iplookupop)
-# define SIOCLOOKUPDELNODE _IOWR(r, 68, struct iplookupop)
-# define SIOCLOOKUPDELNODEW _IOW(r, 68, struct iplookupop)
-#endif
#define LOOKUP_POOL_MAX (IPL_LOGSIZE)
#define LOOKUP_POOL_SZ (IPL_LOGSIZE + 1)
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.h b/sys/contrib/ipfilter/netinet/ip_nat.h
index e65b1681a5f5..e726bc926937 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat.h
+++ b/sys/contrib/ipfilter/netinet/ip_nat.h
@@ -21,19 +21,11 @@
# endif
#endif
-#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
#define SIOCADNAT _IOW('r', 60, struct ipfobj)
#define SIOCRMNAT _IOW('r', 61, struct ipfobj)
#define SIOCGNATS _IOWR('r', 62, struct ipfobj)
#define SIOCGNATL _IOWR('r', 63, struct ipfobj)
#define SIOCPURGENAT _IOWR('r', 100, struct ipfobj)
-#else
-#define SIOCADNAT _IOW(r, 60, struct ipfobj)
-#define SIOCRMNAT _IOW(r, 61, struct ipfobj)
-#define SIOCGNATS _IOWR(r, 62, struct ipfobj)
-#define SIOCGNATL _IOWR(r, 63, struct ipfobj)
-#define SIOCPURGENAT _IOWR(r, 100, struct ipfobj)
-#endif
#undef LARGE_NAT /* define this if you're setting up a system to NAT
* LARGE numbers of networks/hosts - i.e. in the
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.h b/sys/contrib/ipfilter/netinet/ip_proxy.h
index c6a77ba4ebee..3f4fc2a8af6f 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.h
+++ b/sys/contrib/ipfilter/netinet/ip_proxy.h
@@ -20,11 +20,7 @@
# endif
#endif
-#if defined(__STDC__) || defined(__GNUC__)
#define SIOCPROXY _IOWR('r', 64, struct ap_control)
-#else
-#define SIOCPROXY _IOWR(r, 64, struct ap_control)
-#endif
#ifndef APR_LABELLEN
#define APR_LABELLEN 16
diff --git a/sys/contrib/ipfilter/netinet/ip_scan.h b/sys/contrib/ipfilter/netinet/ip_scan.h
index 99032095ba05..f15aeb844ac2 100644
--- a/sys/contrib/ipfilter/netinet/ip_scan.h
+++ b/sys/contrib/ipfilter/netinet/ip_scan.h
@@ -25,15 +25,9 @@ struct ip;
struct ipstate;
-#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
# define SIOCADSCA _IOWR('r', 60, struct ipscan *)
# define SIOCRMSCA _IOWR('r', 61, struct ipscan *)
# define SIOCGSCST _IOWR('r', 62, struct ipscan *)
-#else
-# define SIOCADSCA _IOWR(r, 60, struct ipscan *)
-# define SIOCRMSCA _IOWR(r, 61, struct ipscan *)
-# define SIOCGSCST _IOWR(r, 62, struct ipscan *)
-#endif
struct action {
int act_val; /* what to do */
diff --git a/sys/contrib/ipfilter/netinet/ip_state.h b/sys/contrib/ipfilter/netinet/ip_state.h
index e765ac771538..e541cff52183 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.h
+++ b/sys/contrib/ipfilter/netinet/ip_state.h
@@ -12,11 +12,7 @@
#ifndef __IP_STATE_H__
#define __IP_STATE_H__
-#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
# define SIOCDELST _IOW('r', 61, struct ipfobj)
-#else
-# define SIOCDELST _IOW(r, 61, struct ipfobj)
-#endif
struct ipscan;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 02:09:45 +0000