diff options
Diffstat (limited to 'accel-pppd')
| -rw-r--r-- | accel-pppd/cli/std_cmd.c | 2 | ||||
| -rw-r--r-- | accel-pppd/ppp/ppp_lcp.c | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/accel-pppd/cli/std_cmd.c b/accel-pppd/cli/std_cmd.c index 43407f19..0754b19c 100644 --- a/accel-pppd/cli/std_cmd.c +++ b/accel-pppd/cli/std_cmd.c @@ -161,7 +161,7 @@ static int terminate_exec2(int key, char * const *f, int f_cnt, void *cli) list_for_each_entry(ppp, &ppp_list, entry) { switch (key) { case 0: - if (strcmp(ppp->username, f[2])) + if (!ppp->username || strcmp(ppp->username, f[2])) continue; break; case 1: diff --git a/accel-pppd/ppp/ppp_lcp.c b/accel-pppd/ppp/ppp_lcp.c index c46c5a49..1401b551 100644 --- a/accel-pppd/ppp/ppp_lcp.c +++ b/accel-pppd/ppp/ppp_lcp.c @@ -569,19 +569,21 @@ static int lcp_recv_conf_ack(struct ppp_lcp_t *lcp, uint8_t *data, int size) static void lcp_recv_echo_repl(struct ppp_lcp_t *lcp, uint8_t *data, int size) { - uint32_t magic = *(uint32_t *)data; + uint32_t magic; if (size != 4) { - log_ppp_error("lcp:echo: magic number size mismatch\n"); - ppp_terminate(lcp->ppp, TERM_USER_ERROR, 0); - } + if (conf_ppp_verbose) + log_ppp_debug("recv [LCP EchoRep id=%x]\n", lcp->fsm.recv_id); + } else { + magic = *(uint32_t *)data; - if (conf_ppp_verbose) - log_ppp_debug("recv [LCP EchoRep id=%x <magic %x>]\n", lcp->fsm.recv_id, magic); + if (conf_ppp_verbose) + log_ppp_debug("recv [LCP EchoRep id=%x <magic %x>]\n", lcp->fsm.recv_id, magic); - if (magic == lcp->magic) { - log_ppp_error("lcp: echo: loop-back detected\n"); - ppp_terminate(lcp->ppp, TERM_NAS_ERROR, 0); + if (magic == lcp->magic) { + log_ppp_error("lcp: echo: loop-back detected\n"); + ppp_terminate(lcp->ppp, TERM_NAS_ERROR, 0); + } } lcp->echo_sent = 0; |