summaryrefslogtreecommitdiff
path: root/usr.sbin/pppd
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/pppd')
-rw-r--r--usr.sbin/pppd/auth.c8
-rw-r--r--usr.sbin/pppd/cbcp.c9
-rw-r--r--usr.sbin/pppd/ccp.c9
-rw-r--r--usr.sbin/pppd/chap.c7
-rw-r--r--usr.sbin/pppd/chat/chat.c7
-rw-r--r--usr.sbin/pppd/ipcp.c7
-rw-r--r--usr.sbin/pppd/ipxcp.c8
-rw-r--r--usr.sbin/pppd/lcp.c7
-rw-r--r--usr.sbin/pppd/pppd.h23
-rw-r--r--usr.sbin/pppd/upap.c7
10 files changed, 41 insertions, 51 deletions
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index 60d5b4e49de..9c8210cdbe8 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.21 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: auth.c,v 1.22 2002/02/17 19:42:38 millert Exp $ */
/*
* auth.c - PPP authentication and phase control.
@@ -38,7 +38,7 @@
#if 0
static char rcsid[] = "Id: auth.c,v 1.37 1998/03/26 04:46:03 paulus Exp $";
#else
-static char rcsid[] = "$OpenBSD: auth.c,v 1.21 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: auth.c,v 1.22 2002/02/17 19:42:38 millert Exp $";
#endif
#endif
@@ -143,8 +143,8 @@ static int get_pap_passwd(char *);
static int have_pap_secret(void);
static int have_chap_secret(char *, char *, u_int32_t);
static int ip_addr_check(u_int32_t, struct wordlist *);
-static int scan_authfile __P((FILE *, char *, char *, u_int32_t, char *,
- struct wordlist **, char *));
+static int scan_authfile(FILE *, char *, char *, u_int32_t, char *,
+ struct wordlist **, char *);
static void free_wordlist(struct wordlist *);
static void auth_script(char *);
static void set_allowed_addrs(int, struct wordlist *);
diff --git a/usr.sbin/pppd/cbcp.c b/usr.sbin/pppd/cbcp.c
index 439d73a8395..b8a7c81fe07 100644
--- a/usr.sbin/pppd/cbcp.c
+++ b/usr.sbin/pppd/cbcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cbcp.c,v 1.3 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: cbcp.c,v 1.4 2002/02/17 19:42:38 millert Exp $ */
/*
* cbcp - Call Back Configuration Protocol.
@@ -24,7 +24,7 @@
#if 0
static char rcsid[] = "Id: cbcp.c,v 1.2 1997/04/30 05:50:26 paulus Exp";
#else
-static char rcsid[] = "$OpenBSD: cbcp.c,v 1.3 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: cbcp.c,v 1.4 2002/02/17 19:42:38 millert Exp $";
#endif
#endif
@@ -48,9 +48,8 @@ static void cbcp_open(int unit);
static void cbcp_lowerup(int unit);
static void cbcp_input(int unit, u_char *pkt, int len);
static void cbcp_protrej(int unit);
-static int cbcp_printpkt __P((u_char *pkt, int len,
- void (*printer)(void *, char *, ...),
- void *arg));
+static int cbcp_printpkt(u_char *pkt, int len,
+ void (*printer)(void *, char *, ...), void *arg);
struct protent cbcp_protent = {
PPP_CBCP,
diff --git a/usr.sbin/pppd/ccp.c b/usr.sbin/pppd/ccp.c
index f9cfad3e793..b4f746cb89a 100644
--- a/usr.sbin/pppd/ccp.c
+++ b/usr.sbin/pppd/ccp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ccp.c,v 1.9 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: ccp.c,v 1.10 2002/02/17 19:42:38 millert Exp $ */
/*
* ccp.c - PPP Compression Control Protocol.
@@ -31,7 +31,7 @@
#if 0
static char rcsid[] = "Id: ccp.c,v 1.22 1998/03/25 01:25:02 paulus Exp $";
#else
-static char rcsid[] = "$OpenBSD: ccp.c,v 1.9 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: ccp.c,v 1.10 2002/02/17 19:42:38 millert Exp $";
#endif
#endif
@@ -55,9 +55,8 @@ static void ccp_lowerup(int unit);
static void ccp_lowerdown(int);
static void ccp_input(int unit, u_char *pkt, int len);
static void ccp_protrej(int unit);
-static int ccp_printpkt __P((u_char *pkt, int len,
- void (*printer)(void *, char *, ...),
- void *arg));
+static int ccp_printpkt(u_char *pkt, int len,
+ void (*printer)(void *, char *, ...), void *arg);
static void ccp_datainput(int unit, u_char *pkt, int len);
struct protent ccp_protent = {
diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c
index cc2819530a0..e978f26eb0d 100644
--- a/usr.sbin/pppd/chap.c
+++ b/usr.sbin/pppd/chap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chap.c,v 1.9 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: chap.c,v 1.10 2002/02/17 19:42:38 millert Exp $ */
/*
* chap.c - Challenge Handshake Authentication Protocol.
@@ -39,7 +39,7 @@
#if 0
static char rcsid[] = "Id: chap.c,v 1.15 1997/11/27 06:07:48 paulus Exp $";
#else
-static char rcsid[] = "$OpenBSD: chap.c,v 1.9 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: chap.c,v 1.10 2002/02/17 19:42:38 millert Exp $";
#endif
#endif
@@ -69,8 +69,7 @@ static void ChapLowerUp(int);
static void ChapLowerDown(int);
static void ChapInput(int, u_char *, int);
static void ChapProtocolReject(int);
-static int ChapPrintPkt __P((u_char *, int,
- void (*)(void *, char *, ...), void *));
+static int ChapPrintPkt(u_char *, int, void (*)(void *, char *, ...), void *);
struct protent chap_protent = {
PPP_CHAP,
diff --git a/usr.sbin/pppd/chat/chat.c b/usr.sbin/pppd/chat/chat.c
index 8b927b4ba4f..e02bb725f5b 100644
--- a/usr.sbin/pppd/chat/chat.c
+++ b/usr.sbin/pppd/chat/chat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chat.c,v 1.14 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: chat.c,v 1.15 2002/02/17 19:42:38 millert Exp $ */
/*
* Chat -- a program for automatic session establishment (i.e. dial
@@ -83,7 +83,7 @@
#if 0
static char rcsid[] = "Id: chat.c,v 1.19 1998/03/24 23:57:48 paulus Exp $";
#else
-static char rcsid[] = "$OpenBSD: chat.c,v 1.14 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: chat.c,v 1.15 2002/02/17 19:42:38 millert Exp $";
#endif
#endif
@@ -118,17 +118,14 @@ static char rcsid[] = "$OpenBSD: chat.c,v 1.14 2002/02/16 21:28:07 millert Exp $
#define SIGTYPE void
#endif
-#undef __P
#undef __V
#ifdef __STDC__
#include <stdarg.h>
#define __V(x) x
-#define __P(x) x
#else
#include <varargs.h>
#define __V(x) (va_alist) va_dcl
-#define __P(x) ()
#define const
#endif
diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c
index 424b20c58b1..33368115b5e 100644
--- a/usr.sbin/pppd/ipcp.c
+++ b/usr.sbin/pppd/ipcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: ipcp.c,v 1.8 2002/02/17 19:42:38 millert Exp $ */
/*
* ipcp.c - PPP IP Control Protocol.
@@ -23,7 +23,7 @@
#if 0
static char rcsid[] = "Id: ipcp.c,v 1.34 1998/04/28 23:38:09 paulus Exp $";
#else
-static char rcsid[] = "$OpenBSD: ipcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: ipcp.c,v 1.8 2002/02/17 19:42:38 millert Exp $";
#endif
#endif
@@ -101,8 +101,7 @@ static void ipcp_lowerup(int);
static void ipcp_lowerdown(int);
static void ipcp_input(int, u_char *, int);
static void ipcp_protrej(int);
-static int ipcp_printpkt __P((u_char *, int,
- void (*)(void *, char *, ...), void *));
+static int ipcp_printpkt(u_char *, int, void (*)(void *, char *, ...), void *);
static void ip_check_options(void);
static int ip_demand_conf(int);
static int ip_active_pkt(u_char *, int);
diff --git a/usr.sbin/pppd/ipxcp.c b/usr.sbin/pppd/ipxcp.c
index 081166b6c60..a5fc1b7b3fa 100644
--- a/usr.sbin/pppd/ipxcp.c
+++ b/usr.sbin/pppd/ipxcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipxcp.c,v 1.6 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: ipxcp.c,v 1.7 2002/02/17 19:42:38 millert Exp $ */
/*
* ipxcp.c - PPP IPX Control Protocol.
@@ -24,7 +24,7 @@
#if 0
static char rcsid[] = "Id: ipxcp.c,v 1.6 1998/03/25 03:08:16 paulus Exp $";
#else
-static char rcsid[] = "$OpenBSD: ipxcp.c,v 1.6 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: ipxcp.c,v 1.7 2002/02/17 19:42:38 millert Exp $";
#endif
#endif
@@ -101,8 +101,8 @@ static void ipxcp_lowerup(int);
static void ipxcp_lowerdown(int);
static void ipxcp_input(int, u_char *, int);
static void ipxcp_protrej(int);
-static int ipxcp_printpkt __P((u_char *, int,
- void (*)(void *, char *, ...), void *));
+static int ipxcp_printpkt(u_char *, int,
+ void (*)(void *, char *, ...), void *);
struct protent ipxcp_protent = {
PPP_IPXCP,
diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c
index fa8fd8f60dc..ac337fe0dc1 100644
--- a/usr.sbin/pppd/lcp.c
+++ b/usr.sbin/pppd/lcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: lcp.c,v 1.8 2002/02/17 19:42:38 millert Exp $ */
/*
* lcp.c - PPP Link Control Protocol.
@@ -23,7 +23,7 @@
#if 0
static char rcsid[] = "Id: lcp.c,v 1.31 1997/11/27 06:08:44 paulus Exp $";
#else
-static char rcsid[] = "$OpenBSD: lcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: lcp.c,v 1.8 2002/02/17 19:42:38 millert Exp $";
#endif
#endif
@@ -116,8 +116,7 @@ static fsm_callbacks lcp_callbacks = { /* LCP callback routines */
static void lcp_init(int);
static void lcp_input(int, u_char *, int);
static void lcp_protrej(int);
-static int lcp_printpkt __P((u_char *, int,
- void (*)(void *, char *, ...), void *));
+static int lcp_printpkt(u_char *, int, void (*)(void *, char *, ...), void *);
struct protent lcp_protent = {
PPP_LCP,
diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h
index e9a83a306c3..708efac92fa 100644
--- a/usr.sbin/pppd/pppd.h
+++ b/usr.sbin/pppd/pppd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pppd.h,v 1.11 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: pppd.h,v 1.12 2002/02/17 19:42:38 millert Exp $ */
/*
* pppd.h - PPP daemon global declarations.
@@ -156,9 +156,8 @@ struct protent {
/* Close the protocol */
void (*close)(int unit, char *reason);
/* Print a packet in readable form */
- int (*printpkt) __P((u_char *pkt, int len,
- void (*printer)(void *, char *, ...),
- void *arg));
+ int (*printpkt)(u_char *pkt, int len,
+ void (*printer)(void *, char *, ...), void *arg);
/* Process a received data packet */
void (*datainput)(int unit, u_char *pkt, int len);
int enabled_flag; /* 0 iff protocol is disabled */
@@ -183,20 +182,20 @@ void detach(void); /* Detach from controlling tty */
void die(int); /* Cleanup and exit */
void quit(void); /* like die(1) */
void novm(char *); /* Say we ran out of memory, and die */
-void timeout __P((void (*func)(void *), void *arg, int t));
+void timeout(void (*func)(void *), void *arg, int t);
/* Call func(arg) after t seconds */
-void untimeout __P((void (*func)(void *), void *arg));
+void untimeout(void (*func)(void *), void *arg);
/* Cancel call to func(arg) */
int run_program(char *prog, char **args, int must_exist);
/* Run program prog with args in child */
void demuxprotrej(int, int);
/* Demultiplex a Protocol-Reject */
-void format_packet __P((u_char *, int, void (*) (void *, char *, ...),
- void *)); /* Format a packet in human-readable form */
+void format_packet(u_char *, int, void (*) (void *, char *, ...), void *);
+ /* Format a packet in human-readable form */
void log_packet(u_char *, int, char *, int);
/* Format a packet and log it with syslog */
-void print_string __P((char *, int, void (*) (void *, char *, ...),
- void *)); /* Format a string for output */
+void print_string(char *, int, void (*) (void *, char *, ...), void *);
+ /* Format a string for output */
int fmtmsg(char *, int, char *, ...); /* sprintf++ */
int vfmtmsg(char *, int, char *, va_list); /* vsprintf++ */
void script_setenv(char *, char *); /* set script env var */
@@ -311,8 +310,8 @@ int set_filters(struct bpf_program *pass, struct bpf_program *active);
int parse_args(int argc, char **argv);
/* Parse options from arguments given */
void usage(void); /* Print a usage message */
-int options_from_file __P((char *filename, int must_exist, int check_prot,
- int privileged));
+int options_from_file(char *filename, int must_exist, int check_prot,
+ int privileged);
/* Parse options from an options file */
int options_from_user(void); /* Parse options from user's .ppprc */
int options_for_tty(void); /* Parse options from /etc/ppp/options.tty */
diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c
index edb2d67f61a..17ede4956e0 100644
--- a/usr.sbin/pppd/upap.c
+++ b/usr.sbin/pppd/upap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: upap.c,v 1.7 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: upap.c,v 1.8 2002/02/17 19:42:38 millert Exp $ */
/*
* upap.c - User/Password Authentication Protocol.
@@ -23,7 +23,7 @@
#if 0
static char rcsid[] = "Id: upap.c,v 1.11 1997/04/30 05:59:56 paulus Exp";
#else
-static char rcsid[] = "$OpenBSD: upap.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: upap.c,v 1.8 2002/02/17 19:42:38 millert Exp $";
#endif
#endif
@@ -48,8 +48,7 @@ static void upap_lowerup(int);
static void upap_lowerdown(int);
static void upap_input(int, u_char *, int);
static void upap_protrej(int);
-static int upap_printpkt __P((u_char *, int,
- void (*)(void *, char *, ...), void *));
+static int upap_printpkt(u_char *, int, void (*)(void *, char *, ...), void *);
struct protent pap_protent = {
PPP_PAP,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 22:52:08 +0000