From: "cron2 (Code Review)" Date: Sun, 27 Jul 2025 10:45:48 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., antonio@...2726... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="MNxENDaw0rQ="; 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: , Cc: plaisthos , flichtenheld , openvpn-devel --MNxENDaw0rQ= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/11= 14?usp=3Demail ) 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 Acked-by: Gert Doering Message-Id: <20250727102245.24931-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 361.html Signed-off-by: Gert Doering --- M src/openvpn/dco.h M src/openvpn/dco_freebsd.c M src/openvpn/dco_freebsd.h M src/openvpn/dco_linux.c M src/openvpn/dco_win.c M src/openvpn/multi.c 6 files changed, 53 insertions(+), 112 deletions(-) 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..78ee9a1 100644 --- a/src/openvpn/dco_freebsd.c +++ b/src/openvpn/dco_freebsd.c @@ -167,6 +167,8 @@ bool ovpn_dco_init(struct context *c) { + c->c1.tuntap->dco.c =3D c; + if (open_fd(&c->c1.tuntap->dco) < 0) { msg(M_ERR, "Failed to open socket"); @@ -713,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) { struct ifdrv drv; @@ -774,7 +775,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_freebsd.h b/src/openvpn/dco_freebsd.h index e1a054e..e926af5 100644 --- a/src/openvpn/dco_freebsd.h +++ b/src/openvpn/dco_freebsd.h @@ -57,6 +57,8 @@ int dco_del_peer_reason; uint64_t dco_read_bytes; uint64_t dco_write_bytes; + + struct context *c; } dco_context_t; #endif /* defined(ENABLE_DCO) && defined(TARGET_FREEBSD) */ 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; + 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); 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 8de5854..c90ed5b 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: 4 Gerrit-Owner: ordex Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --MNxENDaw0rQ= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

dco_linux: clean up PEER_GET trigger and pars=
er

This patch is intended to reduce code duplication and
cleanup = the DCO code around the PEER_GET command.

Specifically it:
* unif= ied PEER_GET reply parser for `multi` and
`non-multi` case
* unifie= d PEER_GET request trigger for `multi` and
`non-multi` case
* dropp= ed struct multi_context from the argument list of
dco_get_peer_stats_m= ulti()

Github: closes OpenVPN/openvpn#800
Change-Id: Icbc70225d53= ca678b8c22ed437b424c16e199d66
Signed-off-by: Antonio Quartulli <anton= io@...2726...>
Acked-by: Gert Doering <gert@...1296...>
Mess= age-Id: <20250727102245.24931-1-gert@...1296...>
URL: https://www.= mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32361.html
Signe= d-off-by: Gert Doering <gert@...1296...>
---
M src/openvpn/dco.= h
M src/openvpn/dco_freebsd.c
M src/openvpn/dco_freebsd.h
M src/op= envpn/dco_linux.c
M src/openvpn/dco_win.c
M src/openvpn/multi.c
6 = files changed, 53 insertions(+), 112 deletions(-)

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, co= nst bool raise_sigusr1_on_err)
{
retu= rn 0;
}
diff --git a/src/openvpn/dco_freeb= sd.c b/src/openvpn/dco_freebsd.c
index 98d8fb5..78ee9a1 100= 644
--- a/src/openvpn/dco_freebsd.c
+++ b/s= rc/openvpn/dco_freebsd.c
@@ -167,6 +167,8 @@
bool
ovpn_dco_init(struct context *c)
= {
+ c->c1.tunta= p->dco.c =3D c;
+<= /span>
if (open_fd(&c->c1.tuntap->dco) < 0)

{
msg(M_ERR, "Failed to open= socket");
@@ -713,8 +715,7 @@
}

int
-dco_get_peer_stats_multi(dco_context_t *dco, struct multi_cont= ext *m,
- = const bool raise_sigusr1_on_err)
+dco_get_peer_stats_multi(dco_context_t *dco, const = bool raise_sigusr1_on_err)
{

<= span> struct ifdrv drv;

@@ -774,7 +775,7 @@
<= span> const nvlist_t *peer =3D nvpeers[i];
= uint32_t peerid =3D nvlist_get_number(peer, "peerid");
- dco_u= pdate_peer_stat(m, peerid, nvlist_get_nvlist(peer, "bytes"));
+ dco_update_peer= _stat(dco->c->multi, peerid, nvlist_get_nvlist(peer, "bytes"= ;));
}

nvlist_d= estroy(nvl);
diff --git a/src/openvpn/dco_freebsd.h b/src/o= penvpn/dco_freebsd.h
index e1a054e..e926af5 100644--- a/src/openvpn/dco_freebsd.h
+++ b/src/openvpn/d= co_freebsd.h
@@ -57,6 +57,8 @@
int dco= _del_peer_reason;
uint64_t dco_read_bytes;
<= span> uint64_t dco_write_bytes;

+
+ = struct context *c;
} dco_context_t;

#endif /* defined(ENABLE_DCO) && defined(TARGET_FREEB= SD) */
diff --git a/src/openvpn/dco_linux.c b/src/openvpn/d= co_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_n= ested(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 (MUL= TI) PEER_GET reply");
- return NL_SKIP;
- }
-- struct multi_context *m = =3D dco->c->multi;
-
- if (peer_id >=3D m->max_clients || !m->= instances[peer_id])
- = {
- msg(M_WARN= , "%s: cannot store DCO stats for peer %u", __func__,
<= span style=3D"color: hsl(0, 100%, 40%);">- peer_id);

<= span style=3D"color: hsl(0, 100%, 40%);">- return NL_SKIP;
- }
-
- dco_update_peer_stat(&m->instances[peer_id]->context.c= 2, 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...&quo= t;, __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 conte= xt_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;<= br>+ if (c2->tls_mult= i->dco_peer_id !=3D peer_id)
+ {
+ return NL_SKIP;
+ }
}
else=
{
+ = if (peer_id >=3D dco->c->multi->max_clients)
+ {

+ msg(M_WARN, "%s: receive= d out of bound peer_id %u (max=3D%u)", __func__, peer_id,
+ dco->c->mu= lti->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 c= heck 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)
- {<= br>- return NL_SKIP;
- }
-
dco_update_peer_stat(= c2, tb_peer, peer_id);

return NL_OK;=
@@ -1176,17 +1136,7 @@
{
case OVPN_CMD_PEER_GET:

{
<= span style=3D"color: hsl(0, 100%, 40%);">- /* this message is pa= rt of a peer list dump, hence triggered

- * by a MP/server instance
- */
- if (nlh->nlmsg_flags & NLM_= F_MULTI)
- {=
- retur= n ovpn_handle_peer_multi(dco, attrs);
- }
- else
- = return ovpn_handle_peer(dco, attrs);
- }
+ return ovpn_handle_peer(dco, attrs);=
}

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

-int
-dco_get_peer_stats_multi(dco_contex= t_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&qu= ot;, __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 peer"
- "may have been deleted from the kerne= l without notifying "
- "userspace. Restarting the session");
= - register_signal(m->to= p.sig, SIGUSR1, "dco peer stats error");
- }
- return ret;
-}
-
-int
-dco_get_peer_stats(struct context *c, const bool rai= se_sigusr1_on_err)
-{
- int peer_id =3D c-&= gt;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 p= eer was deleted and we
+ */
+ = if (peer_id =3D=3D -1 && dco->ifmode =3D=3D OVPN_MODE_P2P)

{
return 0;
= }

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

- if (!c->c1.tuntap)
- {
- return 0;
- }
-

- dco_context_t *dco = =3D &c->c1.tuntap->dco;
struct nl_msg *nl_ms= g =3D ovpn_dco_nlmsg_create(dco, OVPN_CMD_PEER_GET);
s= truct 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);<= /span>
+ if (peer_id !=3D= -1)
+ {+ NLA_PUT_U32(nl_msg, O= VPN_A_PEER_ID, peer_id);
+ }
+ else<= /span>
+ {
+ nlmsg_hdr(nl_msg)->nlms= g_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 peer"=
"may have been deleted from the kernel without = notifying "
"userspace. Restarting t= he session");
- = register_signal(c->sig, SIGUSR1, "dco peer stats error");=
+ register_si= gnal(dco->c->sig, SIGUSR1, "dco peer stats error");<= br> }
return ret;
}<= br>
+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<= br>+dco_get_peer_stats_multi(dc= o_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..9= 95b121 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_err)
{
= /* Not implemented. */
return 0;
di= ff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index = 8de5854..c90ed5b 100644
--- a/src/openvpn/multi.c+++ b/src/openvpn/multi.c
@@ -551,7 +551,7 @@=
{
if (dco_enabled(&m->top.options))<= /span>
{
= - 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) &l= t; 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)
{
ret= urn;
}

To = view, visit change 1114. To unsubscribe, or for help writing mail filters, visi= t settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Icbc70225d53ca678b8c22ed437b= 424c16e199d66
Gerrit-Change-Number: 1114
Gerrit-PatchSet: 4
Gerrit-Owner: ordex <antonio@...2726...>=
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--MNxENDaw0rQ=--