123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115 |
- --- ppp-2.4.5.orig/pppd/lcp.c 2009-11-16 23:26:07.000000000 +0100
- +++ ppp-2.4.5/pppd/lcp.c 2014-03-17 16:13:13.000000000 +0100
- @@ -66,7 +66,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 +76,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 +202,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 +251,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 +322,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));
- @@ -1985,7 +1985,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;
|