From: "cron2 (Code Review)" Date: Tue, 3 Jun 2025 16:36:41 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <461f0633ab316e6f5ae5cac10b27eee54517a1eb-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="yVC8AUkX528="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Fix various badly placed comments in preparation for reformat List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --yVC8AUkX528= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/10= 30?usp=3Demail ) Change subject: Fix various badly placed comments in preparation for reform= at ...................................................................... Fix various badly placed comments in preparation for reformat Change-Id: I83831060fdf5588a0ada8d6abbedc7ce3ded4182 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Message-Id: <20250603163040.31169-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31= 872.html Signed-off-by: Gert Doering --- M src/openvpn/buffer.c M src/openvpn/multi_io.c M src/openvpn/networking.h M src/openvpn/options.c M src/openvpn/otime.c M src/openvpn/otime.h M src/openvpn/tun.h 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c index fd81323..dd6044b 100644 --- a/src/openvpn/buffer.c +++ b/src/openvpn/buffer.c @@ -910,7 +910,8 @@ { return true; } - if ((flags & CC_PRINT) && (c >=3D 32 && c !=3D 127)) /* allow ascii no= n-control and UTF-8, consider DEL to be a control */ + /* allow ascii non-control and UTF-8, consider DEL to be a control */ + if ((flags & CC_PRINT) && (c >=3D 32 && c !=3D 127)) { return true; } diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c index 2bce272..4854f4b 100644 --- a/src/openvpn/multi_io.c +++ b/src/openvpn/multi_io.c @@ -247,7 +247,8 @@ case TA_TUN_WRITE: looking_for =3D TUN_WRITE; tun_input_pending =3D NULL; - c->c2.timeval.tv_sec =3D 1; /* For some reason, the Linux 2.2 = TUN/TAP driver hits this timeout */ + /* For some reason, the Linux 2.2 TUN/TAP driver hits this tim= eout */ + c->c2.timeval.tv_sec =3D 1; perf_push(PERF_PROC_OUT_TUN_MTCP); io_wait(c, IOW_TO_TUN); perf_pop(); diff --git a/src/openvpn/networking.h b/src/openvpn/networking.h index 6f5a6d6..0ba4963 100644 --- a/src/openvpn/networking.h +++ b/src/openvpn/networking.h @@ -302,7 +302,7 @@ int metric); /** - * Delete a route for an IPv4 address/network + * Delete a route for an IPv6 address/network * * @param ctx the implementation specific context * @param dst the destination of the route diff --git a/src/openvpn/options.c b/src/openvpn/options.c index b9708343..6ea01d4 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -8392,9 +8392,10 @@ VERIFY_PERMISSION(OPT_P_DHCPDNS); setenv_foreign_option(options, (const char **)p, 3, es); } - else if (streq(p[0], "route-method") && p[1] && !p[2]) /* ignore when = pushed to non-Windows OS */ + else if (streq(p[0], "route-method") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_ROUTE_EXTRAS); + /* ignore when pushed to non-Windows OS */ } #endif /* ifdef _WIN32 */ #if PASSTOS_CAPABILITY diff --git a/src/openvpn/otime.c b/src/openvpn/otime.c index e604a28..d423067 100644 --- a/src/openvpn/otime.c +++ b/src/openvpn/otime.c @@ -44,8 +44,10 @@ void update_now(const time_t system_time) { - const int forward_threshold =3D 86400; /* threshold at which to dampen= forward jumps */ - const int backward_trigger =3D 10; /* backward jump must be >=3D thi= s many seconds before we adjust */ + /* threshold at which to dampen forward jumps */ + const int forward_threshold =3D 86400; + /* backward jump must be >=3D this many seconds before we adjust */ + const int backward_trigger =3D 10; time_t real_time =3D system_time + now_adj; if (real_time > now) diff --git a/src/openvpn/otime.h b/src/openvpn/otime.h index 5c3e86f..448389d 100644 --- a/src/openvpn/otime.h +++ b/src/openvpn/otime.h @@ -246,7 +246,8 @@ static inline bool tv_within_sigma(const struct timeval *t1, const struct timeval *t2, unsign= ed int sigma) { - const int delta =3D tv_subtract(t1, t2, TV_WITHIN_SIGMA_MAX_SEC); /* s= igma should be less than 10 minutes */ + /* sigma should be less than 10 minutes */ + const int delta =3D tv_subtract(t1, t2, TV_WITHIN_SIGMA_MAX_SEC); return -(int)sigma <=3D delta && delta <=3D (int)sigma; } diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h index ec0f4da..5407e47 100644 --- a/src/openvpn/tun.h +++ b/src/openvpn/tun.h @@ -212,7 +212,8 @@ #ifdef _WIN32 HANDLE hand; - OVERLAPPED dco_new_peer_ov; /* used for async NEW_PEER dco call, which= might wait for TCP connect */ + /* used for async NEW_PEER dco call, which might wait for TCP connect = */ + OVERLAPPED dco_new_peer_ov; struct overlapped_io reads; struct overlapped_io writes; struct rw_handle rw_handle; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1030?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: I83831060fdf5588a0ada8d6abbedc7ce3ded4182 Gerrit-Change-Number: 1030 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --yVC8AUkX528= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

Fix various badly placed comments in preparat=
ion for reformat

Change-Id: I83831060fdf5588a0ada8d6abbedc7ce3ded418= 2
Signed-off-by: Frank Lichtenheld <frank@...2641...>
Acked-by:= Gert Doering <gert@...1296...>
Message-Id: <20250603163040.311= 69-1-gert@...1296...>
URL: https://www.mail-archive.com/openvpn-devel= @lists.sourceforge.net/msg31872.html
Signed-off-by: Gert Doering <ger= t@...1296...>
---
M src/openvpn/buffer.c
M src/openvpn/multi_io= .c
M src/openvpn/networking.h
M src/openvpn/options.c
M src/openvp= n/otime.c
M src/openvpn/otime.h
M src/openvpn/tun.h
7 files change= d, 15 insertions(+), 8 deletions(-)

diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c
index fd81323..dd6044b 100644
--- a/src/openvpn/buffer.c
+++ b/src/openvpn/buffer.c
@@ -910,7 +910,8 = @@
{
return true;
<= span> }

- if ((f= lags & CC_PRINT) && (c >=3D 32 && c !=3D 127)) /* al= low ascii non-control and UTF-8, consider DEL to be a control */
= + /* allow ascii non-control= and UTF-8, consider DEL to be a control */
+ if ((flags & CC_PRINT) && (c >= =3D 32 && c !=3D 127))
{
= return true;
}
diff --git a/src/op= envpn/multi_io.c b/src/openvpn/multi_io.c
index 2bce272..48= 54f4b 100644
--- a/src/openvpn/multi_io.c
+= ++ b/src/openvpn/multi_io.c
@@ -247,7 +247,8 @@
<= span> case TA_TUN_WRITE:
looking_for = =3D TUN_WRITE;
tun_input_pending =3D NULL;

- c->c2.time= val.tv_sec =3D 1; /* For some reason, the Linux 2.2 TUN/TAP driver hits thi= s timeout */
+ = /* For some reason, the Linux 2.2 TUN/TAP driver hits this timeout */<= /span>
+ c->c2= .timeval.tv_sec =3D 1;
perf_push(PERF_PROC_OUT= _TUN_MTCP);
io_wait(c, IOW_TO_TUN);
= perf_pop();
diff --git a/src/openvpn/net= working.h b/src/openvpn/networking.h
index 6f5a6d6..0ba4963= 100644
--- a/src/openvpn/networking.h
+++ = b/src/openvpn/networking.h
@@ -302,7 +302,7 @@
int metric);


/= **
- * Delete a route f= or an IPv4 address/network
+ * Delete a route for an IPv6 address/network
*
* @param ctx the implementation specific context
* @param dst the destination of the route
diff --git a/src/openvpn/options.c b/src/openvpn/options.c

index b9708343..6ea01d4 100644

--- a/src/openvpn/options= .c
+++ b/src/openvpn/options.c
@@ -8392,9 += 8392,10 @@
VERIFY_PERMISSION(OPT_P_DHCPDNS);
setenv_foreign_option(options, (const char **)p, 3, es)= ;
}
+ else if (streq(p[0], "route-me= thod") && p[1] && !p[2])
{=
VERIFY_PERMISSION(OPT_P_ROUTE_EXTRAS);
+ /* ignore when pushed to non-= Windows OS */
}
#endif /* ifdef _WIN3= 2 */
#if PASSTOS_CAPABILITY
diff --git a/s= rc/openvpn/otime.c b/src/openvpn/otime.c
index e604a28..d42= 3067 100644
--- a/src/openvpn/otime.c
+++ b= /src/openvpn/otime.c
@@ -44,8 +44,10 @@
vo= id
update_now(const time_t system_time)
{=
- const int forward= _threshold =3D 86400; /* threshold at which to dampen forward jumps */
- const int backward_tri= gger =3D 10; /* backward jump must be >=3D this many seconds before we= adjust */
+ /* th= reshold at which to dampen forward jumps */
+ const int forward_threshold =3D 86400;+ /* backward jump must be= >=3D this many seconds before we adjust */
+ const int backward_trigger =3D 10; time_t real_time =3D system_time + now_adj;

if (real_time > now)
diff --git a/sr= c/openvpn/otime.h b/src/openvpn/otime.h
index 5c3e86f..4483= 89d 100644
--- a/src/openvpn/otime.h
+++ b/= src/openvpn/otime.h
@@ -246,7 +246,8 @@
st= atic inline bool
tv_within_sigma(const struct timeval *t1,= const struct timeval *t2, unsigned int sigma)
{- const int delta =3D tv_subt= ract(t1, t2, TV_WITHIN_SIGMA_MAX_SEC); /* sigma should be less than 10 minu= tes */
+ /* sigma = should be less than 10 minutes */
+ const int delta =3D tv_subtract(t1, t2, TV_WITHIN_SIGMA_M= AX_SEC);
return -(int)sigma <=3D delta && d= elta <=3D (int)sigma;
}

diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h

index= ec0f4da..5407e47 100644
--- a/src/openvpn/tun.h
= +++ b/src/openvpn/tun.h
@@ -212,7 +212,8 @@
#ifdef _WIN32
HANDLE hand;
- OVERLAPPED dco_new_= peer_ov; /* used for async NEW_PEER dco call, which might wait for TCP conn= ect */
+ /* used f= or async NEW_PEER dco call, which might wait for TCP connect */
<= span style=3D"color: hsl(120, 100%, 40%);">+ OVERLAPPED dco_new_peer_ov;=

struct overlapped_io reads;
stru= ct overlapped_io writes;
struct rw_handle rw_handle;

To view, visit change 1030. To unsubscribe, = or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I83831060fdf5588a0ada8d6abbe= dc7ce3ded4182
Gerrit-Change-Number: 1030
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--yVC8AUkX528=--