From: "ordex (Code Review)" Date: Wed, 23 Jul 2025 09:59:41 +0000 In-Reply-To: References: Reply-To: antonio@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., lstipakov@...277..., gert@...1296... Message-ID: <483fc7dc2aeb9f042a78b987528c0dbc9f6a52ae-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="e1dWSF1TWnU="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: dco: only pass struct context to init function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel , stipa --e1dWSF1TWnU= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, flichtenheld, ordex, plaisthos. Hello cron2, flichtenheld, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1094?usp=3Demail to look at the new patch set (#3). Change subject: dco: only pass struct context to init function ...................................................................... dco: only pass struct context to init function Future DCO code will require accessing the `multi` member of the context object. For this reason a pointer to the context has to be stored in the DCO context along with the rest. At this point, rather than making the call to ovpn_dco_init() longer with more and more parameters, pass the struct context only and let the implementation extract the needed fields. Change-Id: I673a17f8c5dec66cc6c28c1ed44780a7a63927d7 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_linux.h M src/openvpn/dco_win.c M src/openvpn/init.c 6 files changed, 20 insertions(+), 12 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/94/1094/3 diff --git a/src/openvpn/dco.h b/src/openvpn/dco.h index f38316d..9078417 100644 --- a/src/openvpn/dco.h +++ b/src/openvpn/dco.h @@ -104,12 +104,10 @@ /** * Initialize the DCO context * - * @param mode the instance operating mode (P2P or multi-peer) - * @param dco the context to initialize - * @param dev_node device node, used on Windows to specify certain DCO ad= apter + * @param c the main instance context * @return true on success, false otherwise */ -bool ovpn_dco_init(int mode, dco_context_t *dco, const char *dev_node); +bool ovpn_dco_init(struct context *c); /** * Open/create a DCO interface @@ -297,7 +295,7 @@ } static inline bool -ovpn_dco_init(int mode, dco_context_t *dco, const char *dev_node) +ovpn_dco_init(struct context *c) { return true; } diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c index b8816c6..98d8fb5 100644 --- a/src/openvpn/dco_freebsd.c +++ b/src/openvpn/dco_freebsd.c @@ -165,9 +165,9 @@ } =20 bool -ovpn_dco_init(int mode, dco_context_t *dco, const char *dev_node) +ovpn_dco_init(struct context *c) { - if (open_fd(dco) < 0) + if (open_fd(&c->c1.tuntap->dco) < 0) { msg(M_ERR, "Failed to open socket"); return false; diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index 3652a49..ec6efaa 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -438,9 +438,11 @@ } bool -ovpn_dco_init(int mode, dco_context_t *dco, const char *dev_node) +ovpn_dco_init(struct context *c) { - switch (mode) + dco_context_t *dco =3D &c->c1.tuntap->dco; + + switch (c->mode) { case CM_TOP: dco->ifmode =3D OVPN_MODE_MP; @@ -454,6 +456,10 @@ ASSERT(false); } + /* store pointer to context as it may be required by message + * parsing routines + */ + dco->c =3D c; ovpn_dco_init_netlink(dco); return true; } diff --git a/src/openvpn/dco_linux.h b/src/openvpn/dco_linux.h index 676b8cd..5e61cf1 100644 --- a/src/openvpn/dco_linux.h +++ b/src/openvpn/dco_linux.h @@ -65,6 +65,8 @@ struct nl_cb *nl_cb; int status; + struct context *c; + enum ovpn_mode ifmode; int ovpn_dco_id; diff --git a/src/openvpn/dco_win.c b/src/openvpn/dco_win.c index 83db739..1d20247 100644 --- a/src/openvpn/dco_win.c +++ b/src/openvpn/dco_win.c @@ -188,8 +188,10 @@ * state. The server socket should be initialized later by dco_mp_start_vp= n(). */ bool -ovpn_dco_init(int mode, dco_context_t *dco, const char *dev_node) +ovpn_dco_init(struct context *c) { + dco_context_t *dco =3D &c->c1.tuntap->dco; + switch (mode) { case MODE_POINT_TO_POINT: @@ -198,7 +200,7 @@ break; case MODE_SERVER: - ovpn_dco_init_mp(dco, dev_node); + ovpn_dco_init_mp(dco, c->options.dev_node); break; default: diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 77747a2..aac8a6a 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -2007,7 +2007,7 @@ if (dco_enabled(&c->options)) { - ovpn_dco_init(c->mode, &c->c1.tuntap->dco, c->options.dev_node= ); + ovpn_dco_init(c); } /* open the tun device */ -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1094?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: I673a17f8c5dec66cc6c28c1ed44780a7a63927d7 Gerrit-Change-Number: 1094 Gerrit-PatchSet: 3 Gerrit-Owner: ordex Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-CC: stipa Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-Attention: flichtenheld Gerrit-Attention: ordex Gerrit-MessageType: newpatchset --e1dWSF1TWnU= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: cron2, flichtenheld, ordex, plais= thos.

ordex uploaded patch set #3 to this change.

View Change

dco: only pass struct context to init function

Future DCO code wi= ll require accessing the `multi` member of the
context object.

Fo= r this reason a pointer to the context has to be stored in the
DCO conte= xt along with the rest.

At this point, rather than making the call t= o ovpn_dco_init()
longer with more and more parameters, pass the struct = context
only and let the implementation extract the needed fields.
Change-Id: I673a17f8c5dec66cc6c28c1ed44780a7a63927d7
Signed-off-by: An= tonio Quartulli <antonio@...2726...>
---
M src/openvpn/dco.hM src/openvpn/dco_freebsd.c
M src/openvpn/dco_linux.c
M src/openvpn/= dco_linux.h
M src/openvpn/dco_win.c
M src/openvpn/init.c
6 files c= hanged, 20 insertions(+), 12 deletions(-)

git pull ssh://gerrit.o=
penvpn.net:29418/openvpn refs/changes/94/1094/3
diff --git a/src/op=
envpn/dco.h b/src/openvpn/dco.h
index f38316d..9078417 1006= 44
--- a/src/openvpn/dco.h
+++ b/src/openvp= n/dco.h
@@ -104,12 +104,10 @@
/** * Initialize the DCO context
*
- * @param mode the instance opera= ting mode (P2P or multi-peer)
- * @param dco the context to initialize
- * @param dev_node device node, used on Wi= ndows to specify certain DCO adapter
+ * @param c the main instance context
* @return true on success, false otherwise
= */
-bool ovpn_dco_init= (int mode, dco_context_t *dco, const char *dev_node);
+bool ovpn_dco_init(struct context *c);


/**
* Open/create a DCO = interface
@@ -297,7 +295,7 @@
}
=
static inline bool
-ovpn_dco_init(int mode, dco_context_t *dco, const cha= r *dev_node)
+ovpn_dc= o_init(struct context *c)
{
return tr= ue;
}
diff --git a/src/openvpn/dco_freebsd= .c b/src/openvpn/dco_freebsd.c
index b8816c6..98d8fb5 10064= 4
--- a/src/openvpn/dco_freebsd.c
+++ b/src= /openvpn/dco_freebsd.c
@@ -165,9 +165,9 @@
= }

bool
-ovpn_dco_init(int mode, dco_context_t *dco, const char= *dev_node)
+ovpn_dco= _init(struct context *c)
{
- if (open_fd(dco) < 0)
+ if (open_fd(&c->c1.tuntap->dco= ) < 0)
{
msg(M_ERR, "= Failed to open socket");
return false;=
diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
index 3652a49..ec6efaa 100644
--- a/src/openv= pn/dco_linux.c
+++ b/src/openvpn/dco_linux.c
@@ -438,9 +438,11 @@

}

bool
-ovpn_dco_init(i= nt mode, dco_context_t *dco, const char *dev_node)
+ovpn_dco_init(struct context *c)
<= span> {
- switch (mo= de)
+ dco_context_= t *dco =3D &c->c1.tuntap->dco;
+
+ switch (c->mode)
{
c= ase CM_TOP:
dco->ifmode =3D OVPN_MODE_MP;
@@ -454,6 +456,10 @@
ASSERT(fal= se);
}

+ /* store pointer to context as it may be requ= ired by message
+ = * parsing routines
+= */
+ dco->= c =3D c;
ovpn_dco_init_netlink(dco);
= return true;
}
diff --git a/src/openvp= n/dco_linux.h b/src/openvpn/dco_linux.h
index 676b8cd..5e61= cf1 100644
--- a/src/openvpn/dco_linux.h
++= + b/src/openvpn/dco_linux.h
@@ -65,6 +65,8 @@
struct nl_cb *nl_cb;

int status;

+ struct cont= ext *c;
+
<= span> enum ovpn_mode ifmode;

int= ovpn_dco_id;
diff --git a/src/openvpn/dco_win.c b/src/open= vpn/dco_win.c
index 83db739..1d20247 100644
--- a/src/openvpn/dco_win.c
+++ b/src/openvpn/dco_win.c
@@ -188,8 +188,10 @@
* state. The server so= cket should be initialized later by dco_mp_start_vpn().
*= /
bool
-ovpn_dco_init(int mode, dco_context_t *dco, const char *dev_node)<= br>+ovpn_dco_init(struct contex= t *c)
{
+ dco_context_t *dco =3D &c->c1.tuntap->dco;
+

switch (mod= e)
{
case MODE_POINT_TO_POINT= :
@@ -198,7 +200,7 @@
break;

case MODE_SERVER:
- ovpn_dco_init_mp(dco, dev= _node);

+ = ovpn_dco_init_mp(dco, c->options.dev_node);
= break;

default:
diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index= 77747a2..aac8a6a 100644
--- a/src/openvpn/init.c+++ b/src/openvpn/init.c
@@ -2007,7 +2007,7 @@


if (dco_enabled(&c->options))<= /span>
{
- ovpn_dco_init(c->mode, &c->c1.tuntap->dco, c-= >options.dev_node);
change 1094
. To unsubscribe, or for help writing = mail filters, visit settings= .

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I673a17f8c5dec66cc6c28c1ed44= 780a7a63927d7
Gerrit-Change-Number: 1094
Gerrit-PatchSet: 3
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-CC: stipa <lstipakov@...277...> <= /div>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: cron2 <gert@...1296...>= ;
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-Attention: ordex <antonio@...2726...= >
Gerrit-MessageType: newpatchset
--e1dWSF1TWnU=--