From 5f355048894ede9e983c7f02cc5915385620db3f Mon Sep 17 00:00:00 2001 From: Guillaume Nault Date: Tue, 4 Sep 2012 20:29:18 +0200 Subject: Fix format string errors Fix several errors and compiler warnings in format string arguments. Signed-off-by: Guillaume Nault --- accel-pppd/ctrl/l2tp/packet.c | 2 +- accel-pppd/ctrl/pppoe/cli.c | 2 +- accel-pppd/ctrl/pppoe/pppoe.c | 2 +- accel-pppd/ctrl/pptp/pptp.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'accel-pppd/ctrl') 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; } diff --git a/accel-pppd/ctrl/pppoe/cli.c b/accel-pppd/ctrl/pppoe/cli.c index 847b8547..26846402 100644 --- a/accel-pppd/ctrl/pppoe/cli.c +++ b/accel-pppd/ctrl/pppoe/cli.c @@ -120,7 +120,7 @@ static int show_service_name_exec(const char *cmd, char * const *f, int f_cnt, v if (conf_service_name) cli_sendv(cli, "%s\r\n", conf_service_name); else - cli_sendv(cli, "*\r\n", conf_service_name); + cli_sendv(cli, "*\r\n"); return CLI_CMD_OK; } diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c index e620668f..f36a1cc5 100644 --- a/accel-pppd/ctrl/pppoe/pppoe.c +++ b/accel-pppd/ctrl/pppoe/pppoe.c @@ -1350,7 +1350,7 @@ static int init_secret(struct pppoe_serv_t *serv) DES_cblock key; if (read(urandom_fd, serv->secret, SECRET_LENGTH) < 0) { - log_emerg("pppoe: failed to read /dev/urandom\n", strerror(errno)); + log_emerg("pppoe: failed to read /dev/urandom: %s\n", strerror(errno)); return -1; } diff --git a/accel-pppd/ctrl/pptp/pptp.c b/accel-pppd/ctrl/pptp/pptp.c index f2e9d43c..a3476c5e 100644 --- a/accel-pppd/ctrl/pptp/pptp.c +++ b/accel-pppd/ctrl/pptp/pptp.c @@ -1,3 +1,4 @@ +#include #include #include #include @@ -222,7 +223,7 @@ static int pptp_start_ctrl_conn_rqst(struct pptp_conn_t *conn) } if (msg->version != htons(PPTP_VERSION)) { - log_ppp_warn("PPTP version mismatch: expecting %x, received %s\n", PPTP_VERSION, msg->version); + log_ppp_warn("PPTP version mismatch: expecting %x, received %" PRIu32 "\n", PPTP_VERSION, msg->version); if (send_pptp_start_ctrl_conn_rply(conn, PPTP_CONN_RES_PROTOCOL, 0)) return -1; return 0; -- cgit v1.2.3 From cbd29e841d4a90cf93515ba8341a8bbdbd4dea38 Mon Sep 17 00:00:00 2001 From: Kozlov Dmitry Date: Fri, 7 Sep 2012 15:52:11 +0400 Subject: l2tp: send ZLB when duplicate packet is received and retransmit queue is empty --- accel-pppd/ctrl/l2tp/l2tp.c | 4 ++-- accel-pppd/radius/req.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'accel-pppd/ctrl') 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/radius/req.c b/accel-pppd/radius/req.c index cc0b261a..1294e64f 100644 --- a/accel-pppd/radius/req.c +++ b/accel-pppd/radius/req.c @@ -67,6 +67,8 @@ struct rad_req_t *rad_req_alloc(struct radius_pd_t *rpd, int code, const char *u goto out_err; if (rad_packet_add_val(req->pack, NULL, "NAS-Port-Type", "Virtual")) goto out_err; + if (rad_packet_add_int(req->pack, NULL, "Tunnel-Type", rpd->ppp->ctrl->type)) + goto out_err; if (rad_packet_add_val(req->pack, NULL, "Service-Type", "Framed-User")) goto out_err; if (rad_packet_add_val(req->pack, NULL, "Framed-Protocol", "PPP")) -- cgit v1.2.3