diff options
Diffstat (limited to 'usr.sbin/pppd')
| -rw-r--r-- | usr.sbin/pppd/auth.c | 6 | ||||
| -rw-r--r-- | usr.sbin/pppd/chap.c | 40 | ||||
| -rw-r--r-- | usr.sbin/pppd/fsm.c | 14 | ||||
| -rw-r--r-- | usr.sbin/pppd/ipcp.c | 14 | ||||
| -rw-r--r-- | usr.sbin/pppd/ipcp.h | 4 | ||||
| -rw-r--r-- | usr.sbin/pppd/lcp.c | 12 | ||||
| -rw-r--r-- | usr.sbin/pppd/main.c | 38 | ||||
| -rw-r--r-- | usr.sbin/pppd/options.c | 22 | ||||
| -rw-r--r-- | usr.sbin/pppd/pppd.h | 4 | ||||
| -rw-r--r-- | usr.sbin/pppd/sys-bsd.c | 4 | ||||
| -rw-r--r-- | usr.sbin/pppd/upap.c | 4 |
11 files changed, 81 insertions, 81 deletions
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c index 950ef02..e8b2d06 100644 --- a/usr.sbin/pppd/auth.c +++ b/usr.sbin/pppd/auth.c @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: auth.c,v 1.6 1994/05/25 06:25:05 paulus Exp $"; +static char rcsid[] = "$Id: auth.c,v 1.2 1994/09/25 02:31:52 wollman Exp $"; #endif #include <stdio.h> @@ -758,7 +758,7 @@ check_access(f, filename) * NONWILD_CLIENT set if the secret didn't have "*" for the client, and * NONWILD_SERVER set if the secret didn't have "*" for the server. * Any following words on the line (i.e. address authorization - * info) are placed in a wordlist and returned in *addrs. + * info) are placed in a wordlist and returned in *addrs. */ static int scan_authfile(f, client, server, secret, addrs, filename) @@ -851,7 +851,7 @@ scan_authfile(f, client, server, secret, addrs, filename) } if (secret != NULL) strcpy(secret, word); - + best_flag = got_flag; /* diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c index 64f39bc..14b28b1 100644 --- a/usr.sbin/pppd/chap.c +++ b/usr.sbin/pppd/chap.c @@ -19,7 +19,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: chap.c,v 1.3 1994/04/18 04:01:07 paulus Exp $"; +static char rcsid[] = "$Id: chap.c,v 1.2 1994/09/25 02:31:54 wollman Exp $"; #endif /* @@ -95,7 +95,7 @@ ChapAuthWithPeer(unit, our_name, digest) /* * We get here as a result of LCP coming up. - * So even if CHAP was open before, we will + * So even if CHAP was open before, we will * have to re-authenticate ourselves. */ cstate->clientstate = CHAPCS_LISTEN; @@ -112,7 +112,7 @@ ChapAuthPeer(unit, our_name, digest) int digest; { chap_state *cstate = &chap[unit]; - + cstate->chal_name = our_name; cstate->chal_type = digest; @@ -137,7 +137,7 @@ ChapChallengeTimeout(arg) caddr_t arg; { chap_state *cstate = (chap_state *) arg; - + /* if we aren't sending challenges, don't worry. then again we */ /* probably shouldn't be here either */ if (cstate->serverstate != CHAPSS_INITIAL_CHAL && @@ -205,7 +205,7 @@ ChapLowerUp(unit) int unit; { chap_state *cstate = &chap[unit]; - + if (cstate->clientstate == CHAPCS_INITIAL) cstate->clientstate = CHAPCS_CLOSED; else if (cstate->clientstate == CHAPCS_PENDING) @@ -231,7 +231,7 @@ ChapLowerDown(unit) int unit; { chap_state *cstate = &chap[unit]; - + /* Timeout(s) pending? Cancel if so. */ if (cstate->serverstate == CHAPSS_INITIAL_CHAL || cstate->serverstate == CHAPSS_RECHALLENGE) @@ -279,7 +279,7 @@ ChapInput(unit, inpacket, packet_len) u_char *inp; u_char code, id; int len; - + /* * Parse header (code, id and length). * If packet too short, drop it. @@ -301,7 +301,7 @@ ChapInput(unit, inpacket, packet_len) return; } len -= CHAP_HEADERLEN; - + /* * Action depends on code (as in fact it usually does :-). */ @@ -309,11 +309,11 @@ ChapInput(unit, inpacket, packet_len) case CHAP_CHALLENGE: ChapReceiveChallenge(cstate, inp, id, len); break; - + case CHAP_RESPONSE: ChapReceiveResponse(cstate, inp, id, len); break; - + case CHAP_FAILURE: ChapReceiveFailure(cstate, inp, id, len); break; @@ -345,7 +345,7 @@ ChapReceiveChallenge(cstate, inp, id, len) char secret[MAXSECRETLEN]; char rhostname[256]; MD5_CTX mdContext; - + CHAPDEBUG((LOG_INFO, "ChapReceiveChallenge: Rcvd id %d.", id)); if (cstate->clientstate == CHAPCS_CLOSED || cstate->clientstate == CHAPCS_PENDING) { @@ -392,7 +392,7 @@ ChapReceiveChallenge(cstate, inp, id, len) cstate->resp_transmits = 0; /* generate MD based on negotiated type */ - switch (cstate->resp_type) { + switch (cstate->resp_type) { case CHAP_DIGEST_MD5: /* only MD5 is defined for now */ MD5Init(&mdContext); @@ -494,7 +494,7 @@ ChapReceiveResponse(cstate, inp, id, len) } else { /* generate MD based on negotiated type */ - switch (cstate->chal_type) { + switch (cstate->chal_type) { case CHAP_DIGEST_MD5: /* only MD5 is defined for now */ if (remmd_len != MD5_SIGNATURE_SIZE) @@ -503,7 +503,7 @@ ChapReceiveResponse(cstate, inp, id, len) MD5Update(&mdContext, &cstate->chal_id, 1); MD5Update(&mdContext, secret, secret_len); MD5Update(&mdContext, cstate->challenge, cstate->chal_len); - MD5Final(&mdContext); + MD5Final(&mdContext); /* compare local and remote MDs and send the appropriate status */ if (bcmp (mdContext.digest, remmd, MD5_SIGNATURE_SIZE) == 0) @@ -583,7 +583,7 @@ ChapReceiveFailure(cstate, inp, id, len) { u_char msglen; u_char *msg; - + CHAPDEBUG((LOG_INFO, "ChapReceiveFailure: Rcvd id %d.", id)); if (cstate->clientstate != CHAPCS_RESPONSE) { @@ -635,7 +635,7 @@ ChapSendChallenge(cstate) BCOPY(cstate->chal_name, outp, name_len); /* append hostname */ output(cstate->unit, outpacket_buf, outlen + DLLHEADERLEN); - + CHAPDEBUG((LOG_INFO, "ChapSendChallenge: Sent id %d.", cstate->chal_id)); TIMEOUT(ChapChallengeTimeout, (caddr_t) cstate, cstate->timeouttime); @@ -665,13 +665,13 @@ ChapSendStatus(cstate, code) outp = outpacket_buf; MAKEHEADER(outp, CHAP); /* paste in a header */ - + PUTCHAR(code, outp); PUTCHAR(cstate->chal_id, outp); PUTSHORT(outlen, outp); BCOPY(msg, outp, msglen); output(cstate->unit, outpacket_buf, outlen + DLLHEADERLEN); - + CHAPDEBUG((LOG_INFO, "ChapSendStatus: Sent code %d, id %d.", code, cstate->chal_id)); } @@ -691,8 +691,8 @@ ChapGenChallenge(cstate) u_char *ptr = cstate->challenge; unsigned int i; - /* pick a random challenge length between MIN_CHALLENGE_LENGTH and - MAX_CHALLENGE_LENGTH */ + /* pick a random challenge length between MIN_CHALLENGE_LENGTH and + MAX_CHALLENGE_LENGTH */ chal_len = (unsigned) ((drand48() * (MAX_CHALLENGE_LENGTH - MIN_CHALLENGE_LENGTH)) + MIN_CHALLENGE_LENGTH); diff --git a/usr.sbin/pppd/fsm.c b/usr.sbin/pppd/fsm.c index 902ad64..4e05873 100644 --- a/usr.sbin/pppd/fsm.c +++ b/usr.sbin/pppd/fsm.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: fsm.c,v 1.3 1994/05/24 11:21:10 paulus Exp $"; +static char rcsid[] = "$Id: fsm.c,v 1.2 1994/09/25 02:31:57 wollman Exp $"; #endif /* @@ -330,28 +330,28 @@ fsm_input(f, inpacket, l) case CONFREQ: fsm_rconfreq(f, id, inp, len); break; - + case CONFACK: fsm_rconfack(f, id, inp, len); break; - + case CONFNAK: case CONFREJ: fsm_rconfnakrej(f, code, id, inp, len); break; - + case TERMREQ: fsm_rtermreq(f, id); break; - + case TERMACK: fsm_rtermack(f); break; - + case CODEREJ: fsm_rcoderej(f, inp, len); break; - + default: if( !f->callbacks->extcode || !(*f->callbacks->extcode)(f, code, id, inp, len) ) diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c index 6c9abb1..2508cdc 100644 --- a/usr.sbin/pppd/ipcp.c +++ b/usr.sbin/pppd/ipcp.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: ipcp.c,v 1.8 1994/05/26 06:37:34 paulus Exp $"; +static char rcsid[] = "$Id: ipcp.c,v 1.2 1994/09/25 02:31:59 wollman Exp $"; #endif /* @@ -734,7 +734,7 @@ ipcp_reqci(f, inp, len, reject_if_disagree) * Reset all his options. */ BZERO(ho, sizeof(*ho)); - + /* * Process all his options. */ @@ -837,11 +837,11 @@ ipcp_reqci(f, inp, len, reject_if_disagree) PUTLONG(tl, p); } } - + ho->neg_addr = 1; ho->hisaddr = ciaddr1; break; - + case CI_COMPRESSTYPE: IPCPDEBUG((LOG_INFO, "ipcp: received COMPRESSTYPE ")); if (!ao->neg_vj || @@ -862,7 +862,7 @@ ipcp_reqci(f, inp, len, reject_if_disagree) ho->vj_protocol = cishort; if (cilen == CILEN_VJ) { GETCHAR(maxslotindex, p); - if (maxslotindex > ao->maxslotindex) { + if (maxslotindex > ao->maxslotindex) { orc = CONFNAK; if (!reject_if_disagree){ DECPTR(1, p); @@ -1019,7 +1019,7 @@ ipcp_up(f) } /* assign a default route through the interface if required */ - if (ipcp_wantoptions[f->unit].default_route) + if (ipcp_wantoptions[f->unit].default_route) if (sifdefaultroute(f->unit, ho->hisaddr)) go->default_route = 1; @@ -1055,7 +1055,7 @@ ipcp_down(f) hisaddr = ipcp_hisoptions[f->unit].hisaddr; if (ipcp_gotoptions[f->unit].proxy_arp) cifproxyarp(f->unit, hisaddr); - if (ipcp_gotoptions[f->unit].default_route) + if (ipcp_gotoptions[f->unit].default_route) cifdefaultroute(f->unit, hisaddr); sifdown(f->unit); cifaddr(f->unit, ouraddr, hisaddr); diff --git a/usr.sbin/pppd/ipcp.h b/usr.sbin/pppd/ipcp.h index 2d1988d..393c9af 100644 --- a/usr.sbin/pppd/ipcp.h +++ b/usr.sbin/pppd/ipcp.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ipcp.h,v 1.3 1994/04/18 04:05:15 paulus Exp $ + * $Id: ipcp.h,v 1.2 1994/09/25 02:32:00 wollman Exp $ */ /* @@ -35,7 +35,7 @@ #define IPCP_VJ_COMP 0x002d /* current value for VJ compression option*/ #define IPCP_VJ_COMP_OLD 0x0037 /* "old" (i.e, broken) value for VJ */ - /* compression option*/ + /* compression option*/ typedef struct ipcp_options { int neg_addr : 1; /* Negotiate IP Address? */ diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c index 2581518..c642961 100644 --- a/usr.sbin/pppd/lcp.c +++ b/usr.sbin/pppd/lcp.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: lcp.c,v 1.8 1994/05/30 02:38:49 paulus Exp $"; +static char rcsid[] = "$Id: lcp.c,v 1.2 1994/09/25 02:32:01 wollman Exp $"; #endif /* @@ -275,7 +275,7 @@ lcp_extcode(f, code, id, inp, len) case PROTREJ: lcp_rprotrej(f, inp, len); break; - + case ECHOREQ: if (f->state != OPENED) break; @@ -286,7 +286,7 @@ lcp_extcode(f, code, id, inp, len) len = CILEN_LONG; fsm_sdata(f, ECHOREP, id, inp, len); break; - + case ECHOREP: lcp_received_echo_reply(f, id, inp, len); break; @@ -300,7 +300,7 @@ lcp_extcode(f, code, id, inp, len) return 1; } - + /* * lcp_rprotrej - Receive an Protocol-Reject. * @@ -1601,7 +1601,7 @@ LcpSendEchoRequest (f) : 0L; pktp = pkt; PUTLONG(lcp_magic, pktp); - + fsm_sdata(f, ECHOREQ, lcp_echo_number++ & 0xFF, pkt, pktp - pkt); } @@ -1621,7 +1621,7 @@ lcp_echo_lowerup (unit) lcp_echos_pending = 0; lcp_echo_number = 0; lcp_echo_timer_running = 0; - + /* If a timeout interval is specified then start the timer */ if (lcp_echo_interval != 0) LcpEchoCheck (f); diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c index 707773f..946e4d1 100644 --- a/usr.sbin/pppd/main.c +++ b/usr.sbin/pppd/main.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: main.c,v 1.2 1994/09/25 02:32:07 wollman Exp $"; +static char rcsid[] = "$Id: main.c,v 1.3 1995/04/29 13:55:34 ache Exp $"; #endif #define SETSID @@ -205,7 +205,7 @@ main(argc, argv) p = ttyname(0); if (p) strcpy(devname, p); - + if (gethostname(hostname, MAXNAMELEN) < 0 ) { perror("couldn't get hostname"); die(1); @@ -228,7 +228,7 @@ main(argc, argv) */ for (i = 0; i < N_PROTO; i++) (*prottbl[i].init)(0); - + progname = *argv; if (!options_from_file(_PATH_SYSOPTIONS, REQ_SYSOPTIONS, 0) || @@ -322,7 +322,7 @@ main(argc, argv) syslog(LOG_ERR, "socket : %m"); die(1); } - + /* * Compute mask of all interesting signals and install signal handlers * for each. Only one signal handler may be active at a time. Therefore, @@ -411,7 +411,7 @@ main(argc, argv) syslog(LOG_INFO, "Connected..."); sleep(1); /* give it time to set up its terminal */ } - + /* set line speed, flow control, etc.; clear CLOCAL if modem option */ set_up_tty(fd, 0); @@ -473,7 +473,7 @@ main(argc, argv) syslog(LOG_ERR, "fcntl(F_SETFL, FNDELAY | FASYNC): %m"); die(1); } - + /* * Block all signals, start opening the connection, and wait for * incoming signals (reply, timeout, etc.). @@ -732,7 +732,7 @@ int fd, on; /* * quit - Clean up state and exit. */ -void +void quit() { die(0); @@ -784,7 +784,7 @@ cleanup(status, arg) fd = -1; } - if (pidfilename[0] != 0 && unlink(pidfilename) < 0) + if (pidfilename[0] != 0 && unlink(pidfilename) < 0) syslog(LOG_WARNING, "unable to unlink pid file: %m"); pidfilename[0] = 0; @@ -810,10 +810,10 @@ timeout(func, arg, time) { struct itimerval itv; struct callout *newp, **oldpp; - + MAINDEBUG((LOG_DEBUG, "Timeout %x:%x in %d seconds.", (int) func, (int) arg, time)); - + /* * Allocate timeout. */ @@ -823,7 +823,7 @@ timeout(func, arg, time) } newp->c_arg = arg; newp->c_func = func; - + /* * Find correct place to link it in and decrement its time by the * amount of time used by preceding timeouts. @@ -837,7 +837,7 @@ timeout(func, arg, time) if (*oldpp) (*oldpp)->c_time -= time; *oldpp = newp; - + /* * If this is now the first callout then we have to set a new * itimer. @@ -871,9 +871,9 @@ untimeout(func, arg) struct itimerval itv; struct callout **copp, *freep; int reschedule = 0; - + MAINDEBUG((LOG_DEBUG, "Untimeout %x:%x.", (int) func, (int) arg)); - + /* * If the first callout is unscheduled then we have to set a new * itimer. @@ -882,7 +882,7 @@ untimeout(func, arg) callout->c_func == func && callout->c_arg == arg) reschedule = 1; - + /* * Find first matching timeout. Add its time to the next timeouts * time. @@ -897,7 +897,7 @@ untimeout(func, arg) (void) free((char *) freep); break; } - + if (reschedule) { itv.it_interval.tv_sec = itv.it_interval.tv_usec = itv.it_value.tv_usec = 0; @@ -925,7 +925,7 @@ adjtimeout() { struct timeval tv; int timediff; - + if (callout == NULL) return; /* @@ -941,7 +941,7 @@ adjtimeout() if (timediff < 0 || timediff > callout->c_time + 1) return; - + callout->c_time -= timediff; /* OK, Adjust time */ } @@ -1052,7 +1052,7 @@ alrm(sig) list = list->c_next; (void) free((char *) freep); } - + } diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c index 14dc3c2..b0ec67c 100644 --- a/usr.sbin/pppd/options.c +++ b/usr.sbin/pppd/options.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: options.c,v 1.2 1994/09/25 02:32:08 wollman Exp $"; +static char rcsid[] = "$Id: options.c,v 1.3 1995/05/24 01:56:52 davidg Exp $"; #endif #include <stdio.h> @@ -940,7 +940,7 @@ setconnector(argv) connector = strdup(*argv); if (connector == NULL) novm("connector string"); - + return (1); } @@ -954,13 +954,13 @@ setdisconnector(argv) disconnector = strdup(*argv); if (disconnector == NULL) novm("disconnector string"); - + return (1); } /* - * setdomain - Set domain name to append to hostname + * setdomain - Set domain name to append to hostname */ static int setdomain(argv) @@ -1048,7 +1048,7 @@ setdevname(cp) struct stat statbuf; char *tty, *ttyname(); char dev[MAXPATHLEN]; - + if (strncmp("/dev/", cp, 5) != 0) { strcpy(dev, "/dev/"); strncat(dev, cp, MAXPATHLEN - 5); @@ -1065,11 +1065,11 @@ setdevname(cp) syslog(LOG_ERR, cp); return -1; } - + (void) strncpy(devname, cp, MAXPATHLEN); devname[MAXPATHLEN-1] = 0; default_device = FALSE; - + return 1; } @@ -1085,13 +1085,13 @@ setipaddr(arg) char *colon, *index(); u_long local, remote; ipcp_options *wo = &ipcp_wantoptions[0]; - + /* * IP address pair separated by ":". */ if ((colon = index(arg, ':')) == NULL) return 0; - + /* * If colon first character, then no local addr. */ @@ -1117,7 +1117,7 @@ setipaddr(arg) wo->ouraddr = local; *colon = ':'; } - + /* * If colon last character, then no remote addr. */ @@ -1229,7 +1229,7 @@ setnetmask(argv) /* * Return user specified netmask. A value of zero means no netmask has - * been set. + * been set. */ /* ARGSUSED */ u_long diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h index e38687d..ddacee5 100644 --- a/usr.sbin/pppd/pppd.h +++ b/usr.sbin/pppd/pppd.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: pppd.h,v 1.3 1994/05/26 06:43:42 paulus Exp $ + * $Id: pppd.h,v 1.2 1994/09/25 02:32:13 wollman Exp $ */ /* @@ -154,7 +154,7 @@ u_long GetMask __ARGS((u_long)); /* get netmask for address */ #ifndef LOG_PPP /* we use LOG_LOCAL2 for syslog by default */ #if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUG) \ || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \ - || defined(DEBUGCHAP) + || defined(DEBUGCHAP) #define LOG_PPP LOG_LOCAL2 #else #define LOG_PPP LOG_DAEMON diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c index 65c0b77..6473151 100644 --- a/usr.sbin/pppd/sys-bsd.c +++ b/usr.sbin/pppd/sys-bsd.c @@ -19,7 +19,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: sys-bsd.c,v 1.7 1994/05/30 06:10:07 paulus Exp $"; +static char rcsid[] = "$Id: sys-bsd.c,v 1.2 1994/09/25 02:32:15 wollman Exp $"; #endif /* @@ -71,7 +71,7 @@ establish_ppp() /* * Find out which interface we were given. */ - if (ioctl(fd, PPPIOCGUNIT, &ifunit) < 0) { + if (ioctl(fd, PPPIOCGUNIT, &ifunit) < 0) { syslog(LOG_ERR, "ioctl(PPPIOCGUNIT): %m"); die(1); } diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c index 61d22ac..14b2e76 100644 --- a/usr.sbin/pppd/upap.c +++ b/usr.sbin/pppd/upap.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: upap.c,v 1.2 1994/04/11 07:13:44 paulus Exp $"; +static char rcsid[] = "$Id: upap.c,v 1.2 1994/09/25 02:32:16 wollman Exp $"; #endif /* @@ -434,7 +434,7 @@ upap_sauthreq(u) outlen = UPAP_HEADERLEN + 2 * sizeof (u_char) + u->us_userlen + u->us_passwdlen; outp = outpacket_buf; - + MAKEHEADER(outp, UPAP); PUTCHAR(UPAP_AUTHREQ, outp); |
