From: Sergey Korolev Date: Mon, 26 Jun 2023 13:09:39 +0000 (+0300) Subject: dco-linux: fix counter print format X-Git-Tag: v2.7_alpha1~451 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=330bef679544b6a22d16a800c898927a785d74fc;p=thirdparty%2Fopenvpn.git dco-linux: fix counter print format 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 Acked-by: Antonio Quartulli 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 --- diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index 2bfdf980a..0cf36ba78 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