diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2013-06-14 22:34:19 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2013-06-14 22:34:19 +0400 |
| commit | 4692715663ae0c793cd754db95b91bb80521d5a2 (patch) | |
| tree | 54d185c590f001b45d49af2bbb51ef38992b01af | |
| parent | e469853f88614a50fd4a1b05f6b0e5ec5a61883f (diff) | |
| parent | ad1ad25dd4b07a8dbef3f1deefb1bd710cfcc74e (diff) | |
| download | accel-ppp-4692715663ae0c793cd754db95b91bb80521d5a2.tar.gz accel-ppp-4692715663ae0c793cd754db95b91bb80521d5a2.zip | |
Merge branch '1.7' of ssh://git.code.sf.net/p/accel-ppp/code into 1.7
| -rw-r--r-- | accel-pppd/ppp/ppp_fsm.h | 1 | ||||
| -rw-r--r-- | accel-pppd/ppp/ppp_lcp.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/accel-pppd/ppp/ppp_fsm.h b/accel-pppd/ppp/ppp_fsm.h index 7b7474b3..95da7b63 100644 --- a/accel-pppd/ppp/ppp_fsm.h +++ b/accel-pppd/ppp/ppp_fsm.h @@ -15,6 +15,7 @@ typedef enum {FSM_Initial=0,FSM_Starting,FSM_Closed,FSM_Stopped,FSM_Closing,FSM_ #define PROTOREJ 8 /* Code Reject */ #define ECHOREQ 9 /* Echo Request */ #define ECHOREP 10 /* Echo Reply */ +#define DISCARDREQ 11 /* Discard Request */ #define IDENT 12 /* Identification */ struct ppp_t; diff --git a/accel-pppd/ppp/ppp_lcp.c b/accel-pppd/ppp/ppp_lcp.c index 7a071dde..bcfce121 100644 --- a/accel-pppd/ppp/ppp_lcp.c +++ b/accel-pppd/ppp/ppp_lcp.c @@ -862,6 +862,10 @@ static void lcp_recv(struct ppp_handler_t*h) log_ppp_info2("recv [LCP ProtoRej id=%x <%04x>]\n", hdr->id, ntohs(*(uint16_t*)(hdr + 1))); ppp_recv_proto_rej(lcp->ppp, ntohs(*(uint16_t *)(hdr + 1))); break; + case DISCARDREQ: + if (conf_ppp_verbose) + log_ppp_info2("recv [LCP DiscardReq id=%x <magic %08x>]\n", hdr->id, ntohl(*(uint32_t*)(hdr + 1))); + break; case IDENT: if (conf_ppp_verbose) { term_msg = _strndup((char*)(hdr + 1) + 4, ntohs(hdr->len) - 4 - 4); |