Re: [Openvpn-devel] [PATCH 1/2] Improve signal handling using POSIX sigaction

[Selva Nair]

On Mon, May 29, 2023 at 3:07 PM Gert Doering  wrote:

> Hi,
>
> On Thu, May 25, 2023 at 02:41:10PM -0400, Selva Nair wrote:
> > Now that 2.6 appears to have reached a fairly stable state, may I request
> > you to look into this patch for 2.7 -- this one has an ACK (thanks to
> > Frank), 2/2 may need a closer look but that one is small.
> >
> > I dread the prospect of this developing serious merge conflicts and
> having
> > to drill down into the details to resolve them. Right now it looks like
> no
> > one has yet touched related chunks.
>
> Will not really have much available time next week, but I have heard
> the message - will look into this the week after.  If not, please feel
> free to send me another reminder.
>

Here it is :)

Selva
___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] [PATCH] dco-linux: fix counter print format

[Sergey Korolev via Openvpn-devel]

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 
---
 src/openvpn/dco_linux.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

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
-- 
2.30.2



___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel