diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2017-12-05 16:49:50 +0300 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2017-12-05 16:49:50 +0300 |
| commit | 71770d7a41278731f676a11ff943da735a09c5b0 (patch) | |
| tree | 39efb88c2f519ffd1b5e755d222ae1e040ab7e8b /accel-pppd/ctrl/l2tp | |
| parent | af16af0928a5c5f171f9703865d4a31bc929a031 (diff) | |
| parent | 00b8ac572ad265e912b5279f1fb98dbe463e2f40 (diff) | |
| download | accel-ppp-71770d7a41278731f676a11ff943da735a09c5b0.tar.gz accel-ppp-71770d7a41278731f676a11ff943da735a09c5b0.zip | |
Merge branch 'master' of github.com:xebd/accel-ppp
Diffstat (limited to 'accel-pppd/ctrl/l2tp')
| -rw-r--r-- | accel-pppd/ctrl/l2tp/l2tp.c | 3 | ||||
| -rw-r--r-- | accel-pppd/ctrl/l2tp/packet.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c index 51f8e7d..a44d31d 100644 --- a/accel-pppd/ctrl/l2tp/l2tp.c +++ b/accel-pppd/ctrl/l2tp/l2tp.c @@ -3213,6 +3213,9 @@ static int l2tp_recv_HELLO(struct l2tp_conn_t *conn, log_tunnel(log_debug, conn, "handling HELLO\n"); + if (conn->hello_timer.tpd) + triton_timer_mod(&conn->hello_timer, 0); + return 0; } diff --git a/accel-pppd/ctrl/l2tp/packet.c b/accel-pppd/ctrl/l2tp/packet.c index 34e4bb6..455c486 100644 --- a/accel-pppd/ctrl/l2tp/packet.c +++ b/accel-pppd/ctrl/l2tp/packet.c @@ -289,21 +289,21 @@ int l2tp_recv(int fd, struct l2tp_packet_t **p, struct in_pktinfo *pkt_info, return 0; } - if (n < sizeof(*hdr)) { + if (n < 6) { if (conf_verbose) log_warn("l2tp: short packet received (%i/%zu)\n", n, sizeof(*hdr)); goto out_err_hdr; } + if (hdr->T == 0) + goto out_err_hdr; + if (n < ntohs(hdr->length)) { if (conf_verbose) log_warn("l2tp: short packet received (%i/%i)\n", n, ntohs(hdr->length)); goto out_err_hdr; } - if (hdr->T == 0) - goto out_err_hdr; - if (hdr->ver == 2) { if (hdr->L == 0) { if (conf_verbose) |