From: "ordex (Code Review)" Date: Fri, 25 Jul 2025 23:31:01 +0000 In-Reply-To: References: Reply-To: antonio@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <2e446207616344a84f9a686ffcab734e040ec655-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="Bh4i8sjgnXU="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: dco_linux: clean up PEER_GET trigger and parser List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --Bh4i8sjgnXU= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello flichtenheld, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1114?usp=3Demail to look at the new patch set (#2). Change subject: dco_linux: clean up PEER_GET trigger and parser ...................................................................... dco_linux: clean up PEER_GET trigger and parser This patch is intended to reduce code duplication and cleanup the DCO code around the PEER_GET command. Specifically it: * unified PEER_GET reply parser for `multi` and `non-multi` case * unified PEER_GET request trigger for `multi` and `non-multi` case * dropped struct multi_context from the argument list of dco_get_peer_stats_multi() Github: closes OpenVPN/openvpn#800 Change-Id: Icbc70225d53ca678b8c22ed437b424c16e199d66 Signed-off-by: Antonio Quartulli --- M src/openvpn/dco.h M src/openvpn/dco_freebsd.c M src/openvpn/dco_linux.c M src/openvpn/dco_win.c M src/openvpn/multi.c 5 files changed, 49 insertions(+), 112 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/14/1114/2 diff --git a/src/openvpn/dco.h b/src/openvpn/dco.h index 9078417..2ce0eb1 100644 --- a/src/openvpn/dco.h +++ b/src/openvpn/dco.h @@ -230,11 +230,9 @@ * Update traffic statistics for all peers * * @param dco DCO device context - * @param m the server context * @param raise_sigusr1_on_err whether to raise SIGUSR1 on error **/ -int dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m, - const bool raise_sigusr1_on_err); +int dco_get_peer_stats_multi(dco_context_t *dco, const bool raise_sigusr1_= on_err); /** * Update traffic statistics for single peer @@ -374,8 +372,7 @@ } static inline int -dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m, - const bool raise_sigusr1_on_err) +dco_get_peer_stats_multi(dco_context_t *dco, const bool raise_sigusr1_on_e= rr) { return 0; } diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c index 98d8fb5..e55e58d 100644 --- a/src/openvpn/dco_freebsd.c +++ b/src/openvpn/dco_freebsd.c @@ -713,8 +713,7 @@ } int -dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m, - const bool raise_sigusr1_on_err) +dco_get_peer_stats_multi(dco_context_t *dco, const bool raise_sigusr1_on_e= rr) { struct ifdrv drv; @@ -774,7 +773,7 @@ const nvlist_t *peer =3D nvpeers[i]; uint32_t peerid =3D nvlist_get_number(peer, "peerid"); - dco_update_peer_stat(m, peerid, nvlist_get_nvlist(peer, "bytes")); + dco_update_peer_stat(dco->c->multi, peerid, nvlist_get_nvlist(peer= , "bytes")); } nvlist_destroy(nvl); diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index 728fb7e..9ad3d51 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -877,53 +877,8 @@ } static int -ovpn_handle_peer_multi(dco_context_t *dco, struct nlattr *attrs[]) -{ - msg(D_DCO_DEBUG, "%s: parsing message...", __func__); - - /* this function assumes openvpn is running in multipeer mode as - * it accesses c->multi - */ - if (dco->ifmode !=3D OVPN_MODE_MP) - { - msg(M_WARN, "%s: can't parse 'multi-peer' message on P2P instance"= , __func__); - return NL_SKIP; - } - - if (!attrs[OVPN_A_PEER]) - { - return NL_SKIP; - } - - struct nlattr *tb_peer[OVPN_A_PEER_MAX + 1]; - nla_parse_nested(tb_peer, OVPN_A_PEER_MAX, attrs[OVPN_A_PEER], NULL); - - if (!tb_peer[OVPN_A_PEER_ID]) - { - msg(M_WARN, "ovpn-dco: no peer-id provided in (MULTI) PEER_GET rep= ly"); - return NL_SKIP; - } - - struct multi_context *m =3D dco->c->multi; - uint32_t peer_id =3D nla_get_u32(tb_peer[OVPN_A_PEER_ID]); - - if (peer_id >=3D m->max_clients || !m->instances[peer_id]) - { - msg(M_WARN, "%s: cannot store DCO stats for peer %u", __func__, - peer_id); - return NL_SKIP; - } - - dco_update_peer_stat(&m->instances[peer_id]->context.c2, tb_peer, peer= _id); - - return NL_OK; -} - -static int ovpn_handle_peer(dco_context_t *dco, struct nlattr *attrs[]) { - msg(D_DCO_DEBUG, "%s: parsing message...", __func__); - if (!attrs[OVPN_A_PEER]) { msg(D_DCO_DEBUG, "%s: malformed reply", __func__); @@ -942,12 +897,25 @@ uint32_t peer_id =3D nla_get_u32(tb_peer[OVPN_A_PEER_ID]); struct context_2 *c2; =20 + msg(D_DCO_DEBUG, "%s: parsing message for peer %u...", __func__, peer_= id); + if (dco->ifmode =3D=3D OVPN_MODE_P2P) { c2 =3D &dco->c->c2; + if (c2->tls_multi->dco_peer_id !=3D peer_id) + { + return NL_SKIP; + } } else { + if (peer_id >=3D dco->c->multi->max_clients) + { + msg(M_WARN, "%s: received out of bound peer_id %u (max=3D%u)",= __func__, peer_id, + dco->c->multi->max_clients); + return NL_SKIP; + } + struct multi_instance *mi =3D dco->c->multi->instances[peer_id]; if (!mi) { @@ -958,14 +926,6 @@ c2 =3D &mi->context.c2; } - /* at this point this check should never fail for MP mode, - * but it's still fully valid for P2P mode - */ - if (c2->tls_multi->dco_peer_id !=3D peer_id) - { - return NL_SKIP; - } - dco_update_peer_stat(c2, tb_peer, peer_id); =20 return NL_OK; @@ -1176,17 +1136,7 @@ { case OVPN_CMD_PEER_GET: { - /* this message is part of a peer list dump, hence triggered - * by a MP/server instance - */ - if (nlh->nlmsg_flags & NLM_F_MULTI) - { - return ovpn_handle_peer_multi(dco, attrs); - } - else - { - return ovpn_handle_peer(dco, attrs); - } + return ovpn_handle_peer(dco, attrs); } case OVPN_CMD_PEER_DEL_NTF: @@ -1221,52 +1171,32 @@ return ovpn_nl_recvmsgs(dco, __func__); } -int -dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m, - const bool raise_sigusr1_on_err) +static int +dco_get_peer(dco_context_t *dco, int peer_id, const bool raise_sigusr1_on_= err) { - msg(D_DCO_DEBUG, "%s", __func__); - - struct nl_msg *nl_msg =3D ovpn_dco_nlmsg_create(dco, OVPN_CMD_PEER_GET= ); - - nlmsg_hdr(nl_msg)->nlmsg_flags |=3D NLM_F_DUMP; - - int ret =3D ovpn_nl_msg_send(dco, nl_msg, __func__); - - nlmsg_free(nl_msg); - - if (raise_sigusr1_on_err && ret < 0) - { - msg(M_WARN, "Error retrieving DCO peer stats: the underlying DCO p= eer" - "may have been deleted from the kernel without notifying " - "userspace. Restarting the session"); - register_signal(m->top.sig, SIGUSR1, "dco peer stats error"); - } - return ret; -} - -int -dco_get_peer_stats(struct context *c, const bool raise_sigusr1_on_err) -{ - int peer_id =3D c->c2.tls_multi->dco_peer_id; - if (peer_id =3D=3D -1) + /* peer_id =3D=3D -1 means "dump all peers", but this is allowed in MP= mode only. + * If it happens in P2P mode it means that the DCO peer was deleted an= d we + * can simply bail out + */ + if (peer_id =3D=3D -1 && dco->ifmode =3D=3D OVPN_MODE_P2P) { return 0; } msg(D_DCO_DEBUG, "%s: peer-id %d", __func__, peer_id); - if (!c->c1.tuntap) - { - return 0; - } - - dco_context_t *dco =3D &c->c1.tuntap->dco; struct nl_msg *nl_msg =3D ovpn_dco_nlmsg_create(dco, OVPN_CMD_PEER_GET= ); struct nlattr *attr =3D nla_nest_start(nl_msg, OVPN_A_PEER); int ret =3D -EMSGSIZE; - NLA_PUT_U32(nl_msg, OVPN_A_PEER_ID, peer_id); + if (peer_id !=3D -1) + { + NLA_PUT_U32(nl_msg, OVPN_A_PEER_ID, peer_id); + } + else + { + nlmsg_hdr(nl_msg)->nlmsg_flags |=3D NLM_F_DUMP; + } nla_nest_end(nl_msg, attr); ret =3D ovpn_nl_msg_send(dco, nl_msg, __func__); @@ -1279,11 +1209,23 @@ msg(M_WARN, "Error retrieving DCO peer stats: the underlying DCO p= eer" "may have been deleted from the kernel without notifying " "userspace. Restarting the session"); - register_signal(c->sig, SIGUSR1, "dco peer stats error"); + register_signal(dco->c->sig, SIGUSR1, "dco peer stats error"); } return ret; } +int +dco_get_peer_stats(struct context *c, const bool raise_sigusr1_on_err) +{ + return dco_get_peer(&c->c1.tuntap->dco, c->c2.tls_multi->dco_peer_id, = raise_sigusr1_on_err); +} + +int +dco_get_peer_stats_multi(dco_context_t *dco, const bool raise_sigusr1_on_e= rr) +{ + return dco_get_peer(dco, -1, raise_sigusr1_on_err); +} + bool dco_available(int msglevel) { diff --git a/src/openvpn/dco_win.c b/src/openvpn/dco_win.c index e5a33a0..995b121 100644 --- a/src/openvpn/dco_win.c +++ b/src/openvpn/dco_win.c @@ -715,8 +715,7 @@ } int -dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m, - const bool raise_sigusr1_on_err) +dco_get_peer_stats_multi(dco_context_t *dco, const bool raise_sigusr1_on_e= rr) { /* Not implemented. */ return 0; diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index a62c57a..c5691ff 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -551,7 +551,7 @@ { if (dco_enabled(&m->top.options)) { - if (dco_get_peer_stats_multi(&m->top.c1.tuntap->dco, m, false) < 0) + if (dco_get_peer_stats_multi(&m->top.c1.tuntap->dco, false) < 0) { return; } @@ -862,7 +862,7 @@ if (dco_enabled(&m->top.options)) { - if (dco_get_peer_stats_multi(&m->top.c1.tuntap->dco, m, true) = < 0) + if (dco_get_peer_stats_multi(&m->top.c1.tuntap->dco, true) < 0) { return; } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1114?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Icbc70225d53ca678b8c22ed437b424c16e199d66 Gerrit-Change-Number: 1114 Gerrit-PatchSet: 2 Gerrit-Owner: ordex Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --Bh4i8sjgnXU= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

ordex uploaded patch set #2 to this change.

View Change

dco_linux: clean up PEER_GET trigger and parser

This patch is int= ended to reduce code duplication and
cleanup the DCO code around the PEE= R_GET command.

Specifically it:
* unified PEER_GET reply parser f= or `multi` and
`non-multi` case
* unified PEER_GET request trigger = for `multi` and
`non-multi` case
* dropped struct multi_context fro= m the argument list of
dco_get_peer_stats_multi()

Github: close= s OpenVPN/openvpn#800
Change-Id: Icbc70225d53ca678b8c22ed437b424c16e199d= 66
Signed-off-by: Antonio Quartulli <antonio@...2726...>
---M src/openvpn/dco.h
M src/openvpn/dco_freebsd.c
M src/openvpn/dco_li= nux.c
M src/openvpn/dco_win.c
M src/openvpn/multi.c
5 files change= d, 49 insertions(+), 112 deletions(-)

git pull ssh://gerrit.openv=
pn.net:29418/openvpn refs/changes/14/1114/2
diff --git a/src/openvp=
n/dco.h b/src/openvpn/dco.h
index 9078417..2ce0eb1 100644
--- a/src/openvpn/dco.h
+++ b/src/openvpn/dc= o.h
@@ -230,11 +230,9 @@
* Update traffic= statistics for all peers
*
* @param dc= o DCO device context
- * @param m the server context<= br> * @param raise_sigusr1_on_err whether to raise SIGUSR1 on error=
**/
= -int dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m,<= /span>
- = const bool raise_sigusr1_on_err);
+int dco_get_peer_stats_multi(dco_context_t *dco, const= bool raise_sigusr1_on_err);

/**<= br> * Update traffic statistics for single peer
@@ -= 374,8 +372,7 @@
}

stati= c inline int
-dco_get_p= eer_stats_multi(dco_context_t *dco, struct multi_context *m,
- const bool = raise_sigusr1_on_err)

+dco_get_peer_stats_multi(dco_context_t *dco, const bool raise_sigusr1_on_= err)
{
return 0;
}
diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_fre= ebsd.c
index 98d8fb5..e55e58d 100644
--- a/= src/openvpn/dco_freebsd.c
+++ b/src/openvpn/dco_freebsd.c
@@ -713,8 +713,7 @@
}

int
-dco_= get_peer_stats_multi(dco_context_t *dco, struct multi_context *m,- const = bool raise_sigusr1_on_err)
+dco_get_peer_stats_multi(dco_context_t *dco, const bool raise_sigusr= 1_on_err)
{

struct = ifdrv drv;
@@ -774,7 +773,7 @@
con= st nvlist_t *peer =3D nvpeers[i];
uint32_t peerid = =3D nvlist_get_number(peer, "peerid");
- dco_update_peer_stat(m= , peerid, nvlist_get_nvlist(peer, "bytes"));
+ dco_update_peer_stat(dco->c-&= gt;multi, peerid, nvlist_get_nvlist(peer, "bytes"));
}


nvlist_destroy(nvl);
diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c<= /span>
index 728fb7e..9ad3d51 100644
--- a/src/ope= nvpn/dco_linux.c
+++ b/src/openvpn/dco_linux.c
@@ -877,53 +877,8 @@

}

static int

-ovpn_ha= ndle_peer_multi(dco_context_t *dco, struct nlattr *attrs[])
-{

- msg(D_DCO_DEBUG, "%s: parsing message...", = __func__);
-
= - /* this function assumes ope= nvpn is running in multipeer mode as
- * it accesses c->multi
- */
- if (dco->ifmode !=3D OVPN_MODE_MP)
- {
- msg(M_WARN, "%s: can't parse 'multi-pe= er' message on P2P instance", __func__);
- return NL_SKIP;
- }
-
- i= f (!attrs[OVPN_A_PEER])
- {
- return= NL_SKIP;
- }=
-
- struct nlattr *tb_peer[OVPN_A_PEER_MAX + 1];<= /span>
- nla_parse_nested(t= b_peer, OVPN_A_PEER_MAX, attrs[OVPN_A_PEER], NULL);
-
- if (!tb_peer[OVPN_A_PEER_ID])
- {
- msg(M_WARN, "ovpn-dco: no peer-id provided in (MULTI) P= EER_GET reply");
-= return NL_SKIP;
- }
-
- struct multi_context *m =3D dco= ->c->multi;

- = uint32_t peer_id =3D nla_get_u32(tb_peer[OVPN_A_PEER_ID]);
-
- if (peer_id >=3D m->max_clients || !m->instanc= es[peer_id])
- {
- msg(M_WARN, "= ;%s: cannot store DCO stats for peer %u", __func__,
- peer_id);
- return NL_SKIP;
- }
-
-= dco_update_peer_stat(&m->instances[peer_id]->context.c2, tb_p= eer, peer_id);
-=
- return NL_OK;
= -}
-
-static int
ovpn_handle_peer(dco_context_t *dco, struct n= lattr *attrs[])
{
- msg(D_DCO_DEBUG, "%s: parsing message...", __fun= c__);
-
if (!attrs[OVPN_A_PEER])

{
= msg(D_DCO_DEBUG, "%s: malformed reply", __func__);
= @@ -942,12 +897,25 @@
uint32_t peer_id =3D nla_g= et_u32(tb_peer[OVPN_A_PEER_ID]);
struct context_2 *c2;=

+ = msg(D_DCO_DEBUG, "%s: parsing message for peer %u...", __func_= _, peer_id);
+=
if (dco->ifmode =3D=3D OVPN_MODE_P2P)
= {
c2 =3D &dco->c->c2;
+ if (c2->tls_multi->dco= _peer_id !=3D peer_id)
+ = return NL_SKIP;
= + }
}
else
{

+ if (= peer_id >=3D dco->c->multi->max_clients)
+ {
+ msg(M_WARN, "%s: received out of b= ound peer_id %u (max=3D%u)", __func__, peer_id,
+ dco->c->multi->m= ax_clients);
+ = return NL_SKIP;
= + }
+ struct multi_instance *mi =3D dco->c->multi->inst= ances[peer_id];
if (!mi)
= {
@@ -958,14 +926,6 @@
c2 =3D &= ;mi->context.c2;
}

- /* at this point this check shou= ld never fail for MP mode,

- * but it's still fully valid for P2P mode
- */
- if (c2->tls_multi->dco_peer_id !=3D peer_id)<= /span>
- {
- return NL_SKIP;
- }

-
dco_update_peer_stat(c2, tb_pe= er, peer_id);

return NL_OK;@@ -1176,17 +1136,7 @@
{
= case OVPN_CMD_PEER_GET:
{
- /* this message is part of a p= eer list dump, hence triggered
- * by a MP/server instance
- */
- if (nlh->nlmsg_flags & NLM_F_MULTI)<= /span>
- {- return ovpn_ha= ndle_peer_multi(dco, attrs);
- }
- = else
- = {
- = return ovpn_handle_peer(dco, attrs);
- }
+ return ovpn_handle_peer(dco, attrs);
}


case OVPN_CMD_PEER_D= EL_NTF:
@@ -1221,52 +1171,32 @@
return= ovpn_nl_recvmsgs(dco, __func__);
}

-int
-dco_get_peer_stats_multi(dco_context_t *dco= , struct multi_context *m,
- const bool raise_sigusr1_on_err)
+static int

+dco_get_peer(dco_context_t *dco, int peer= _id, const bool raise_sigusr1_on_err)
{
- msg(D_DCO_DEBUG, "%s", __f= unc__);
-
- struct nl_msg *nl_msg =3D ovpn_= dco_nlmsg_create(dco, OVPN_CMD_PEER_GET);
-
- = nlmsg_hdr(nl_msg)->nlmsg_flags |=3D NLM_F_DUMP;
-
- int ret =3D ovpn_nl_msg_send(dco, nl_msg, __func__);<= br>-
- nlmsg_free(nl_msg);
-
- if (raise_sigusr1_on_err && ret < 0)
- {
- msg(M_WARN, "Error retrieving DCO peer sta= ts: the underlying DCO peer"
- "may have been deleted from the kernel without= notifying "
- = "userspace. Restarting the session");
- register_signal(m->top.sig, SI= GUSR1, "dco peer stats error");
- }
- return ret;
-}<= /span>
-
-int
-dco_get_peer_stats(struct context *c, const bool raise_sigusr= 1_on_err)
-{
= - int peer_id =3D c->c2.tls= _multi->dco_peer_id;
- if (peer_id =3D=3D -1)
+ /* peer_id =3D=3D -1 means "dump all peers", but thi= s is allowed in MP mode only.
+ * If it happens in P2P mode it means that the DCO peer was d= eleted and we
+ *= can simply bail out
= + */
+ if (pee= r_id =3D=3D -1 && dco->ifmode =3D=3D OVPN_MODE_P2P)
{

return 0;
}=

msg(D_DCO_DEBUG, "%s: peer-id %d"= ;, __func__, peer_id);

- if (!c->c1.tuntap)
- {
- return 0;
-
- dco_context_t *dco =3D &c-= >c1.tuntap->dco;
struct nl_msg *nl_msg =3D ovpn_= dco_nlmsg_create(dco, OVPN_CMD_PEER_GET);
struct nlatt= r *attr =3D nla_nest_start(nl_msg, OVPN_A_PEER);
int r= et =3D -EMSGSIZE;

- NLA_PUT_U32(nl_msg, OVPN_A_PEER_ID, peer_id);
<= span style=3D"color: hsl(120, 100%, 40%);">+ if (peer_id !=3D -1)=
+ {
+ NLA_PUT_U32(nl_msg, OVPN_A_PEER_= ID, peer_id);
+ }<= /span>
+ else
<= span style=3D"color: hsl(120, 100%, 40%);">+ {

+ nlmsg_hdr(nl_msg)->nlmsg_flags |= =3D NLM_F_DUMP;
+ = }
nla_nest_end(nl_msg, attr);
=
ret =3D ovpn_nl_msg_send(dco, nl_msg, __func__);
<= span>@@ -1279,11 +1209,23 @@
msg(M_WARN, "Err= or retrieving DCO peer stats: the underlying DCO peer"
"may have been deleted from the kernel without notifying= "
"userspace. Restarting the sessio= n");
- regi= ster_signal(c->sig, SIGUSR1, "dco peer stats error");+ register_signal(dco-= >c->sig, SIGUSR1, "dco peer stats error");
= }
return ret;
}
=
+int
+dco_get_peer_stats(struct context = *c, const bool raise_sigusr1_on_err)
+{
+ = return dco_get_peer(&c->c1.tuntap->dco, c->c2.tls_multi->= ;dco_peer_id, raise_sigusr1_on_err);
+}
+<= /span>
+int
+dco_get_peer_stats_multi(dco_context= _t *dco, const bool raise_sigusr1_on_err)
+{
+ return dco_get_peer(dco, -1, raise_sigusr1_on_err);
+}

+
bool
dco_available= (int msglevel)
{
diff --git a/src/openvpn/= dco_win.c b/src/openvpn/dco_win.c
index e5a33a0..995b121 10= 0644
--- a/src/openvpn/dco_win.c
+++ b/src/= openvpn/dco_win.c
@@ -715,8 +715,7 @@
}


int
-dco_get_peer_stats_multi(dco_context_t *dco, struct multi_co= ntext *m,
- = const bool raise_sigusr1_on_err)
+dco_get_peer_stats_multi(dco_context_t *dco, cons= t bool raise_sigusr1_on_err)
{
/* Not= implemented. */
return 0;
diff --git = a/src/openvpn/multi.c b/src/openvpn/multi.c
index a62c57a..= c5691ff 100644
--- a/src/openvpn/multi.c
++= + b/src/openvpn/multi.c
@@ -551,7 +551,7 @@
{
if (dco_enabled(&m->top.options)) {
- = if (dco_get_peer_stats_multi(&m->top.c1.tuntap->dco, m, false) &l= t; 0)
+ if (dc= o_get_peer_stats_multi(&m->top.c1.tuntap->dco, false) < 0)

{
return;
}
@@ -862,7 +862,7 @@
if (dco_enabled(&m->top.options))
= {
- = if (dco_get_peer_stats_multi(&m->top.c1.tuntap->dco, m, true) <= ; 0)
+ if = (dco_get_peer_stats_multi(&m->top.c1.tuntap->dco, true) < 0)
{
return;

}

To view, vis= it chang= e 1114. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Icbc70225d53ca678b8c22ed437b= 424c16e199d66
Gerrit-Change-Number: 1114
Gerrit-PatchSet: 2
Gerrit-Owner: ordex <antonio@...2726...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newpatchset
--Bh4i8sjgnXU=--