diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2013-01-11 16:27:49 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2013-01-11 16:27:49 +0400 |
| commit | f1e3ddf8d12ccdc2d20976e5960985853bed6454 (patch) | |
| tree | 098149e5ac79b02fba95464717e4c763add79d1e /accel-pppd/ppp | |
| parent | 3a68b66387b2e352d4ffe60c0dd4aeeb2c599fb4 (diff) | |
| parent | c223aade3cd0c9ee651902f70da5497aae0f8014 (diff) | |
| download | accel-ppp-f1e3ddf8d12ccdc2d20976e5960985853bed6454.tar.gz accel-ppp-f1e3ddf8d12ccdc2d20976e5960985853bed6454.zip | |
Merge branch '1.7' of ssh://accel-ppp.git.sourceforge.net/gitroot/accel-ppp/accel-ppp into 1.7
Diffstat (limited to 'accel-pppd/ppp')
| -rw-r--r-- | accel-pppd/ppp/lcp_opt_magic.c | 4 | ||||
| -rw-r--r-- | accel-pppd/ppp/ppp_lcp.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/accel-pppd/ppp/lcp_opt_magic.c b/accel-pppd/ppp/lcp_opt_magic.c index 3e694d20..bf392091 100644 --- a/accel-pppd/ppp/lcp_opt_magic.c +++ b/accel-pppd/ppp/lcp_opt_magic.c @@ -94,9 +94,9 @@ static void magic_print(void (*print)(const char *fmt,...),struct lcp_option_t * struct lcp_opt32_t *opt32 = (struct lcp_opt32_t *)ptr; if (ptr) - print("<magic %04x>", ntohl(opt32->val)); + print("<magic %08x>", ntohl(opt32->val)); else - print("<magic %04x>", magic_opt->magic); + print("<magic %08x>", magic_opt->magic); } static void magic_opt_init() diff --git a/accel-pppd/ppp/ppp_lcp.c b/accel-pppd/ppp/ppp_lcp.c index e1727dee..7a071dde 100644 --- a/accel-pppd/ppp/ppp_lcp.c +++ b/accel-pppd/ppp/ppp_lcp.c @@ -606,7 +606,7 @@ static void lcp_recv_echo_repl(struct ppp_lcp_t *lcp, uint8_t *data, int size) magic = ntohl(*(uint32_t *)data); if (conf_ppp_verbose) - log_ppp_debug("recv [LCP EchoRep id=%x <magic %x>]\n", lcp->fsm.recv_id, magic); + log_ppp_debug("recv [LCP EchoRep id=%x <magic %08x>]\n", lcp->fsm.recv_id, magic); if (magic == lcp->magic) { log_ppp_error("lcp: echo: loop-back detected\n"); @@ -630,7 +630,7 @@ static void send_echo_reply(struct ppp_lcp_t *lcp) *(uint32_t *)(hdr + 1) = htonl(lcp->magic); if (conf_ppp_verbose) - log_ppp_debug("send [LCP EchoRep id=%x <magic %x>]\n", hdr->id, htonl(lcp->magic)); + log_ppp_debug("send [LCP EchoRep id=%x <magic %08x>]\n", hdr->id, lcp->magic); ppp_chan_send(lcp->ppp, hdr, ntohs(hdr->len) + 2); } @@ -683,7 +683,7 @@ static void send_echo_request(struct triton_timer_t *t) } if (conf_ppp_verbose) - log_ppp_debug("send [LCP EchoReq id=%x <magic %x>]\n", msg.hdr.id, lcp->magic); + log_ppp_debug("send [LCP EchoReq id=%x <magic %08x>]\n", msg.hdr.id, lcp->magic); ppp_chan_send(lcp->ppp,&msg,ntohs(msg.hdr.len)+2); } @@ -851,7 +851,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 <magic %x>]\n", hdr->id, ntohl(*(uint32_t*)(hdr + 1))); + log_ppp_debug("recv [LCP EchoReq id=%x <magic %08x>]\n", hdr->id, ntohl(*(uint32_t*)(hdr + 1))); send_echo_reply(lcp); break; case ECHOREP: |