summaryrefslogtreecommitdiffstats
path: root/c/src/libnetworking/pppd/fsm.c
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/libnetworking/pppd/fsm.c')
-rw-r--r--c/src/libnetworking/pppd/fsm.c78
1 files changed, 21 insertions, 57 deletions
diff --git a/c/src/libnetworking/pppd/fsm.c b/c/src/libnetworking/pppd/fsm.c
index 0d50b35c6c..07a8c11f1d 100644
--- a/c/src/libnetworking/pppd/fsm.c
+++ b/c/src/libnetworking/pppd/fsm.c
@@ -17,10 +17,8 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-/* static char rcsid[] = "$Id$"; */
-#endif
-#define log_packet(p, len, prefix, level)
+#define RCSID "$Id$"
+
/*
* TODO:
* Randomize fsm id on link/init.
@@ -30,11 +28,12 @@
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
-#include <syslog.h>
#include "pppd.h"
#include "fsm.h"
+static const char rcsid[] = RCSID;
+
static void fsm_timeout __P((void *));
static void fsm_rconfreq __P((fsm *, int, u_char *, int));
static void fsm_rconfack __P((fsm *, int, u_char *, int));
@@ -92,8 +91,7 @@ fsm_lowerup(f)
break;
default:
- FSMDEBUG((LOG_INFO, "%s: Up event in state %d!",
- PROTO_NAME(f), f->state));
+ FSMDEBUG(("%s: Up event in state %d!", PROTO_NAME(f), f->state));
}
}
@@ -138,8 +136,7 @@ fsm_lowerdown(f)
break;
default:
- FSMDEBUG((LOG_INFO, "%s: Down event in state %d!",
- PROTO_NAME(f), f->state));
+ FSMDEBUG(("%s: Down event in state %d!", PROTO_NAME(f), f->state));
}
}
@@ -260,8 +257,7 @@ fsm_timeout(arg)
case ACKRCVD:
case ACKSENT:
if (f->retransmits <= 0) {
- syslog(LOG_WARNING, "%s: timeout sending Config-Requests",
- PROTO_NAME(f));
+ warn("%s: timeout sending Config-Requests\n", PROTO_NAME(f));
f->state = STOPPED;
if( (f->flags & OPT_PASSIVE) == 0 && f->callbacks->finished )
(*f->callbacks->finished)(f);
@@ -277,8 +273,7 @@ fsm_timeout(arg)
break;
default:
- FSMDEBUG((LOG_INFO, "%s: Timeout event in state %d!",
- PROTO_NAME(f), f->state));
+ FSMDEBUG(("%s: Timeout event in state %d!", PROTO_NAME(f), f->state));
}
}
@@ -302,27 +297,24 @@ fsm_input(f, inpacket, l)
*/
inp = inpacket;
if (l < HEADERLEN) {
- FSMDEBUG((LOG_WARNING, "fsm_input(%x): Rcvd short header.",
- f->protocol));
+ FSMDEBUG(("fsm_input(%x): Rcvd short header.", f->protocol));
return;
}
GETCHAR(code, inp);
GETCHAR(id, inp);
GETSHORT(len, inp);
if (len < HEADERLEN) {
- FSMDEBUG((LOG_INFO, "fsm_input(%x): Rcvd illegal length.",
- f->protocol));
+ FSMDEBUG(("fsm_input(%x): Rcvd illegal length.", f->protocol));
return;
}
if (len > l) {
- FSMDEBUG((LOG_INFO, "fsm_input(%x): Rcvd short packet.",
- f->protocol));
+ FSMDEBUG(("fsm_input(%x): Rcvd short packet.", f->protocol));
return;
}
len -= HEADERLEN; /* subtract header length */
if( f->state == INITIAL || f->state == STARTING ){
- FSMDEBUG((LOG_INFO, "fsm_input(%x): Rcvd packet in state %d.",
+ FSMDEBUG(("fsm_input(%x): Rcvd packet in state %d.",
f->protocol, f->state));
return;
}
@@ -371,13 +363,12 @@ fsm_input(f, inpacket, l)
static void
fsm_rconfreq(f, id, inp, len)
fsm *f;
- int id;
+ u_char id;
u_char *inp;
int len;
{
int code, reject_if_disagree;
- FSMDEBUG((LOG_INFO, "fsm_rconfreq(%s): Rcvd id %d.", PROTO_NAME(f), id));
switch( f->state ){
case CLOSED:
/* Go away, we're closed */
@@ -446,17 +437,12 @@ fsm_rconfack(f, id, inp, len)
u_char *inp;
int len;
{
- FSMDEBUG((LOG_INFO, "fsm_rconfack(%s): Rcvd id %d.",
- PROTO_NAME(f), id));
-
if (id != f->reqid || f->seen_ack) /* Expected id? */
return; /* Nope, toss... */
if( !(f->callbacks->ackci? (*f->callbacks->ackci)(f, inp, len):
(len == 0)) ){
/* Ack is bad - ignore it */
- log_packet(inp, len, "Received bad configure-ack: ", LOG_ERR);
- FSMDEBUG((LOG_INFO, "%s: received bad Ack (length %d)",
- PROTO_NAME(f), len));
+ error("Received bad configure-ack: %P", inp, len);
return;
}
f->seen_ack = 1;
@@ -511,17 +497,12 @@ fsm_rconfnakrej(f, code, id, inp, len)
int (*proc) __P((fsm *, u_char *, int));
int ret;
- FSMDEBUG((LOG_INFO, "fsm_rconfnakrej(%s): Rcvd id %d.",
- PROTO_NAME(f), id));
-
if (id != f->reqid || f->seen_ack) /* Expected id? */
return; /* Nope, toss... */
proc = (code == CONFNAK)? f->callbacks->nakci: f->callbacks->rejci;
if (!proc || !(ret = proc(f, inp, len))) {
/* Nak/reject is bad - ignore it */
- log_packet(inp, len, "Received bad configure-nak/rej: ", LOG_ERR);
- FSMDEBUG((LOG_INFO, "%s: received bad %s (length %d)",
- PROTO_NAME(f), (code==CONFNAK? "Nak": "reject"), len));
+ error("Received bad configure-nak/rej: %P", inp, len);
return;
}
f->seen_ack = 1;
@@ -570,11 +551,6 @@ fsm_rtermreq(f, id, p, len)
u_char *p;
int len;
{
- char str[80];
-
- FSMDEBUG((LOG_INFO, "fsm_rtermreq(%s): Rcvd id %d.",
- PROTO_NAME(f), id));
-
switch (f->state) {
case ACKRCVD:
case ACKSENT:
@@ -583,10 +559,9 @@ fsm_rtermreq(f, id, p, len)
case OPENED:
if (len > 0) {
- fmtmsg(str, sizeof(str), "%0.*v", len, p);
- syslog(LOG_INFO, "%s terminated by peer (%s)", PROTO_NAME(f), str);
+ info("%s terminated by peer (%0.*v)", PROTO_NAME(f), len, p);
} else
- syslog(LOG_INFO, "%s terminated by peer", PROTO_NAME(f));
+ info("%s terminated by peer", PROTO_NAME(f));
if (f->callbacks->down)
(*f->callbacks->down)(f); /* Inform upper layers */
f->retransmits = 0;
@@ -606,8 +581,6 @@ static void
fsm_rtermack(f)
fsm *f;
{
- FSMDEBUG((LOG_INFO, "fsm_rtermack(%s).", PROTO_NAME(f)));
-
switch (f->state) {
case CLOSING:
UNTIMEOUT(fsm_timeout, f);
@@ -646,16 +619,13 @@ fsm_rcoderej(f, inp, len)
{
u_char code, id;
- FSMDEBUG((LOG_INFO, "fsm_rcoderej(%s).", PROTO_NAME(f)));
-
if (len < HEADERLEN) {
- FSMDEBUG((LOG_INFO, "fsm_rcoderej: Rcvd short Code-Reject packet!"));
+ FSMDEBUG(("fsm_rcoderej: Rcvd short Code-Reject packet!"));
return;
}
GETCHAR(code, inp);
GETCHAR(id, inp);
- syslog(LOG_WARNING, "%s: Rcvd Code-Reject for code %d, id %d",
- PROTO_NAME(f), code, id);
+ warn("%s: Rcvd Code-Reject for code %d, id %d", PROTO_NAME(f), code, id);
if( f->state == ACKRCVD )
f->state = REQSENT;
@@ -708,7 +678,7 @@ fsm_protreject(f)
break;
default:
- FSMDEBUG((LOG_INFO, "%s: Protocol-reject event in state %d!",
+ FSMDEBUG(("%s: Protocol-reject event in state %d!",
PROTO_NAME(f), f->state));
}
}
@@ -759,9 +729,6 @@ fsm_sconfreq(f, retransmit)
/* start the retransmit timer */
--f->retransmits;
TIMEOUT(fsm_timeout, f, f->timeouttime);
-
- FSMDEBUG((LOG_INFO, "%s: sending Configure-Request, id %d",
- PROTO_NAME(f), f->reqid));
}
@@ -773,7 +740,7 @@ fsm_sconfreq(f, retransmit)
void
fsm_sdata(f, code, id, data, datalen)
fsm *f;
- int code, id;
+ u_char code, id;
u_char *data;
int datalen;
{
@@ -792,7 +759,4 @@ fsm_sdata(f, code, id, data, datalen)
PUTCHAR(id, outp);
PUTSHORT(outlen, outp);
output(f->unit, outpacket_buf, outlen + PPP_HDRLEN);
-
- FSMDEBUG((LOG_INFO, "fsm_sdata(%s): Sent code %d, id %d.",
- PROTO_NAME(f), code, id));
}