From 5c5d93e2a622bc6736267701aaaf0f472442590a Mon Sep 17 00:00:00 2001 From: Kozlov Dmitry Date: Mon, 13 Aug 2012 16:58:01 +0400 Subject: lcp: fixed sending incorrect magic in lcp echo request --- accel-pppd/ppp/ppp_lcp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/accel-pppd/ppp/ppp_lcp.c b/accel-pppd/ppp/ppp_lcp.c index c93c100..e61738c 100644 --- a/accel-pppd/ppp/ppp_lcp.c +++ b/accel-pppd/ppp/ppp_lcp.c @@ -603,7 +603,7 @@ static void lcp_recv_echo_repl(struct ppp_lcp_t *lcp, uint8_t *data, int size) if (conf_ppp_verbose) log_ppp_debug("recv [LCP EchoRep id=%x]\n", lcp->fsm.recv_id); } else { - magic = *(uint32_t *)data; + magic = ntohl(*(uint32_t *)data); if (conf_ppp_verbose) log_ppp_debug("recv [LCP EchoRep id=%x ]\n", lcp->fsm.recv_id, magic); @@ -650,7 +650,7 @@ static void send_echo_request(struct triton_timer_t *t) .hdr.code = ECHOREQ, .hdr.id = lcp->fsm.id++, .hdr.len = htons(8), - .magic = lcp->magic, + .magic = htonl(lcp->magic), }; ++lcp->echo_sent; @@ -690,7 +690,7 @@ static void send_echo_request(struct triton_timer_t *t) } if (conf_ppp_verbose) { - log_ppp_debug("send [LCP EchoReq id=%x ]\n", msg.hdr.id, msg.magic); + log_ppp_debug("send [LCP EchoReq id=%x ]\n", msg.hdr.id, lcp->magic); ppp_chan_send(lcp->ppp,&msg,ntohs(msg.hdr.len)+2); } } @@ -858,7 +858,7 @@ static void lcp_recv(struct ppp_handler_t*h) break; case ECHOREQ: if (conf_ppp_verbose) - log_ppp_debug("recv [LCP EchoReq id=%x ]\n", hdr->id, *(uint32_t*)(hdr + 1)); + log_ppp_debug("recv [LCP EchoReq id=%x ]\n", hdr->id, ntohl(*(uint32_t*)(hdr + 1))); send_echo_reply(lcp); break; case ECHOREP: -- cgit v1.2.3