Use ANSI C function definitions.

1 files changed, 62 insertions, 115 deletions

diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index cb1d410..761deeb 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -290,9 +290,7 @@ void setindex2ifc(int, struct ifc *);
 #define IFIL_TYPE_L	'L'
 
 int
-main(argc, argv)
-	int	argc;
-	char	**argv;
+main(int argc, char *argv[])
 {
 	int	ch;
 	int	error = 0;
@@ -545,8 +543,7 @@ main(argc, argv)
 }
 
 void
-sighandler(signo)
-	int signo;
+sighandler(int signo)
 {
 
 	switch (signo) {
@@ -570,7 +567,7 @@ sighandler(signo)
  */
 /* ARGSUSED */
 void
-rtdexit()
+rtdexit(void)
 {
 	struct	riprt *rrt;
 
@@ -597,7 +594,7 @@ rtdexit()
  */
 /* ARGSUSED */
 void
-ripalarm()
+ripalarm(void)
 {
 	struct	ifc *ifcp;
 	struct	riprt *rrt, *rrt_prev, *rrt_next;
@@ -637,7 +634,7 @@ ripalarm()
 }
 
 void
-init()
+init(void)
 {
 	int	error;
 	const int int0 = 0, int1 = 1, int255 = 255;
@@ -977,9 +974,7 @@ ripsend(struct	ifc *ifcp, struct sockaddr_in6 *sin6, int flag)
  * outbound filter logic, per-route/interface.
  */
 int
-out_filter(rrt, ifcp)
-	struct riprt *rrt;
-	struct ifc *ifcp;
+out_filter(struct riprt *rrt, struct ifc *ifcp)
 {
 	struct iff *iffp;
 	struct in6_addr ia;
@@ -1056,9 +1051,7 @@ out_filter(rrt, ifcp)
  * It checks options specified in the arguments and the split horizon rule.
  */
 int
-tobeadv(rrt, ifcp)
-	struct riprt *rrt;
-	struct ifc *ifcp;
+tobeadv(struct riprt *rrt, struct ifc *ifcp)
 {
 
 	/* Special care for static routes */
@@ -1083,9 +1076,7 @@ tobeadv(rrt, ifcp)
  * Send a rip packet actually.
  */
 int
-sendpacket(sin6, len)
-	struct	sockaddr_in6 *sin6;
-	int	len;
+sendpacket(struct sockaddr_in6 *sin6, int len)
 {
 	struct msghdr m;
 	struct cmsghdr *cm;
@@ -1144,7 +1135,7 @@ sendpacket(sin6, len)
  * table if necessary.
  */
 void
-riprecv()
+riprecv(void)
 {
 	struct	ifc *ifcp, *ic;
 	struct	sockaddr_in6 fsock;
@@ -1495,8 +1486,7 @@ riprecv()
  * Send all routes request packet to the specified interface.
  */
 void
-sendrequest(ifcp)
-	struct ifc *ifcp;
+sendrequest(struct ifc *ifcp)
 {
 	struct netinfo6 *np;
 	int error;
@@ -1524,11 +1514,10 @@ sendrequest(ifcp)
  * Process a RIP6_REQUEST packet.
  */
 void
-riprequest(ifcp, np, nn, sin6)
-	struct ifc *ifcp;
-	struct netinfo6 *np;
-	int nn;
-	struct sockaddr_in6 *sin6;
+riprequest(struct ifc *ifcp,
+	struct netinfo6 *np,
+	int nn,
+	struct sockaddr_in6 *sin6)
 {
 	int i;
 	struct riprt *rrt;
@@ -1556,7 +1545,7 @@ riprequest(ifcp, np, nn, sin6)
  * Get information of each interface.
  */
 void
-ifconfig()
+ifconfig(void)
 {
 	struct ifaddrs *ifap, *ifa;
 	struct ifc *ifcp;
@@ -1630,11 +1619,10 @@ ifconfig()
 }
 
 int
-ifconfig1(name, sa, ifcp, s)
-	const char *name;
-	const struct sockaddr *sa;
-	struct	ifc *ifcp;
-	int	s;
+ifconfig1(const char *name,
+	const struct sockaddr *sa,
+	struct ifc *ifcp,
+	int s)
 {
 	struct	in6_ifreq ifr;
 	const struct sockaddr_in6 *sin6;
@@ -1743,7 +1731,7 @@ ifremove(int ifindex)
  * Update interface information as necesssary.
  */
 void
-rtrecv()
+rtrecv(void)
 {
 	char buf[BUFSIZ];
 	char *p, *q = NULL;
@@ -1994,10 +1982,9 @@ rtrecv()
  * remove specified route from the internal routing table.
  */
 int
-rt_del(sdst, sgw, smask)
-	const struct sockaddr_in6 *sdst;
-	const struct sockaddr_in6 *sgw;
-	const struct sockaddr_in6 *smask;
+rt_del(const struct sockaddr_in6 *sdst,
+	const struct sockaddr_in6 *sgw,
+	const struct sockaddr_in6 *smask)
 {
 	const struct in6_addr *dst = NULL;
 	const struct in6_addr *gw = NULL;
@@ -2093,10 +2080,9 @@ rt_del(sdst, sgw, smask)
  * remove specified address from internal interface/routing table.
  */
 int
-rt_deladdr(ifcp, sifa, smask)
-	struct ifc *ifcp;
-	const struct sockaddr_in6 *sifa;
-	const struct sockaddr_in6 *smask;
+rt_deladdr(struct ifc *ifcp,
+	const struct sockaddr_in6 *sifa,
+	const struct sockaddr_in6 *smask)
 {
 	const struct in6_addr *addr = NULL;
 	int prefix;
@@ -2205,9 +2191,7 @@ rt_deladdr(ifcp, sifa, smask)
  * list.
  */
 int
-ifrt(ifcp, again)
-	struct ifc *ifcp;
-	int again;
+ifrt(struct ifc *ifcp, int again)
 {
 	struct ifac *ifa;
 	struct riprt *rrt = NULL, *search_rrt, *prev_rrt, *loop_rrt;
@@ -2322,9 +2306,7 @@ ifrt(ifcp, again)
  * since BSD kernels do not look at prefix length on p2p interfaces.
  */
 void
-ifrt_p2p(ifcp, again)
-	struct ifc *ifcp;
-	int again;
+ifrt_p2p(struct ifc *ifcp, int again)
 {
 	struct ifac *ifa;
 	struct riprt *rrt, *orrt, *prevrrt;
@@ -2492,8 +2474,7 @@ ifrt_p2p(ifcp, again)
 }
 
 int
-getifmtu(ifindex)
-	int	ifindex;
+getifmtu(int ifindex)
 {
 	int	mib[6];
 	char	*buf;
@@ -2530,8 +2511,7 @@ getifmtu(ifindex)
 }
 
 const char *
-rttypes(rtm)
-	struct rt_msghdr *rtm;
+rttypes(struct rt_msghdr *rtm)
 {
 #define	RTTYPE(s, f) \
 do { \
@@ -2574,8 +2554,7 @@ do { \
 }
 
 const char *
-rtflags(rtm)
-	struct rt_msghdr *rtm;
+rtflags(struct rt_msghdr *rtm)
 {
 	static char buf[BUFSIZ];
 
@@ -2644,8 +2623,7 @@ do { \
 }
 
 const char *
-ifflags(flags)
-	int flags;
+ifflags(int flags)
 {
 	static char buf[BUFSIZ];
 
@@ -2684,8 +2662,7 @@ do { \
 }
 
 void
-krtread(again)
-	int again;
+krtread(int again)
 {
 	int mib[6];
 	size_t msize;
@@ -2738,9 +2715,7 @@ krtread(again)
 }
 
 void
-rt_entry(rtm, again)
-	struct rt_msghdr *rtm;
-	int again;
+rt_entry(struct rt_msghdr *rtm, int again)
 {
 	struct	sockaddr_in6 *sin6_dst, *sin6_gw, *sin6_mask;
 	struct	sockaddr_in6 *sin6_genmask, *sin6_ifp;
@@ -2902,10 +2877,9 @@ rt_entry(rtm, again)
 }
 
 int
-addroute(rrt, gw, ifcp)
-	struct riprt *rrt;
-	const struct in6_addr *gw;
-	struct ifc *ifcp;
+addroute(struct riprt *rrt,
+	const struct in6_addr *gw,
+	struct ifc *ifcp)
 {
 	struct	netinfo6 *np;
 	u_char	buf[BUFSIZ], buf1[BUFSIZ], buf2[BUFSIZ];
@@ -2976,9 +2950,7 @@ addroute(rrt, gw, ifcp)
 }
 
 int
-delroute(np, gw)
-	struct netinfo6 *np;
-	struct in6_addr *gw;
+delroute(struct netinfo6 *np, struct in6_addr *gw)
 {
 	u_char	buf[BUFSIZ], buf2[BUFSIZ];
 	struct	rt_msghdr	*rtm;
@@ -3044,9 +3016,7 @@ delroute(np, gw)
 }
 
 struct in6_addr *
-getroute(np, gw)
-	struct netinfo6 *np;
-	struct in6_addr *gw;
+getroute(struct netinfo6 *np, struct in6_addr *gw)
 {
 	u_char buf[BUFSIZ];
 	int myseq;
@@ -3093,8 +3063,7 @@ getroute(np, gw)
 }
 
 const char *
-inet6_n2p(p)
-	const struct in6_addr *p;
+inet6_n2p(const struct in6_addr *p)
 {
 	static char buf[BUFSIZ];
 
@@ -3102,8 +3071,7 @@ inet6_n2p(p)
 }
 
 void
-ifrtdump(sig)
-	int sig;
+ifrtdump(int sig)
 {
 
 	ifdump(sig);
@@ -3111,8 +3079,7 @@ ifrtdump(sig)
 }
 
 void
-ifdump(sig)
-	int sig;
+ifdump(int sig)
 {
 	struct ifc *ifcp;
 	FILE *dump;
@@ -3148,9 +3115,7 @@ ifdump(sig)
 }
 
 void
-ifdump0(dump, ifcp)
-	FILE *dump;
-	const struct ifc *ifcp;
+ifdump0(FILE *dump, const struct ifc *ifcp)
 {
 	struct ifac *ifa;
 	struct iff *iffp;
@@ -3209,8 +3174,7 @@ ifdump0(dump, ifcp)
 }
 
 void
-rtdump(sig)
-	int sig;
+rtdump(int sig)
 {
 	struct	riprt *rrt;
 	char	buf[BUFSIZ];
@@ -3259,7 +3223,7 @@ rtdump(sig)
  * 		-O 5f09:c400::/32,ef0,ef1  (only when match)
  */
 void
-filterconfig()
+filterconfig(void)
 {
 	int i;
 	char *p, *ap, *iflp, *ifname, *ep;
@@ -3389,10 +3353,9 @@ ifonly:
  * with the address and prefix length specified in the arguments.
  */
 struct ifac *
-ifa_match(ifcp, ia, plen)
-	const struct ifc *ifcp;
-	const struct in6_addr *ia;
-	int plen;
+ifa_match(const struct ifc *ifcp,
+	const struct in6_addr *ia,
+	int plen)
 {
 	struct ifac *ifa;
 
@@ -3410,9 +3373,7 @@ ifa_match(ifcp, ia, plen)
  * Note: This is not a rtalloc().  Therefore exact match is necessary.
  */
 struct riprt *
-rtsearch(np, prev_rrt)
-	struct	netinfo6 *np;
-	struct	riprt **prev_rrt;
+rtsearch(struct netinfo6 *np, struct riprt **prev_rrt)
 {
 	struct	riprt	*rrt;
 
@@ -3432,8 +3393,7 @@ rtsearch(np, prev_rrt)
 }
 
 int
-sin6mask2len(sin6)
-	const struct sockaddr_in6 *sin6;
+sin6mask2len(const struct sockaddr_in6 *sin6)
 {
 
 	return mask2len(&sin6->sin6_addr,
@@ -3441,9 +3401,7 @@ sin6mask2len(sin6)
 }
 
 int
-mask2len(addr, lenlim)
-	const struct in6_addr *addr;
-	int lenlim;
+mask2len(const struct in6_addr *addr, int lenlim)
 {
 	int i = 0, j;
 	const u_char *p = (const u_char *)addr;
@@ -3470,8 +3428,7 @@ mask2len(addr, lenlim)
 }
 
 void
-applymask(addr, mask)
-	struct in6_addr *addr, *mask;
+applymask(struct in6_addr *addr, struct in6_addr *mask)
 {
 	int	i;
 	u_long	*p, *q;
@@ -3486,9 +3443,7 @@ static const u_char plent[8] = {
 };
 
 void
-applyplen(ia, plen)
-	struct	in6_addr *ia;
-	int	plen;
+applyplen(struct in6_addr *ia, int plen)
 {
 	u_char	*p;
 	int	i;
@@ -3508,8 +3463,7 @@ static const int pl2m[9] = {
 };
 
 struct in6_addr *
-plen2mask(n)
-	int	n;
+plen2mask(int n)
 {
 	static struct in6_addr ia;
 	u_char	*p;
@@ -3529,8 +3483,7 @@ plen2mask(n)
 }
 
 char *
-allocopy(p)
-	char *p;
+allocopy(char *p)
 {
 	int len = strlen(p) + 1;
 	char *q = (char *)malloc(len);
@@ -3545,7 +3498,7 @@ allocopy(p)
 }
 
 char *
-hms()
+hms(void)
 {
 	static char buf[BUFSIZ];
 	time_t t;
@@ -3564,8 +3517,7 @@ hms()
 #define	RIPRANDDEV	1.0	/* 30 +- 15, max - min = 30 */
 
 int
-ripinterval(timer)
-	int timer;
+ripinterval(int timer)
 {
 	double r = rand();
 
@@ -3575,7 +3527,7 @@ ripinterval(timer)
 }
 
 time_t
-ripsuptrig()
+ripsuptrig(void)
 {
 	time_t t;
 
@@ -3685,7 +3637,7 @@ trace(level, fmt, va_alist)
 }
 
 unsigned int
-if_maxindex()
+if_maxindex(void)
 {
 	struct if_nameindex *p, *p0;
 	unsigned int max = 0;
@@ -3700,8 +3652,7 @@ if_maxindex()
 }
 
 struct ifc *
-ifc_find(name)
-	char *name;
+ifc_find(char *name)
 {
 	struct ifc *ifcp;
 
@@ -3713,9 +3664,7 @@ ifc_find(name)
 }
 
 struct iff *
-iff_find(ifcp, type)
-	struct ifc *ifcp;
-	int type;
+iff_find(struct ifc *ifcp, int type)
 {
 	struct iff *iffp;
 
@@ -3731,9 +3680,7 @@ iff_find(ifcp, type)
 }
 
 void
-setindex2ifc(idx, ifcp)
-	int idx;
-	struct ifc *ifcp;
+setindex2ifc(int idx, struct ifc *ifcp)
 {
 	int n, nsize;
 	struct ifc **p;