| Message ID | 20230626130939.3267280-1-sergey.korolev@keenetic.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] dco-linux: fix counter print format | expand |
Hi, On 26/06/2023 15:09, Sergey Korolev via Openvpn-devel wrote: > Avoid compilation warnings on 32 bit platforms. > > dco_linux.c: In function 'dco_update_peer_stat': > dco_linux.c:830:26: error: format '%lu' expects argument of type > 'long unsigned int', but argument 4 has type 'counter_type' > {aka 'long long unsigned int'} [-Werror=format=] > 830 | msg(D_DCO_DEBUG, "%s / dco_read_bytes: %lu", __func__, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > 831 | c2->dco_read_bytes); > | ~~~~~~~~~~~~~~~~~~ > | | > | counter_type {aka long long unsigned int} > > Signed-off-by: Sergey Korolev <sergey.korolev@keenetic.com> Thanks for catching this! Acked-by: Antonio Quartulli <a@unstable.cc>
I have not tested this beyond "does it still compile?", but a quick
glance at the changes and the definitions agrees with Antonio's ACK.
Your patch has been applied to the master and release/2.6 branches.
commit 330bef679544b6a22d16a800c898927a785d74fc (master)
commit fa434643534d506c834df3eb1dbb6073fb74b9f4 (HEAD -> release/2.6)
Author: Sergey Korolev via Openvpn-devel
Date: Mon Jun 26 16:09:39 2023 +0300
dco-linux: fix counter print format
Signed-off-by: Sergey Korolev <sergey.korolev@keenetic.com>
Acked-by: Antonio Quartulli <a@unstable.cc>
Message-Id: <20230626130939.3267280-1-sergey.korolev@keenetic.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26767.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
--
kind regards,
Gert Doering
diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index 2bfdf980..0cf36ba7 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -827,7 +827,7 @@ dco_update_peer_stat(struct context_2 *c2, struct nlattr *tb[], uint32_t id) if (tb[OVPN_GET_PEER_RESP_ATTR_LINK_RX_BYTES]) { c2->dco_read_bytes = nla_get_u64(tb[OVPN_GET_PEER_RESP_ATTR_LINK_RX_BYTES]); - msg(D_DCO_DEBUG, "%s / dco_read_bytes: %lu", __func__, + msg(D_DCO_DEBUG, "%s / dco_read_bytes: " counter_format, __func__, c2->dco_read_bytes); } else @@ -839,7 +839,7 @@ dco_update_peer_stat(struct context_2 *c2, struct nlattr *tb[], uint32_t id) if (tb[OVPN_GET_PEER_RESP_ATTR_LINK_TX_BYTES]) { c2->dco_write_bytes = nla_get_u64(tb[OVPN_GET_PEER_RESP_ATTR_LINK_TX_BYTES]); - msg(D_DCO_DEBUG, "%s / dco_write_bytes: %lu", __func__, + msg(D_DCO_DEBUG, "%s / dco_write_bytes: " counter_format, __func__, c2->dco_write_bytes); } else @@ -851,7 +851,7 @@ dco_update_peer_stat(struct context_2 *c2, struct nlattr *tb[], uint32_t id) if (tb[OVPN_GET_PEER_RESP_ATTR_VPN_RX_BYTES]) { c2->tun_read_bytes = nla_get_u64(tb[OVPN_GET_PEER_RESP_ATTR_VPN_RX_BYTES]); - msg(D_DCO_DEBUG, "%s / tun_read_bytes: %lu", __func__, + msg(D_DCO_DEBUG, "%s / tun_read_bytes: " counter_format, __func__, c2->tun_read_bytes); } else @@ -863,7 +863,7 @@ dco_update_peer_stat(struct context_2 *c2, struct nlattr *tb[], uint32_t id) if (tb[OVPN_GET_PEER_RESP_ATTR_VPN_TX_BYTES]) { c2->tun_write_bytes = nla_get_u64(tb[OVPN_GET_PEER_RESP_ATTR_VPN_TX_BYTES]); - msg(D_DCO_DEBUG, "%s / tun_write_bytes: %lu", __func__, + msg(D_DCO_DEBUG, "%s / tun_write_bytes: " counter_format, __func__, c2->tun_write_bytes); } else
Avoid compilation warnings on 32 bit platforms. dco_linux.c: In function 'dco_update_peer_stat': dco_linux.c:830:26: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'counter_type' {aka 'long long unsigned int'} [-Werror=format=] 830 | msg(D_DCO_DEBUG, "%s / dco_read_bytes: %lu", __func__, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ 831 | c2->dco_read_bytes); | ~~~~~~~~~~~~~~~~~~ | | | counter_type {aka long long unsigned int} Signed-off-by: Sergey Korolev <sergey.korolev@keenetic.com> --- src/openvpn/dco_linux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)