aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Korolev2023-06-26 16:09:39 +0300
committerGert Doering2023-06-27 16:58:13 +0200
commitfa434643534d506c834df3eb1dbb6073fb74b9f4 (patch)
treed39fa0ee0378a651acc722a883b1d4eafad56eae
parentbf5c5dee7cdc189660ad35e9aaecf4aea5aec4cf (diff)
downloadopenvpn-fa434643534d506c834df3eb1dbb6073fb74b9f4.zip
openvpn-fa434643534d506c834df3eb1dbb6073fb74b9f4.tar.gz
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 <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> (cherry picked from commit 330bef679544b6a22d16a800c898927a785d74fc)
-rw-r--r--src/openvpn/dco_linux.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
index 2bfdf98..0cf36ba 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