From: "flichtenheld (Code Review)"
Date: Mon, 26 May 2025 10:36:12 +0000
References:
Reply-To: frank@...2641..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="57uukC87hQM="; 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: plaisthos
Cc: openvpn-devel
--57uukC87hQM=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1030?usp=3Demail
to review the following change.
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
---
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(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/30/1030/1
diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c
index b2a5bf5..4b83eeb 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 7f47319..6ab06bb 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 f06d6df..d9aca1e 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 bcc18a5..4528edd 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -8398,9 +8398,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 d77c99e..7a362e0 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 9543732..04aa5c6 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 de1876a..379a31a 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: 1
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-MessageType: newchange
--57uukC87hQM=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: plaisthos.
flichtenheld would like plaisthos to review this change.
V=
iew Change
Fix various badly placed comments in preparation for reforma=
t
Change-Id: I83831060fdf5588a0ada8d6abbedc7ce3ded4182
Signed-off=
-by: Frank Lichtenheld <frank@...2641...>
---
M src/openvpn/buf=
fer.c
M src/openvpn/multi_io.c
M src/openvpn/networking.h
M src/op=
envpn/options.c
M src/openvpn/otime.c
M src/openvpn/otime.h
M src/=
openvpn/tun.h
7 files changed, 15 insertions(+), 8 deletions(-)
<=
/pre>git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/30/1030/1
=
diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c
index b2a5bf5..4b83eeb 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 non-control and UTF-8, consider DEL to be a control */<=
br>+ /* allow ascii non-cont=
rol 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/o=
penvpn/multi_io.c b/src/openvpn/multi_io.c
index 7f47319..6=
ab06bb 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.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 f06d6df..d9aca1e=
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 bcc18a5..4528edd 100644
--- a/src/openvpn/options.=
c
+++ b/src/openvpn/options.c
@@ -8398,9 +8=
398,10 @@
VERIFY_PERMISSION(OPT_P_DHCPDNS);=
setenv_foreign_option(options, (const char **)p, 3, es);=
}
- else if (streq(p[0], "route-method") && p[1] &&=
amp; !p[2]) /* ignore when pushed to non-Windows OS */
+ else if (streq(p[0], "route-met=
hod") && p[1] && !p[2])
{<=
br> VERIFY_PERMISSION(OPT_P_ROUTE_EXTRAS);
+ /* ignore when pushed to non-W=
indows OS */
}
#endif /* ifdef _WIN32=
*/
#if PASSTOS_CAPABILITY
diff --git a/sr=
c/openvpn/otime.c b/src/openvpn/otime.c
index d77c99e..7a36=
2e0 100644
--- a/src/openvpn/otime.c
+++ b/=
src/openvpn/otime.c
@@ -44,8 +44,10 @@
voi=
d
update_now(const time_t system_time)
{<=
/span>
- const int forward_=
threshold =3D 86400; /* threshold at which to dampen forward jumps */
- const int backward_trig=
ger =3D 10; /* backward jump must be >=3D this many seconds before we =
adjust */
+ /* thr=
eshold 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 9543732..04aa5=
c6 100644
--- a/src/openvpn/otime.h
+++ b/s=
rc/openvpn/otime.h
@@ -246,7 +246,8 @@
sta=
tic inline bool
tv_within_sigma(const struct timeval *t1, =
const struct timeval *t2, unsigned int sigma)
{
=
- const int delta =3D tv_subtr=
act(t1, t2, TV_WITHIN_SIGMA_MAX_SEC); /* sigma should be less than 10 minut=
es */
+ /* sigma s=
hould be less than 10 minutes */
+ const int delta =3D tv_subtract(t1, t2, TV_WITHIN_SIGMA_MA=
X_SEC);
return -(int)sigma <=3D delta && de=
lta <=3D (int)sigma;
}
diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h
index =
de1876a..379a31a 100644
--- a/src/openvpn/tun.h
<=
span>+++ b/src/openvpn/tun.h
@@ -212,7 +212,8 @@
=
#ifdef _WIN32
HANDLE hand;
- OVERLAPPED dco_new_p=
eer_ov; /* used for async NEW_PEER dco call, which might wait for TCP conne=
ct */
+ /* used fo=
r async NEW_PEER dco call, which might wait for TCP connect */
+ OVERLAPPED dco_new_peer_ov;<=
/span>
struct overlapped_io reads;
struc=
t overlapped_io writes;
struct rw_handle rw_handle;
To view, visit change 1030. To unsubscribe, o=
r for help writing mail filters, visit settings.
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I83831060fdf5588a0ada8d6abbe=
dc7ce3ded4182
Gerrit-Change-Number: 1030
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <frank@...2723...=
.>
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-MessageType: newchange
--57uukC87hQM=--