summaryrefslogtreecommitdiff
path: root/usr.sbin/rtadvd
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/rtadvd')
-rw-r--r--usr.sbin/rtadvd/advcap.c20
-rw-r--r--usr.sbin/rtadvd/advcap.h10
-rw-r--r--usr.sbin/rtadvd/config.c8
-rw-r--r--usr.sbin/rtadvd/config.h10
-rw-r--r--usr.sbin/rtadvd/dump.c6
-rw-r--r--usr.sbin/rtadvd/dump.h4
-rw-r--r--usr.sbin/rtadvd/if.c4
-rw-r--r--usr.sbin/rtadvd/if.h40
-rw-r--r--usr.sbin/rtadvd/rtadvd.c24
-rw-r--r--usr.sbin/rtadvd/rtadvd.h10
-rw-r--r--usr.sbin/rtadvd/timer.c6
-rw-r--r--usr.sbin/rtadvd/timer.h20
12 files changed, 81 insertions, 81 deletions
diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c
index 9e187fcc4b1..aac38b00b9c 100644
--- a/usr.sbin/rtadvd/advcap.c
+++ b/usr.sbin/rtadvd/advcap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: advcap.c,v 1.4 2001/02/04 06:22:05 itojun Exp $ */
+/* $OpenBSD: advcap.c,v 1.5 2002/02/16 21:28:08 millert Exp $ */
/* $KAME: advcap.c,v 1.5 2001/02/01 09:12:08 jinmei Exp $ */
/*
@@ -91,15 +91,15 @@ static char *remotefile;
extern char *conffile;
-int tgetent __P((char *, char *));
-int getent __P((char *, char *, char *));
-int tnchktc __P((void));
-int tnamatch __P((char *));
-static char *tskip __P((char *));
-long long tgetnum __P((char *));
-int tgetflag __P((char *));
-char *tgetstr __P((char *, char **));
-static char *tdecode __P((char *, char **));
+int tgetent(char *, char *);
+int getent(char *, char *, char *);
+int tnchktc(void);
+int tnamatch(char *);
+static char *tskip(char *);
+long long tgetnum(char *);
+int tgetflag(char *);
+char *tgetstr(char *, char **);
+static char *tdecode(char *, char **);
/*
* Get an entry for terminal name in buffer bp,
diff --git a/usr.sbin/rtadvd/advcap.h b/usr.sbin/rtadvd/advcap.h
index 34c3fa17d85..3c6ad980db4 100644
--- a/usr.sbin/rtadvd/advcap.h
+++ b/usr.sbin/rtadvd/advcap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: advcap.h,v 1.4 2001/02/04 06:22:05 itojun Exp $ */
+/* $OpenBSD: advcap.h,v 1.5 2002/02/16 21:28:08 millert Exp $ */
/* $KAME: advcap.h,v 1.3 2001/02/01 09:12:08 jinmei Exp $ */
/*
@@ -36,10 +36,10 @@
__BEGIN_DECLS
-extern int agetent __P((char *, const char *));
-extern int agetflag __P((const char *));
-extern long long agetnum __P((const char *));
-extern char *agetstr __P((const char *, char **));
+extern int agetent(char *, const char *);
+extern int agetflag(const char *);
+extern long long agetnum(const char *);
+extern char *agetstr(const char *, char **);
__END_DECLS
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c
index 31c637cbd4b..a369c16757b 100644
--- a/usr.sbin/rtadvd/config.c
+++ b/usr.sbin/rtadvd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.13 2001/06/03 09:27:31 itojun Exp $ */
+/* $OpenBSD: config.c,v 1.14 2002/02/16 21:28:08 millert Exp $ */
/* $KAME: config.c,v 1.47 2001/06/02 18:50:46 jinmei Exp $ */
/*
@@ -71,9 +71,9 @@
#include "if.h"
#include "config.h"
-static void makeentry __P((char *, int, char *, int));
-static void get_prefix __P((struct rainfo *));
-static int getinet6sysctl __P((int));
+static void makeentry(char *, int, char *, int);
+static void get_prefix(struct rainfo *);
+static int getinet6sysctl(int);
extern struct rainfo *ralist;
diff --git a/usr.sbin/rtadvd/config.h b/usr.sbin/rtadvd/config.h
index 33ce8638fcf..eb3efbe2b6a 100644
--- a/usr.sbin/rtadvd/config.h
+++ b/usr.sbin/rtadvd/config.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.h,v 1.4 2000/05/23 11:23:23 itojun Exp $ */
+/* $OpenBSD: config.h,v 1.5 2002/02/16 21:28:08 millert Exp $ */
/* $KAME: config.h,v 1.3 2000/05/16 13:34:13 itojun Exp $ */
/*
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
-extern void getconfig __P((char *));
-extern void delete_prefix __P((struct rainfo *, struct prefix *));
-extern void make_prefix __P((struct rainfo *, int, struct in6_addr *, int));
-extern void make_packet __P((struct rainfo *));
+extern void getconfig(char *);
+extern void delete_prefix(struct rainfo *, struct prefix *);
+extern void make_prefix(struct rainfo *, int, struct in6_addr *, int);
+extern void make_packet(struct rainfo *);
diff --git a/usr.sbin/rtadvd/dump.c b/usr.sbin/rtadvd/dump.c
index 38698653b43..7735afed4ce 100644
--- a/usr.sbin/rtadvd/dump.c
+++ b/usr.sbin/rtadvd/dump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dump.c,v 1.3 2001/01/15 11:06:25 itojun Exp $ */
+/* $OpenBSD: dump.c,v 1.4 2002/02/16 21:28:08 millert Exp $ */
/* $KAME: dump.c,v 1.15 2000/11/11 06:57:22 jinmei Exp $ */
/*
@@ -63,8 +63,8 @@ static FILE *fp;
extern struct rainfo *ralist;
-static char *ether_str __P((struct sockaddr_dl *));
-static void if_dump __P((void));
+static char *ether_str(struct sockaddr_dl *);
+static void if_dump(void);
#ifdef __FreeBSD__ /* XXX: see PORTABILITY */
#define LONGLONG "%qu"
diff --git a/usr.sbin/rtadvd/dump.h b/usr.sbin/rtadvd/dump.h
index 698bcd63e49..41a31d93ed3 100644
--- a/usr.sbin/rtadvd/dump.h
+++ b/usr.sbin/rtadvd/dump.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dump.h,v 1.1 2000/05/23 11:33:48 itojun Exp $ */
+/* $OpenBSD: dump.h,v 1.2 2002/02/16 21:28:08 millert Exp $ */
/* $KAME: dump.h,v 1.1 2000/05/23 11:31:26 itojun Exp $ */
/*
@@ -30,4 +30,4 @@
* SUCH DAMAGE.
*/
-extern void rtadvd_dump_file __P((char *));
+extern void rtadvd_dump_file(char *);
diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c
index 03da5f24662..decc7ea844a 100644
--- a/usr.sbin/rtadvd/if.c
+++ b/usr.sbin/rtadvd/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.9 2001/01/21 15:42:35 itojun Exp $ */
+/* $OpenBSD: if.c,v 1.10 2002/02/16 21:28:08 millert Exp $ */
/* $KAME: if.c,v 1.17 2001/01/21 15:27:30 itojun Exp $ */
/*
@@ -74,7 +74,7 @@ int iflist_init_ok;
size_t ifblock_size;
char *ifblock;
-static void get_iflist __P((char **buf, size_t *size));
+static void get_iflist(char **buf, size_t *size);
static void parse_iflist __P((struct if_msghdr ***ifmlist_p, char *buf,
size_t bufsize));
diff --git a/usr.sbin/rtadvd/if.h b/usr.sbin/rtadvd/if.h
index 67e79483912..b444d4b5e60 100644
--- a/usr.sbin/rtadvd/if.h
+++ b/usr.sbin/rtadvd/if.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.h,v 1.7 2001/01/21 15:42:36 itojun Exp $ */
+/* $OpenBSD: if.h,v 1.8 2002/02/16 21:28:08 millert Exp $ */
/* $KAME: if.h,v 1.6 2001/01/21 15:37:14 itojun Exp $ */
/*
@@ -37,22 +37,22 @@ extern size_t ifblock_size;
extern char *ifblock;
struct nd_opt_hdr;
-struct sockaddr_dl *if_nametosdl __P((char *));
-int if_getmtu __P((char *));
-int if_getflags __P((int, int));
-int lladdropt_length __P((struct sockaddr_dl *));
-void lladdropt_fill __P((struct sockaddr_dl *, struct nd_opt_hdr *));
-int rtbuf_len __P((void));
-char *get_next_msg __P((char *, char *, int, size_t *, int));
-struct in6_addr *get_addr __P((char *));
-int get_rtm_ifindex __P((char *));
-int get_ifm_ifindex __P((char *));
-int get_ifam_ifindex __P((char *));
-int get_ifm_flags __P((char *));
-int get_prefixlen __P((char *));
-int prefixlen __P((u_char *, u_char *));
-int rtmsg_type __P((char *));
-int ifmsg_type __P((char *));
-int rtmsg_len __P((char *));
-int ifmsg_len __P((char *));
-void init_iflist __P((void));
+struct sockaddr_dl *if_nametosdl(char *);
+int if_getmtu(char *);
+int if_getflags(int, int);
+int lladdropt_length(struct sockaddr_dl *);
+void lladdropt_fill(struct sockaddr_dl *, struct nd_opt_hdr *);
+int rtbuf_len(void);
+char *get_next_msg(char *, char *, int, size_t *, int);
+struct in6_addr *get_addr(char *);
+int get_rtm_ifindex(char *);
+int get_ifm_ifindex(char *);
+int get_ifam_ifindex(char *);
+int get_ifm_flags(char *);
+int get_prefixlen(char *);
+int prefixlen(u_char *, u_char *);
+int rtmsg_type(char *);
+int ifmsg_type(char *);
+int rtmsg_len(char *);
+int ifmsg_len(char *);
+void init_iflist(void);
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
index 83342fbcd61..b4f1ce09fa7 100644
--- a/usr.sbin/rtadvd/rtadvd.c
+++ b/usr.sbin/rtadvd/rtadvd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtadvd.c,v 1.13 2002/01/11 03:51:08 itojun Exp $ */
+/* $OpenBSD: rtadvd.c,v 1.14 2002/02/16 21:28:08 millert Exp $ */
/* $KAME: rtadvd.c,v 1.50 2001/02/04 06:15:15 itojun Exp $ */
/*
@@ -125,12 +125,12 @@ u_int32_t ndopt_flags[] = {
NDOPT_FLAG_PREFIXINFO, NDOPT_FLAG_RDHDR, NDOPT_FLAG_MTU
};
-int main __P((int, char *[]));
-static void set_die __P((int));
-static void die __P((void));
-static void sock_open __P((void));
-static void rtsock_open __P((void));
-static void rtadvd_input __P((void));
+int main(int, char *[]);
+static void set_die(int);
+static void die(void);
+static void sock_open(void);
+static void rtsock_open(void);
+static void rtadvd_input(void);
static void rs_input __P((int, struct nd_router_solicit *,
struct in6_pktinfo *, struct sockaddr_in6 *));
static void ra_input __P((int, struct nd_router_advert *,
@@ -139,12 +139,12 @@ static int prefix_check __P((struct nd_opt_prefix_info *, struct rainfo *,
struct sockaddr_in6 *));
static int nd6_options __P((struct nd_opt_hdr *, int,
union nd_opts *, u_int32_t));
-static void free_ndopts __P((union nd_opts *));
-static void ra_output __P((struct rainfo *));
-static void rtmsg_input __P((void));
-static void rtadvd_set_dump_file __P((void));
+static void free_ndopts(union nd_opts *);
+static void ra_output(struct rainfo *);
+static void rtmsg_input(void);
+static void rtadvd_set_dump_file(void);
-struct prefix *find_prefix __P((struct rainfo *, struct in6_addr *, int));
+struct prefix *find_prefix(struct rainfo *, struct in6_addr *, int);
int
main(argc, argv)
diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h
index 456fd5257d7..6636573376c 100644
--- a/usr.sbin/rtadvd/rtadvd.h
+++ b/usr.sbin/rtadvd/rtadvd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtadvd.h,v 1.6 2001/01/15 11:06:30 itojun Exp $ */
+/* $OpenBSD: rtadvd.h,v 1.7 2002/02/16 21:28:08 millert Exp $ */
/* $KAME: rtadvd.h,v 1.14 2000/11/11 06:57:22 jinmei Exp $ */
/*
@@ -146,11 +146,11 @@ struct rainfo {
struct soliciter *soliciter; /* recent solication source */
};
-void ra_timeout __P((void *));
-void ra_timer_update __P((void *, struct timeval *));
+void ra_timeout(void *);
+void ra_timer_update(void *, struct timeval *);
-int prefix_match __P((struct in6_addr *, int, struct in6_addr *, int));
-struct rainfo *if_indextorainfo __P((int));
+int prefix_match(struct in6_addr *, int, struct in6_addr *, int);
+struct rainfo *if_indextorainfo(int);
extern struct in6_addr in6a_site_allrouters;
#ifdef MIP6
diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c
index 2edcdf01a90..88f2417ace2 100644
--- a/usr.sbin/rtadvd/timer.c
+++ b/usr.sbin/rtadvd/timer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timer.c,v 1.4 2000/07/06 10:14:49 itojun Exp $ */
+/* $OpenBSD: timer.c,v 1.5 2002/02/16 21:28:08 millert Exp $ */
/* $KAME: timer.c,v 1.4 2000/05/27 11:30:43 jinmei Exp $ */
/*
@@ -59,8 +59,8 @@ rtadvd_timer_init()
}
struct rtadvd_timer *
-rtadvd_add_timer(void (*timeout) __P((void *)),
- void (*update) __P((void *, struct timeval *)),
+rtadvd_add_timer(void (*timeout)(void *),
+ void (*update)(void *, struct timeval *),
void *timeodata, void *updatedata)
{
struct rtadvd_timer *newtimer;
diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h
index 617f28a284d..f667e8c268b 100644
--- a/usr.sbin/rtadvd/timer.h
+++ b/usr.sbin/rtadvd/timer.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: timer.h,v 1.4 2000/07/06 10:14:49 itojun Exp $ */
+/* $OpenBSD: timer.h,v 1.5 2002/02/16 21:28:09 millert Exp $ */
/* $KAME: timer.h,v 1.3 2000/05/27 11:30:43 jinmei Exp $ */
/*
@@ -46,19 +46,19 @@ struct rtadvd_timer {
struct rainfo *rai;
struct timeval tm;
- void (*expire) __P((void *)); /* expiration function */
+ void (*expire)(void *); /* expiration function */
void *expire_data;
- void (*update) __P((void *, struct timeval *)); /* update function */
+ void (*update)(void *, struct timeval *); /* update function */
void *update_data;
};
-void rtadvd_timer_init __P((void));
-struct rtadvd_timer *rtadvd_add_timer __P((void (*) __P((void *)),
- void (*) __P((void *, struct timeval *)), void *, void *));
-void rtadvd_set_timer __P((struct timeval *, struct rtadvd_timer *));
-void rtadvd_remove_timer __P((struct rtadvd_timer **));
-struct timeval * rtadvd_check_timer __P((void));
-struct timeval * rtadvd_timer_rest __P((struct rtadvd_timer *));
+void rtadvd_timer_init(void);
+struct rtadvd_timer *rtadvd_add_timer __P((void (*)(void *),
+ void (*)(void *, struct timeval *), void *, void *));
+void rtadvd_set_timer(struct timeval *, struct rtadvd_timer *);
+void rtadvd_remove_timer(struct rtadvd_timer **);
+struct timeval * rtadvd_check_timer(void);
+struct timeval * rtadvd_timer_rest(struct rtadvd_timer *);
void TIMEVAL_ADD __P((struct timeval *, struct timeval *,
struct timeval *));
void TIMEVAL_SUB __P((struct timeval *, struct timeval *,
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 00:33:55 +0000