1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
--- ppp-2.4.6.orig/pppd/lcp.c 2014-01-02 05:42:08.000000000 +0100
+++ ppp-2.4.6/pppd/lcp.c 2014-06-05 21:05:49.000000000 +0200
@@ -52,6 +52,7 @@
#include "pppd.h"
#include "fsm.h"
+#include "eap.h"
#include "lcp.h"
#include "chap-new.h"
#include "magic.h"
@@ -66,7 +67,7 @@ static const char rcsid[] = RCSID;
/* steal a bit in fsm flags word */
#define DELAYED_UP 0x100
-static void lcp_delayed_up __P((void *));
+static void lcp_delayed_up (void *);
/*
* LCP-related command-line options.
@@ -76,12 +77,12 @@ int lcp_echo_fails = 0; /* Tolerance to
bool lax_recv = 0; /* accept control chars in asyncmap */
bool noendpoint = 0; /* don't send/accept endpoint discriminator */
-static int noopt __P((char **));
+static int noopt (char **);
#ifdef HAVE_MULTILINK
-static int setendpoint __P((char **));
-static void printendpoint __P((option_t *, void (*)(void *, char *, ...),
- void *));
+static int setendpoint (char **);
+static void printendpoint (option_t *, void (*)(void *, char *, ...),
+ void *);
#endif /* HAVE_MULTILINK */
static option_t lcp_option_list[] = {
@@ -202,31 +203,31 @@ static u_char nak_buffer[PPP_MRU]; /* wh
/*
* Callbacks for fsm code. (CI = Configuration Information)
*/
-static void lcp_resetci __P((fsm *)); /* Reset our CI */
-static int lcp_cilen __P((fsm *)); /* Return length of our CI */
-static void lcp_addci __P((fsm *, u_char *, int *)); /* Add our CI to pkt */
-static int lcp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */
-static int lcp_nakci __P((fsm *, u_char *, int, int)); /* Peer nak'd our CI */
-static int lcp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */
-static int lcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv peer CI */
-static void lcp_up __P((fsm *)); /* We're UP */
-static void lcp_down __P((fsm *)); /* We're DOWN */
-static void lcp_starting __P((fsm *)); /* We need lower layer up */
-static void lcp_finished __P((fsm *)); /* We need lower layer down */
-static int lcp_extcode __P((fsm *, int, int, u_char *, int));
-static void lcp_rprotrej __P((fsm *, u_char *, int));
+static void lcp_resetci (fsm *); /* Reset our CI */
+static int lcp_cilen (fsm *); /* Return length of our CI */
+static void lcp_addci (fsm *, u_char *, int *); /* Add our CI to pkt */
+static int lcp_ackci (fsm *, u_char *, int); /* Peer ack'd our CI */
+static int lcp_nakci (fsm *, u_char *, int, int); /* Peer nak'd our CI */
+static int lcp_rejci (fsm *, u_char *, int); /* Peer rej'd our CI */
+static int lcp_reqci (fsm *, u_char *, int *, int); /* Rcv peer CI */
+static void lcp_up (fsm *); /* We're UP */
+static void lcp_down (fsm *); /* We're DOWN */
+static void lcp_starting (fsm *); /* We need lower layer up */
+static void lcp_finished (fsm *); /* We need lower layer down */
+static int lcp_extcode (fsm *, int, int, u_char *, int);
+static void lcp_rprotrej (fsm *, u_char *, int);
/*
* routines to send LCP echos to peer
*/
-static void lcp_echo_lowerup __P((int));
-static void lcp_echo_lowerdown __P((int));
-static void LcpEchoTimeout __P((void *));
-static void lcp_received_echo_reply __P((fsm *, int, u_char *, int));
-static void LcpSendEchoRequest __P((fsm *));
-static void LcpLinkFailure __P((fsm *));
-static void LcpEchoCheck __P((fsm *));
+static void lcp_echo_lowerup (int);
+static void lcp_echo_lowerdown (int);
+static void LcpEchoTimeout (void *);
+static void lcp_received_echo_reply (fsm *, int, u_char *, int);
+static void LcpSendEchoRequest (fsm *);
+static void LcpLinkFailure (fsm *);
+static void LcpEchoCheck (fsm *);
static fsm_callbacks lcp_callbacks = { /* LCP callback routines */
lcp_resetci, /* Reset our Configuration Information */
@@ -251,11 +252,11 @@ static fsm_callbacks lcp_callbacks = { /
* Some of these are called directly.
*/
-static void lcp_init __P((int));
-static void lcp_input __P((int, u_char *, int));
-static void lcp_protrej __P((int));
-static int lcp_printpkt __P((u_char *, int,
- void (*) __P((void *, char *, ...)), void *));
+static void lcp_init (int);
+static void lcp_input (int, u_char *, int);
+static void lcp_protrej (int);
+static int lcp_printpkt (u_char *, int,
+ void (*) __P((void *, char *, ...)), void *);
struct protent lcp_protent = {
PPP_LCP,
@@ -322,7 +323,7 @@ setendpoint(argv)
static void
printendpoint(opt, printer, arg)
option_t *opt;
- void (*printer) __P((void *, char *, ...));
+ void (*printer) (void *, char *, ...);
void *arg;
{
printer(arg, "%s", epdisc_to_str(&lcp_wantoptions[0].endpoint));
@@ -1995,7 +1996,7 @@ static int
lcp_printpkt(p, plen, printer, arg)
u_char *p;
int plen;
- void (*printer) __P((void *, char *, ...));
+ void (*printer) (void *, char *, ...);
void *arg;
{
int code, id, len, olen, i;
|
