diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2012-11-01 17:45:31 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2012-11-01 17:45:31 +0400 |
| commit | c0ee752358319ef3502cbd7604a9e8be5a18afd8 (patch) | |
| tree | 47f6400c6b87c0752137da86ad92d97474833da3 /accel-pppd/ctrl/l2tp | |
| parent | 1c89473d04c74e224546c596608f227dcd77518b (diff) | |
| parent | cbd29e841d4a90cf93515ba8341a8bbdbd4dea38 (diff) | |
| download | accel-ppp-c0ee752358319ef3502cbd7604a9e8be5a18afd8.tar.gz accel-ppp-c0ee752358319ef3502cbd7604a9e8be5a18afd8.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/ctrl/l2tp')
| -rw-r--r-- | accel-pppd/ctrl/l2tp/l2tp.c | 4 | ||||
| -rw-r--r-- | accel-pppd/ctrl/l2tp/packet.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c index f6df3af7..3a7c15f5 100644 --- a/accel-pppd/ctrl/l2tp/l2tp.c +++ b/accel-pppd/ctrl/l2tp/l2tp.c @@ -961,10 +961,10 @@ static int l2tp_conn_read(struct triton_md_handler_t *h) } else { if (ntohs(pack->hdr.Ns) < conn->Nr + 1 || (ntohs(pack->hdr.Ns > 32767 && conn->Nr + 1 < 32767))) { log_ppp_debug("duplicate packet\n"); - //if (l2tp_send_ZLB(conn)) - // goto drop; if (!list_empty(&conn->send_queue)) l2tp_retransmit(conn); + else if (l2tp_send_ZLB(conn)) + goto drop; } else log_ppp_debug("reordered packet\n"); l2tp_packet_free(pack); diff --git a/accel-pppd/ctrl/l2tp/packet.c b/accel-pppd/ctrl/l2tp/packet.c index 60b9d36c..70d8d5d9 100644 --- a/accel-pppd/ctrl/l2tp/packet.c +++ b/accel-pppd/ctrl/l2tp/packet.c @@ -158,7 +158,7 @@ int l2tp_recv(int fd, struct l2tp_packet_t **p, struct in_pktinfo *pkt_info) if (n < sizeof(*hdr)) { if (conf_verbose) - log_warn("l2tp: short packet received (%i/%i)\n", n, sizeof(*hdr)); + log_warn("l2tp: short packet received (%i/%zu)\n", n, sizeof(*hdr)); goto out_err_hdr; } |