diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2010-09-12 23:13:10 +0400 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2010-09-12 23:13:27 +0400 |
| commit | 65a665f6c655766a6d990e8aba47a811d0c3fecc (patch) | |
| tree | d1dd7a9b01ac49382500fc97de4f69cd713d8952 /accel-pptpd/ppp/ppp_lcp.c | |
| parent | 417ef849f1adcb3b655fbb2382e126b0b17aabbe (diff) | |
| download | accel-ppp-xebd-65a665f6c655766a6d990e8aba47a811d0c3fecc.tar.gz accel-ppp-xebd-65a665f6c655766a6d990e8aba47a811d0c3fecc.zip | |
log: implemented 'log_pgsql' loggin target
lcp: fixed incorrect echo reply
ppp_fsm: fixed incorrect timeout timer initialization
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 3b937d6..b5afb5a 100644 --- a/accel-pptpd/ppp/ppp_lcp.c +++ b/accel-pptpd/ppp/ppp_lcp.c @@ -504,6 +504,7 @@ static void send_echo_reply(struct ppp_lcp_t *lcp) uint32_t magic = *(uint32_t *)(hdr+1); hdr->code=ECHOREP; + *(uint32_t *)(hdr+1) = lcp->magic; log_ppp_debug("send [LCP EchoRep id=%x <magic %x>]\n", hdr->id, magic); ppp_chan_send(lcp->ppp,hdr,ntohs(hdr->len)+2); @@ -606,14 +607,14 @@ static void lcp_recv(struct ppp_handler_t*h) ppp_fsm_recv_conf_rej(&lcp->fsm); break; case TERMREQ: - term_msg=strndup((char*)(hdr+1),ntohs(hdr->len)); + term_msg=strndup((char*)(hdr+1),ntohs(hdr->len)-4); log_ppp_debug("recv [LCP TermReq id=%x \"%s\"]\n",hdr->id,term_msg); free(term_msg); ppp_fsm_recv_term_req(&lcp->fsm); ppp_terminate(lcp->ppp, 0); break; case TERMACK: - term_msg=strndup((char*)(hdr+1),ntohs(hdr->len)); + term_msg=strndup((char*)(hdr+1),ntohs(hdr->len)-4); log_ppp_debug("recv [LCP TermAck id=%x \"%s\"]\n",hdr->id,term_msg); free(term_msg); ppp_fsm_recv_term_ack(&lcp->fsm); |