X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fcbcp.c;h=abe6253fe78222f22b996d00daa4319df1ce37f3;hp=8add25f09b63887d6e793699afafb6b154530e9f;hb=19872c62b8c5c5f77a4db07e52852f6bd22d4f75;hpb=50f06d79e6f4c457a68929df21d4c71b9d2dade1 diff --git a/pppd/cbcp.c b/pppd/cbcp.c index 8add25f..abe6253 100644 --- a/pppd/cbcp.c +++ b/pppd/cbcp.c @@ -18,21 +18,19 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static char rcsid[] = "$Id: cbcp.c,v 1.4 1999/03/02 05:34:16 paulus Exp $"; -#endif +#define RCSID "$Id: cbcp.c,v 1.13 2002/09/18 02:49:46 carlsonj Exp $" #include #include #include #include -#include #include "pppd.h" #include "cbcp.h" #include "fsm.h" #include "lcp.h" -#include "ipcp.h" + +static const char rcsid[] = RCSID; /* * Options. @@ -40,8 +38,8 @@ static char rcsid[] = "$Id: cbcp.c,v 1.4 1999/03/02 05:34:16 paulus Exp $"; static int setcbcp __P((char **)); static option_t cbcp_option_list[] = { - { "callback", o_special, setcbcp, - "Ask for callback" }, + { "callback", o_special, (void *)setcbcp, + "Ask for callback", OPT_PRIO | OPT_A2STRVAL, &cbcp[0].us_number }, { NULL } }; @@ -70,8 +68,8 @@ struct protent cbcp_protent = { NULL, 0, "CBCP", - cbcp_option_list, NULL, + cbcp_option_list, NULL, NULL, NULL @@ -81,11 +79,11 @@ cbcp_state cbcp[NUM_PPP]; /* internal prototypes */ -static void cbcp_recvreq __P((cbcp_state *us, char *pckt, int len)); +static void cbcp_recvreq __P((cbcp_state *us, u_char *pckt, int len)); static void cbcp_resp __P((cbcp_state *us)); static void cbcp_up __P((cbcp_state *us)); -static void cbcp_recvack __P((cbcp_state *us, char *pckt, int len)); -static void cbcp_send __P((cbcp_state *us, u_char code, u_char *buf, int len)); +static void cbcp_recvack __P((cbcp_state *us, u_char *pckt, int len)); +static void cbcp_send __P((cbcp_state *us, int code, u_char *buf, int len)); /* option processing */ static int @@ -122,18 +120,18 @@ cbcp_lowerup(iface) { cbcp_state *us = &cbcp[iface]; - syslog(LOG_DEBUG, "cbcp_lowerup"); - syslog(LOG_DEBUG, "want: %d", us->us_type); + dbglog("cbcp_lowerup"); + dbglog("want: %d", us->us_type); if (us->us_type == CB_CONF_USER) - syslog(LOG_DEBUG, "phone no: %s", us->us_number); + dbglog("phone no: %s", us->us_number); } static void cbcp_open(unit) int unit; { - syslog(LOG_DEBUG, "cbcp_open"); + dbglog("cbcp_open"); } /* process an incomming packet */ @@ -152,7 +150,7 @@ cbcp_input(unit, inpacket, pktlen) inp = inpacket; if (pktlen < CBCP_MINLEN) { - syslog(LOG_ERR, "CBCP packet is too small"); + error("CBCP packet is too small"); return; } @@ -162,7 +160,7 @@ cbcp_input(unit, inpacket, pktlen) #if 0 if (len > pktlen) { - syslog(LOG_ERR, "CBCP packet: invalid length"); + error("CBCP packet: invalid length"); return; } #endif @@ -176,12 +174,12 @@ cbcp_input(unit, inpacket, pktlen) break; case CBCP_RESP: - syslog(LOG_DEBUG, "CBCP_RESP received"); + dbglog("CBCP_RESP received"); break; case CBCP_ACK: if (id != us->us_id) - syslog(LOG_DEBUG, "id doesn't match: expected %d recv %d", + dbglog("id doesn't match: expected %d recv %d", us->us_id, id); cbcp_recvack(us, inp, len); @@ -271,8 +269,8 @@ cbcp_printpkt(p, plen, printer, arg) printer(arg, " number = %s", str); } printer(arg, ">"); - break; } + break; default: break; @@ -290,7 +288,7 @@ cbcp_printpkt(p, plen, printer, arg) static void cbcp_recvreq(us, pckt, pcktlen) cbcp_state *us; - char *pckt; + u_char *pckt; int pcktlen; { u_char type, opt_len, delay, addr_type; @@ -300,7 +298,7 @@ cbcp_recvreq(us, pckt, pcktlen) address[0] = 0; while (len) { - syslog(LOG_DEBUG, "length: %d", len); + dbglog("length: %d", len); GETCHAR(type, pckt); GETCHAR(opt_len, pckt); @@ -312,22 +310,22 @@ cbcp_recvreq(us, pckt, pcktlen) switch(type) { case CB_CONF_NO: - syslog(LOG_DEBUG, "no callback allowed"); + dbglog("no callback allowed"); break; case CB_CONF_USER: - syslog(LOG_DEBUG, "user callback allowed"); + dbglog("user callback allowed"); if (opt_len > 4) { GETCHAR(addr_type, pckt); memcpy(address, pckt, opt_len - 4); address[opt_len - 4] = 0; if (address[0]) - syslog(LOG_DEBUG, "address: %s", address); + dbglog("address: %s", address); } break; case CB_CONF_ADMIN: - syslog(LOG_DEBUG, "user admin defined allowed"); + dbglog("user admin defined allowed"); break; case CB_CONF_LIST: @@ -349,7 +347,7 @@ cbcp_resp(us) int len = 0; cb_type = us->us_allowed & us->us_type; - syslog(LOG_DEBUG, "cbcp_resp cb_type=%d", cb_type); + dbglog("cbcp_resp cb_type=%d", cb_type); #if 0 if (!cb_type) @@ -357,7 +355,7 @@ cbcp_resp(us) #endif if (cb_type & ( 1 << CB_CONF_USER ) ) { - syslog(LOG_DEBUG, "cbcp_resp CONF_USER"); + dbglog("cbcp_resp CONF_USER"); PUTCHAR(CB_CONF_USER, bufp); len = 3 + 1 + strlen(us->us_number) + 1; PUTCHAR(len , bufp); @@ -369,7 +367,7 @@ cbcp_resp(us) } if (cb_type & ( 1 << CB_CONF_ADMIN ) ) { - syslog(LOG_DEBUG, "cbcp_resp CONF_ADMIN"); + dbglog("cbcp_resp CONF_ADMIN"); PUTCHAR(CB_CONF_ADMIN, bufp); len = 3; PUTCHAR(len, bufp); @@ -379,13 +377,13 @@ cbcp_resp(us) } if (cb_type & ( 1 << CB_CONF_NO ) ) { - syslog(LOG_DEBUG, "cbcp_resp CONF_NO"); + dbglog("cbcp_resp CONF_NO"); PUTCHAR(CB_CONF_NO, bufp); len = 3; PUTCHAR(len , bufp); PUTCHAR(0, bufp); cbcp_send(us, CBCP_RESP, buf, len); - (*ipcp_protent.open)(us->us_unit); + start_networks(us->us_unit); return; } } @@ -393,7 +391,7 @@ cbcp_resp(us) static void cbcp_send(us, code, buf, len) cbcp_state *us; - u_char code; + int code; u_char *buf; int len; { @@ -419,7 +417,7 @@ cbcp_send(us, code, buf, len) static void cbcp_recvack(us, pckt, len) cbcp_state *us; - char *pckt; + u_char *pckt; int len; { u_char type, delay, addr_type; @@ -438,15 +436,15 @@ cbcp_recvack(us, pckt, len) memcpy(address, pckt, opt_len - 4); address[opt_len - 4] = 0; if (address[0]) - syslog(LOG_DEBUG, "peer will call: %s", address); + dbglog("peer will call: %s", address); } + if (type == CB_CONF_NO) + return; } cbcp_up(us); } -extern int persist; - /* ok peer will do callback */ static void cbcp_up(us) @@ -454,4 +452,5 @@ cbcp_up(us) { persist = 0; lcp_close(0, "Call me back, please"); + status = EXIT_CALLBACK; }