* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#define RCSID "$Id: main.c,v 1.105 2001/03/12 22:58:59 paulus Exp $"
+#define RCSID "$Id: main.c,v 1.107 2001/05/23 03:39:13 paulus Exp $"
#include <stdio.h>
#include <ctype.h>
* Start opening the connection and wait for
* incoming events (reply, timeout, etc.).
*/
- notice("Connect: %s <--> %s", ifname, ppp_devnam);
+ if (ifunit >= 0)
+ notice("Connect: %s <--> %s", ifname, ppp_devnam);
+ else
+ notice("Starting negotiation on %s", ppp_devnam);
gettimeofday(&start_time, NULL);
link_stats_valid = 0;
script_unsetenv("CONNECT_TIME");
return;
}
- if (debug /*&& (debugflags & DBG_INPACKET)*/)
- dbglog("rcvd %P", p, len);
-
if (len < PPP_HDRLEN) {
- MAINDEBUG(("io(): Received short packet."));
+ dbglog("received short packet:%.*B", len, p);
return;
}
+ dump_packet("rcvd", p, len);
+
p += 2; /* Skip address and control */
GETSHORT(protocol, p);
len -= PPP_HDRLEN;
/*
* timeout - Schedule a timeout.
- *
- * Note that this timeout takes the number of milliseconds, NOT hz (as in
- * the kernel).
*/
void
timeout(func, arg, secs, usecs)
int secs, usecs;
{
struct callout *newp, *p, **pp;
-
+
MAINDEBUG(("Timeout %p:%p in %d.%03d seconds.", func, arg,
- time / 1000, time % 1000));
-
+ secs, usecs/1000));
+
/*
* Allocate timeout.
*/