* 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.11 2001/03/08 05:11:10 paulus Exp $"
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <sys/time.h>
-#include <syslog.h>
#include "pppd.h"
#include "cbcp.h"
#include "fsm.h"
#include "lcp.h"
-#include "ipcp.h"
+
+static const char rcsid[] = RCSID;
/*
* Options.
static option_t cbcp_option_list[] = {
{ "callback", o_special, setcbcp,
- "Ask for callback" },
+ "Ask for callback", OPT_PRIO | OPT_A2STRVAL, &cbcp[0].us_number },
{ NULL }
};
NULL,
0,
"CBCP",
- cbcp_option_list,
NULL,
+ cbcp_option_list,
NULL,
NULL,
NULL
{
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 */
inp = inpacket;
if (pktlen < CBCP_MINLEN) {
- syslog(LOG_ERR, "CBCP packet is too small");
+ error("CBCP packet is too small");
return;
}
#if 0
if (len > pktlen) {
- syslog(LOG_ERR, "CBCP packet: invalid length");
+ error("CBCP packet: invalid length");
return;
}
#endif
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);
address[0] = 0;
while (len) {
- syslog(LOG_DEBUG, "length: %d", len);
+ dbglog("length: %d", len);
GETCHAR(type, pckt);
GETCHAR(opt_len, pckt);
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:
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)
#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);
}
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);
}
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();
return;
}
}
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)
{
persist = 0;
lcp_close(0, "Call me back, please");
+ status = EXIT_CALLBACK;
}