* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#define RCSID "$Id: main.c,v 1.114 2002/10/10 05:47:34 fcusack Exp $"
+#define RCSID "$Id: main.c,v 1.119 2002/11/02 19:48:12 carlsonj Exp $"
#include <stdio.h>
#include <ctype.h>
#endif
#include "upap.h"
#include "chap.h"
+#include "eap.h"
#include "ccp.h"
#include "ecp.h"
#include "pathnames.h"
static struct timeval start_time; /* Time when link was started. */
struct pppd_stats link_stats;
-int link_connect_time;
+unsigned link_connect_time;
int link_stats_valid;
/*
#ifdef AT_CHANGE
&atcp_protent,
#endif
+ &eap_protent,
NULL
};
* Early check for remote number authorization.
*/
if (!auth_number()) {
- error("remote number %s is not authorized", remote_number);
+ warn("calling number %q is not authorized", remote_number);
exit(EXIT_CNID_AUTH_FAILED);
}
* Toss all non-LCP packets unless LCP is OPEN.
*/
if (protocol != PPP_LCP && lcp_fsm[0].state != OPENED) {
- MAINDEBUG(("get_input: Received non-LCP packet when LCP not open."));
+ dbglog("Discarded non-LCP packet when LCP not open");
return;
}
*/
if (phase <= PHASE_AUTHENTICATE
&& !(protocol == PPP_LCP || protocol == PPP_LQR
- || protocol == PPP_PAP || protocol == PPP_CHAP)) {
- MAINDEBUG(("get_input: discarding proto 0x%x in phase %d",
- protocol, phase));
+ || protocol == PPP_PAP || protocol == PPP_CHAP ||
+ protocol == PPP_EAP)) {
+ dbglog("discarding proto 0x%x in phase %d",
+ protocol, phase);
return;
}
link_connect_time = now.tv_sec - start_time.tv_sec;
link_stats_valid = 1;
- slprintf(numbuf, sizeof(numbuf), "%d", link_connect_time);
+ slprintf(numbuf, sizeof(numbuf), "%u", link_connect_time);
script_setenv("CONNECT_TIME", numbuf, 0);
- slprintf(numbuf, sizeof(numbuf), "%d", link_stats.bytes_out);
+ slprintf(numbuf, sizeof(numbuf), "%u", link_stats.bytes_out);
script_setenv("BYTES_SENT", numbuf, 0);
- slprintf(numbuf, sizeof(numbuf), "%d", link_stats.bytes_in);
+ slprintf(numbuf, sizeof(numbuf), "%u", link_stats.bytes_in);
script_setenv("BYTES_RCVD", numbuf, 0);
}