From: "ordex (Code Review)" Date: Sat, 26 Jul 2025 00:08:34 +0000 In-Reply-To: References: Reply-To: antonio@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <064107a0ea336a755d7faa31510695b9d517bb02-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="eIF1xVSKD84="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: multi: make some multi_*() functions static List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --eIF1xVSKD84= 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/+/1115?usp=3Demail to look at the new patch set (#2). Change subject: multi: make some multi_*() functions static ...................................................................... multi: make some multi_*() functions static multi_process_float() and multi_print_status() are both invoked only within multi.c, which is where they is defined. For this reason we can make them static and drop their declaration from multi.h. Change-Id: Id5e06f0822a3e7e4ad1b6f93caaefdb6a8cfe547 Signed-off-by: Antonio Quartulli --- M src/openvpn/multi.c M src/openvpn/multi.h 2 files changed, 10 insertions(+), 15 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/15/1115/2 diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index c5691ff..c90ed5b 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -849,7 +849,7 @@ * If status file is defined, write to file. * If status file is NULL, write to syslog. */ -void +static void multi_print_status(struct multi_context *m, struct status_output *so, cons= t int version) { if (m->hash) @@ -3210,7 +3210,15 @@ return ret; } -void +/** + * Handles peer floating. + * + * If peer is floated to a taken address, either drops packet + * (if peer that owns address has different CN) or disconnects + * existing peer. Updates multi_instance with new address, + * updates hashtables in multi_context. + */ +static void multi_process_float(struct multi_context *m, struct multi_instance *mi, struct link_socket *sock) { diff --git a/src/openvpn/multi.h b/src/openvpn/multi.h index 8b2704c..3c821d7 100644 --- a/src/openvpn/multi.h +++ b/src/openvpn/multi.h @@ -270,17 +270,6 @@ bool multi_process_timeout(struct multi_context *m, const unsigned int mpp= _flags); -/** - * Handles peer floating. - * - * If peer is floated to a taken address, either drops packet - * (if peer that owns address has different CN) or disconnects - * existing peer. Updates multi_instance with new address, - * updates hashtables in multi_context. - */ -void multi_process_float(struct multi_context *m, struct multi_instance *m= i, - struct link_socket *sock); - #define MPP_PRE_SELECT (1<<0) #define MPP_CONDITIONAL_PRE_SELECT (1<<1) #define MPP_CLOSE_ON_SIGNAL (1<<2) @@ -370,8 +359,6 @@ void multi_process_drop_outgoing_tun(struct multi_context *m, const unsign= ed int mpp_flags); -void multi_print_status(struct multi_context *m, struct status_output *so,= const int version); - struct multi_instance *multi_get_queue(struct mbuf_set *ms); void multi_add_mbuf(struct multi_context *m, -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1115?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: Id5e06f0822a3e7e4ad1b6f93caaefdb6a8cfe547 Gerrit-Change-Number: 1115 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 --eIF1xVSKD84= 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

multi: make some multi_*() functions static

multi_process_float()= and multi_print_status() are both invoked only
within multi.c, which is= where they is defined.

For this reason we can make them static and = drop their declaration
from multi.h.

Change-Id: Id5e06f0822a3e7e4= ad1b6f93caaefdb6a8cfe547
Signed-off-by: Antonio Quartulli <antonio@...1186...= .2726...>
---
M src/openvpn/multi.c
M src/openvpn/multi.h
2 = files changed, 10 insertions(+), 15 deletions(-)

git pull ssh://g=
errit.openvpn.net:29418/openvpn refs/changes/15/1115/2
diff --git a=
/src/openvpn/multi.c b/src/openvpn/multi.c
index c5691ff..c= 90ed5b 100644
--- a/src/openvpn/multi.c
+++= b/src/openvpn/multi.c
@@ -849,7 +849,7 @@
= * If status file is defined, write to file.
* If status= file is NULL, write to syslog.
*/
-void
+static void
multi_print_status(struct mul= ti_context *m, struct status_output *so, const int version)
{
if (m->hash)
@@ -3210,7 +3210,1= 5 @@
return ret;
}
<= /span>
-void
+/**
+ * Handles peer floating.
+ *
+ * If peer is floated to a taken address, either drops packet
+ * (if peer that owns = address has different CN) or disconnects
+ * existing peer. Updates multi_instance with new addr= ess,
+ * updates hash= tables in multi_context.
+ */
+static void=
multi_process_float(struct multi_context *m, struct multi= _instance *mi,
struct link_socket *soc= k)
{
diff --git a/src/openvpn/multi.h b/sr= c/openvpn/multi.h
index 8b2704c..3c821d7 100644
<= span>--- a/src/openvpn/multi.h

+++ b/src/openvpn/multi.h
@@ -270,17 +270,6 @@

bool = multi_process_timeout(struct multi_context *m, const unsigned int mpp_flags= );

-/= **
- * Handles peer flo= ating.
- *
- * If peer is floated to a taken a= ddress, either drops packet

- * (if peer that owns address has different CN) or disconnects=
- * existing peer. Updates mu= lti_instance with new address,
- * updates hashtables in multi_context.
- */
-void multi_process_float(struct multi_context *m, struct multi_ins= tance *mi,
- = struct link_socket *sock);
-
#define MPP_PRE_SELECT (1&= lt;<0)
#define MPP_CONDITIONAL_PRE_SELECT (1<<1)<= /span>
#define MPP_CLOSE_ON_SIGNAL (1<<2)
= @@ -370,8 +359,6 @@

void multi_pro= cess_drop_outgoing_tun(struct multi_context *m, const unsigned int mpp_flag= s);

-= void multi_print_status(struct multi_context *m, struct status_output *so, = const int version);
-
struct multi_instance *multi_get_queue(struct mbuf_set *ms)= ;

void multi_add_mbuf(struct multi_conte= xt *m,

To view, visit change 1115. To unsub= scribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id5e06f0822a3e7e4ad1b6f93caa= efdb6a8cfe547
Gerrit-Change-Number: 1115
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
--eIF1xVSKD84=--