diff options
| author | Kozlov Dmitry <dima@server> | 2010-10-14 19:12:53 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <dima@server> | 2010-10-14 19:12:53 +0400 |
| commit | 04c623f7a645d0decae6ba73ba19650aaec3c497 (patch) | |
| tree | 5c986653ca593e9de93edeac2b35654d5164c2af /accel-pptpd/ppp/ppp_lcp.c | |
| parent | f2cca0f357cebb8aedc43673809cae396a921c98 (diff) | |
| download | accel-ppp-04c623f7a645d0decae6ba73ba19650aaec3c497.tar.gz accel-ppp-04c623f7a645d0decae6ba73ba19650aaec3c497.zip | |
fixed bug: incorrect handling of mppe ConfNak
improved ccp handling
Diffstat (limited to 'accel-pptpd/ppp/ppp_lcp.c')
| -rw-r--r-- | accel-pptpd/ppp/ppp_lcp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/accel-pptpd/ppp/ppp_lcp.c b/accel-pptpd/ppp/ppp_lcp.c index e5063f3f..c57afedd 100644 --- a/accel-pptpd/ppp/ppp_lcp.c +++ b/accel-pptpd/ppp/ppp_lcp.c @@ -674,7 +674,7 @@ void lcp_send_proto_rej(struct ppp_t *ppp, uint16_t proto) .hdr.code = PROTOREJ, .hdr.id = ++lcp->fsm.id, .hdr.len = htons(6), - .proto = proto, + .proto = ntohs(proto), }; if (conf_ppp_verbose) @@ -775,7 +775,8 @@ static void lcp_recv(struct ppp_handler_t*h) break; case PROTOREJ: if (conf_ppp_verbose) - log_ppp_info("recv [LCP ProtoRej id=%x <%x>]\n", hdr->code, hdr->id, *(uint16_t*)(hdr + 1)); + log_ppp_info("recv [LCP ProtoRej id=%x <%04x>]\n", hdr->code, hdr->id, ntohs(*(uint16_t*)(hdr + 1))); + ppp_recv_proto_rej(lcp->ppp, ntohs(*(uint16_t *)(hdr + 1))); break; case IDENT: if (conf_ppp_verbose) { |