diff options
| author | xebd <xeb@mail.ru> | 2017-12-05 16:45:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 16:45:49 +0300 |
| commit | f740a48aa7559c535329f8be137c35f319f811b8 (patch) | |
| tree | 0ad46f486196916b6c2cad5db7578c14846c938a | |
| parent | 9ed37b916509d02e2296e39f5210d1d8f4999e95 (diff) | |
| parent | faf5bf8a0f40119273b94d8c80bafaaabb3d185e (diff) | |
| download | accel-ppp-xebd-f740a48aa7559c535329f8be137c35f319f811b8.tar.gz accel-ppp-xebd-f740a48aa7559c535329f8be137c35f319f811b8.zip | |
Merge pull request #22 from themiron/l2tp-closing
l2tp: skip obsolete session data packets from logging
| -rw-r--r-- | accel-pppd/ctrl/l2tp/packet.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) |