From: "cron2 (Code Review)" Date: Tue, 15 Jul 2025 20:05:04 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="hj3jGnqZTZE="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: reliable: Review and fix gc_arena usage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld , plaisthos Cc: openvpn-devel --hj3jGnqZTZE= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#4) to the change originally created by= flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1083?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+1 by cron2, Code-Review+2 by plaisthos Change subject: reliable: Review and fix gc_arena usage ...................................................................... reliable: Review and fix gc_arena usage Check for unused objects (in reliable_get_num_output_sequenced_available) and missing free (in reliable_can_get). While looking through the code, modernize the loop variable usage. Change-Id: I8cefa9a406fe90bb3cbe481304782c639691a3a0 Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe Message-Id: <20250715143750.9719-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 157.html Signed-off-by: Gert Doering --- M src/openvpn/reliable.c 1 file changed, 29 insertions(+), 56 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/83/1083/4 diff --git a/src/openvpn/reliable.c b/src/openvpn/reliable.c index 424d194..5505f56 100644 --- a/src/openvpn/reliable.c +++ b/src/openvpn/reliable.c @@ -98,8 +98,7 @@ static inline bool reliable_ack_packet_id_present(struct reliable_ack *ack, packet_id_type pi= d) { - int i; - for (i =3D 0; i < ack->len; ++i) + for (int i =3D 0; i < ack->len; ++i) { if (ack->packet_id[i] =3D=3D pid) { @@ -312,10 +311,7 @@ const char * reliable_ack_print(struct buffer *buf, bool verbose, struct gc_arena *gc) { - int i; uint8_t n_ack; - struct session_id sid_ack; - packet_id_type pid; struct buffer out =3D alloc_buf_gc(256, gc); buf_printf(&out, "["); @@ -323,8 +319,9 @@ { goto done; } - for (i =3D 0; i < n_ack; ++i) + for (int i =3D 0; i < n_ack; ++i) { + packet_id_type pid; if (!buf_read(buf, &pid, sizeof(pid))) { goto done; @@ -334,6 +331,7 @@ } if (n_ack) { + struct session_id sid_ack; if (!session_id_read(&sid_ack, buf)) { goto done; @@ -356,14 +354,12 @@ void reliable_init(struct reliable *rel, int buf_size, int offset, int array_si= ze, bool hold) { - int i; - CLEAR(*rel); ASSERT(array_size > 0 && array_size <=3D RELIABLE_CAPACITY); rel->hold =3D hold; rel->size =3D array_size; rel->offset =3D offset; - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { struct reliable_entry *e =3D &rel->array[i]; e->buf =3D alloc_buf(buf_size); @@ -378,8 +374,7 @@ { return; } - int i; - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { struct reliable_entry *e =3D &rel->array[i]; free_buf(&e->buf); @@ -391,8 +386,7 @@ bool reliable_empty(const struct reliable *rel) { - int i; - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { const struct reliable_entry *e =3D &rel->array[i]; if (e->active) @@ -407,11 +401,10 @@ void reliable_send_purge(struct reliable *rel, const struct reliable_ack *ack) { - int i, j; - for (i =3D 0; i < ack->len; ++i) + for (int i =3D 0; i < ack->len; ++i) { packet_id_type pid =3D ack->packet_id[i]; - for (j =3D 0; j < rel->size; ++j) + for (int j =3D 0; j < rel->size; ++j) { struct reliable_entry *e =3D &rel->array[j]; if (e->active && e->packet_id =3D=3D pid) @@ -449,10 +442,9 @@ reliable_print_ids(const struct reliable *rel, struct gc_arena *gc) { struct buffer out =3D alloc_buf_gc(256, gc); - int i; buf_printf(&out, "[" packet_id_format "]", (packet_id_print_type)rel->= packet_id); - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { const struct reliable_entry *e =3D &rel->array[i]; if (e->active) @@ -468,9 +460,7 @@ bool reliable_can_get(const struct reliable *rel) { - struct gc_arena gc =3D gc_new(); - int i; - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { const struct reliable_entry *e =3D &rel->array[i]; if (!e->active) @@ -478,6 +468,7 @@ return true; } } + struct gc_arena gc =3D gc_new(); dmsg(D_REL_LOW, "ACK no free receive buffer available: %s", reliable_p= rint_ids(rel, &gc)); gc_free(&gc); return false; @@ -488,12 +479,11 @@ reliable_not_replay(const struct reliable *rel, packet_id_type id) { struct gc_arena gc =3D gc_new(); - int i; if (reliable_pid_min(id, rel->packet_id)) { goto bad; } - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { const struct reliable_entry *e =3D &rel->array[i]; if (e->active && e->packet_id =3D=3D id) @@ -514,19 +504,17 @@ bool reliable_wont_break_sequentiality(const struct reliable *rel, packet_id_ty= pe id) { - struct gc_arena gc =3D gc_new(); - const int ret =3D reliable_pid_in_range2(id, rel->packet_id, rel->size= ); if (!ret) { + struct gc_arena gc =3D gc_new(); dmsg(D_REL_LOW, "ACK " packet_id_format " breaks sequentiality: %s= ", (packet_id_print_type)id, reliable_print_ids(rel, &gc)); + gc_free(&gc); } dmsg(D_REL_DEBUG, "ACK RWBS rel->size=3D%d rel->packet_id=3D%08x id=3D= %08x ret=3D%d", rel->size, rel->packet_id, id, ret); - - gc_free(&gc); return ret; } @@ -534,8 +522,7 @@ struct buffer * reliable_get_buf(struct reliable *rel) { - int i; - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { struct reliable_entry *e =3D &rel->array[i]; if (!e->active) @@ -550,7 +537,6 @@ int reliable_get_num_output_sequenced_available(struct reliable *rel) { - struct gc_arena gc =3D gc_new(); packet_id_type min_id =3D 0; bool min_id_defined =3D false; @@ -573,7 +559,6 @@ { ret -=3D subtract_pid(rel->packet_id, min_id); } - gc_free(&gc); return ret; } @@ -581,14 +566,12 @@ struct buffer * reliable_get_buf_output_sequenced(struct reliable *rel) { - struct gc_arena gc =3D gc_new(); - int i; packet_id_type min_id =3D 0; bool min_id_defined =3D false; struct buffer *ret =3D NULL; /* find minimum active packet_id */ - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { const struct reliable_entry *e =3D &rel->array[i]; if (e->active) @@ -607,9 +590,10 @@ } else { + struct gc_arena gc =3D gc_new(); dmsg(D_REL_LOW, "ACK output sequence broken: %s", reliable_print_i= ds(rel, &gc)); + gc_free(&gc); } - gc_free(&gc); return ret; } @@ -617,8 +601,7 @@ struct reliable_entry * reliable_get_entry_sequenced(struct reliable *rel) { - int i; - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { struct reliable_entry *e =3D &rel->array[i]; if (e->active && e->packet_id =3D=3D rel->packet_id) @@ -634,9 +617,8 @@ reliable_can_send(const struct reliable *rel) { struct gc_arena gc =3D gc_new(); - int i; int n_active =3D 0, n_current =3D 0; - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { const struct reliable_entry *e =3D &rel->array[i]; if (e->active) @@ -662,11 +644,10 @@ struct buffer * reliable_send(struct reliable *rel, int *opcode) { - int i; struct reliable_entry *best =3D NULL; const time_t local_now =3D now; - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { struct reliable_entry *e =3D &rel->array[i]; @@ -701,10 +682,9 @@ void reliable_schedule_now(struct reliable *rel) { - int i; dmsg(D_REL_DEBUG, "ACK reliable_schedule_now"); rel->hold =3D false; - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { struct reliable_entry *e =3D &rel->array[i]; if (e->active) @@ -722,10 +702,9 @@ { struct gc_arena gc =3D gc_new(); interval_t ret =3D BIG_TIMEOUT; - int i; const time_t local_now =3D now; - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { const struct reliable_entry *e =3D &rel->array[i]; if (e->active) @@ -758,8 +737,7 @@ reliable_mark_active_incoming(struct reliable *rel, struct buffer *buf, packet_id_type pid, int opcode) { - int i; - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { struct reliable_entry *e =3D &rel->array[i]; if (buf =3D=3D &e->buf) @@ -790,8 +768,7 @@ void reliable_mark_active_outgoing(struct reliable *rel, struct buffer *buf, in= t opcode) { - int i; - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { struct reliable_entry *e =3D &rel->array[i]; if (buf =3D=3D &e->buf) @@ -817,8 +794,7 @@ void reliable_mark_deleted(struct reliable *rel, struct buffer *buf) { - int i; - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { struct reliable_entry *e =3D &rel->array[i]; if (buf =3D=3D &e->buf) @@ -836,10 +812,8 @@ void reliable_ack_debug_print(const struct reliable_ack *ack, char *desc) { - int i; - printf("********* struct reliable_ack %s\n", desc); - for (i =3D 0; i < ack->len; ++i) + for (int i =3D 0; i < ack->len; ++i) { printf(" %d: " packet_id_format "\n", i, (packet_id_print_type) a= ck->packet_id[i]); } @@ -848,14 +822,13 @@ void reliable_debug_print(const struct reliable *rel, char *desc) { - int i; update_time(); printf("********* struct reliable %s\n", desc); printf(" initial_timeout=3D%d\n", (int)rel->initial_timeout); printf(" packet_id=3D" packet_id_format "\n", rel->packet_id); printf(" now=3D%" PRIi64 "\n", (int64_t)now); - for (i =3D 0; i < rel->size; ++i) + for (int i =3D 0; i < rel->size; ++i) { const struct reliable_entry *e =3D &rel->array[i]; if (e->active) -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1083?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: I8cefa9a406fe90bb3cbe481304782c639691a3a0 Gerrit-Change-Number: 1083 Gerrit-PatchSet: 4 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --hj3jGnqZTZE= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #4 to the change originally cr= eated by flichtenheld.

View Change

The following approvals got outd= ated and were removed: Code-Review+1 by cron2, Code-Review+2 by plaisthos

reliable: Review and fix=
 gc_arena usage

Check for unused objects (in
reliable_get_num_out= put_sequenced_available)
and missing free (in reliable_can_get).

= While looking through the code, modernize
the loop variable usage.
Change-Id: I8cefa9a406fe90bb3cbe481304782c639691a3a0
Signed-off-by: Fr= ank Lichtenheld <frank@...2641...>
Acked-by: Arne Schwabe <arne= -openvpn@...1227...>
Message-Id: <20250715143750.9719-1-gert@...1711...= 96...>
URL: https://www.mail-archive.com/openvpn-devel@...1357...= rge.net/msg32157.html
Signed-off-by: Gert Doering <gert@...1296...>= ;
---
M src/openvpn/reliable.c
1 file changed, 29 insertions(+), 5= 6 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn re=
fs/changes/83/1083/4
diff --git a/src/openvpn/reliable.c b/src/open=
vpn/reliable.c
index 424d194..5505f56 100644
--- a/src/openvpn/reliable.c
+++ b/src/openvpn/reliable.c=
@@ -98,8 +98,7 @@
static inline bool

reliable_ack_packet_id_present(struct reliable_ack *ack, packe= t_id_type pid)
{
- int i;
= - for (i =3D 0; i < ack->len; ++i)
+ for (int i =3D 0; i < ack->len; ++i)
{
if (ack->packet_id[i] =3D=3D= pid)
{
@@ -312,10 +311,7 @@
const char *
reliable_ack_print(struct buffer = *buf, bool verbose, struct gc_arena *gc)
{
- int i;

uint8= _t n_ack;
- struct s= ession_id sid_ack;
- = packet_id_type pid;
struct buffer out =3D alloc_buf_g= c(256, gc);

buf_printf(&out, &qu= ot;[");
@@ -323,8 +319,9 @@
{
goto done;
}
- for (i =3D 0; i < n_ack; ++i)
+ for (int i =3D 0; i = < n_ack; ++i)
{
+ packet_id_type pid;
if= (!buf_read(buf, &pid, sizeof(pid)))
{<= br> goto done;
@@ -334,6 +331,7 @@=
}
if (n_ack)
{
+ struct session_= id sid_ack;
if (!session_id_read(&sid_ack, buf= ))
{
goto done;
@@ -356,14 +354,12 @@
void
rel= iable_init(struct reliable *rel, int buf_size, int offset, int array_size, = bool hold)
{
- int i;
-
CLEAR(*rel);
ASSERT(array_size >= 0 && array_size <=3D RELIABLE_CAPACITY);
r= el->hold =3D hold;
rel->size =3D array_size;
rel->offset =3D offset;
- for (i =3D 0; i < rel->size; ++i)+ for (int i =3D 0; i <= rel->size; ++i)
{
struct = reliable_entry *e =3D &rel->array[i];
e->= ;buf =3D alloc_buf(buf_size);
@@ -378,8 +374,7 @@ {
return;
}
- int i;
- for (i =3D 0; i < rel->size;= ++i)
+ for (int i= =3D 0; i < rel->size; ++i)
{
= struct reliable_entry *e =3D &rel->array[i];
= free_buf(&e->buf);
@@ -391,8 +386,7 @@
bool
reliable_empty(const struct reliable *re= l)
{
-= int i;
- for (i = =3D 0; i < rel->size; ++i)
+ for (int i =3D 0; i < rel->size; ++i)
{

const struct reliable_entry *e =3D &r= el->array[i];
if (e->active)
@@ -407,11 +401,10 @@

void
reliable_send= _purge(struct reliable *rel, const struct reliable_ack *ack)
{

- int i, j;
- for (i =3D 0; i < = ack->len; ++i)
+ = for (int i =3D 0; i < ack->len; ++i)
{<= br> packet_id_type pid =3D ack->packet_id[i];
- for (j =3D 0; j < rel-&= gt;size; ++j)

+ = for (int j =3D 0; j < rel->size; ++j)
{
struct reliable_entry *e =3D &rel->array[= j];
if (e->active && e->packet_i= d =3D=3D pid)
@@ -449,10 +442,9 @@
reliabl= e_print_ids(const struct reliable *rel, struct gc_arena *gc)
{

struct buffer out =3D alloc_buf_gc(256, gc);
- int i;

buf_printf(&out, "[" packet_id_format= "]", (packet_id_print_type)rel->packet_id);
- for (i =3D 0; i < rel->size; = ++i)
+ for (int i = =3D 0; i < rel->size; ++i)
{
= const struct reliable_entry *e =3D &rel->array[i];
<= span> if (e->active)

@@ -468,9 +460,7 @@<= br> bool
reliable_can_get(const struct reliable *rel= )
{
- = struct gc_arena gc =3D gc_new();
- int i;
+ for (int i =3D 0; i < rel->size; ++i)<= /span>
{
const struct reliable_entry= *e =3D &rel->array[i];
if (!e->active)<= /span>
@@ -478,6 +468,7 @@
return tru= e;
}
}
+ struct gc_arena gc =3D gc_new();
dmsg(D_REL_LOW, "ACK no free receive buffer available= : %s", reliable_print_ids(rel, &gc));
gc_free= (&gc);
return false;
@@ -488,12 +4= 79,11 @@
reliable_not_replay(const struct reliable *rel, p= acket_id_type id)
{
struct gc_arena g= c =3D gc_new();
- in= t i;
if (reliable_pid_min(id, rel->packet_id))
{
goto bad;
= }
- for (i =3D 0; i = < rel->size; ++i)
+ for (int i =3D 0; i < rel->size; ++i)
{<= /span>
const struct reliable_entry *e =3D &rel->ar= ray[i];
if (e->active && e->packet_i= d =3D=3D id)
@@ -514,19 +504,17 @@
bool
reliable_wont_break_sequentiality(const struct reliable *rel= , packet_id_type id)
{
- struct gc_arena gc =3D gc_new();
-
const int ret =3D re= liable_pid_in_range2(id, rel->packet_id, rel->size);
=
if (!ret)
{
+ struct gc_arena gc =3D gc_new()= ;
dmsg(D_REL_LOW, "ACK " packet_id_forma= t " breaks sequentiality: %s",
(pac= ket_id_print_type)id, reliable_print_ids(rel, &gc));
+ gc_free(&gc);
}


dmsg(D_REL_DEBUG, "A= CK RWBS rel->size=3D%d rel->packet_id=3D%08x id=3D%08x ret=3D%d"= , rel->size, rel->packet_id, id, ret);
-
- gc_free(&gc);
return ret;
}=

@@ -534,8 +522,7 @@
str= uct buffer *
reliable_get_buf(struct reliable *rel)=
{
- int i= ;
- for (i =3D 0; i = < rel->size; ++i)
+ for (int i =3D 0; i < rel->size; ++i)
{<= /span>
struct reliable_entry *e =3D &rel->array[i]= ;
if (!e->active)
@@ -550,7 +53= 7,6 @@
int
reliable_get_num_output_sequen= ced_available(struct reliable *rel)
{
- struct gc_arena gc =3D gc_new();
packet_id_type min_id =3D 0;
bool min_= id_defined =3D false;

@@ -573,7 +559,6 @@=
{
ret -=3D subtract_pid(rel-= >packet_id, min_id);
}
- gc_free(&gc);
return = ret;
}

@@ -581,14 +566,1= 2 @@
struct buffer *
reliable_get_buf_out= put_sequenced(struct reliable *rel)
{
- struct gc_arena gc =3D gc_new();
- int i;
= packet_id_type min_id =3D 0;
bool min_id_defined = =3D false;
struct buffer *ret =3D NULL;

/* find minimum active packet_id */
- for (i =3D 0; i < rel->siz= e; ++i)

+ for (int= i =3D 0; i < rel->size; ++i)
{
= const struct reliable_entry *e =3D &rel->array[i]; if (e->active)
@@ -607,9 +590,10 @@
}
else
{=
+ struct gc_arena gc= =3D gc_new();
dmsg(D_REL_LOW, "ACK output se= quence broken: %s", reliable_print_ids(rel, &gc));
+ gc_free(&gc);
}
- gc_f= ree(&gc);
return ret;
}
@@ -617,8 +601,7 @@
struct reliab= le_entry *
reliable_get_entry_sequenced(struct reliable *r= el)
{
= - int i;
- for (i= =3D 0; i < rel->size; ++i)
+ for (int i =3D 0; i < rel->size; ++i)
{

struct reliable_entry *e =3D &rel-&g= t;array[i];
if (e->active && e->pack= et_id =3D=3D rel->packet_id)
@@ -634,9 +617,8 @@<= br> reliable_can_send(const struct reliable *rel)
{<= /span>
struct gc_arena gc =3D gc_new();
- int i;
int n_activ= e =3D 0, n_current =3D 0;
- for (i =3D 0; i < rel->size; ++i)
+ for (int i =3D 0; i < rel->size; ++i)=
{
const struct reliable_entr= y *e =3D &rel->array[i];
if (e->active)<= /span>
@@ -662,11 +644,10 @@
struct buffer *
reliable_send(struct reliable *rel, int *opcode)
{

- int i;
struct reliable_entry *best =3D NULL;
= const time_t local_now =3D now;

- for (i =3D 0; i < rel->size; ++i)
+ for (int i =3D 0; i= < rel->size; ++i)
{
st= ruct reliable_entry *e =3D &rel->array[i];
<= br>@@ -701,10 +682,9 @@
void
reliab= le_schedule_now(struct reliable *rel)
{
- int i;
dmsg(D_R= EL_DEBUG, "ACK reliable_schedule_now");
rel-= >hold =3D false;
- = for (i =3D 0; i < rel->size; ++i)
+ for (int i =3D 0; i < rel->size; ++i)
{
struct reliable_entry *e =3D &am= p;rel->array[i];
if (e->active)
@@ -722,10 +702,9 @@

{
struct gc_= arena gc =3D gc_new();
interval_t ret =3D BIG_TIMEOUT;=
- int i;
= const time_t local_now =3D now;

- for (i =3D 0; i < rel->siz= e; ++i)

+ for (int= i =3D 0; i < rel->size; ++i)
{
= const struct reliable_entry *e =3D &rel->array[i]; if (e->active)
@@ -758,8 +737,7 @@
reliable_mark_active_incoming(struct reliable *rel, struct buf= fer *buf,
packet_id_type pid= , int opcode)
{
- int i;
-= for (i =3D 0; i < rel->size; ++i)
+ for (int i =3D 0; i < rel->size; ++i)
{
struct reliable_entry *e =3D &= amp;rel->array[i];
if (buf =3D=3D &e->bu= f)
@@ -790,8 +768,7 @@
void
reliable_mark_active_outgoing(struct reliable *rel, struct buffer *buf, = int opcode)

{
- int i;
- = for (i =3D 0; i < rel->size; ++i)
+ for (int i =3D 0; i < rel->size; ++i)
{
struct reliable_entry *e =3D &am= p;rel->array[i];
if (buf =3D=3D &e->buf)=
@@ -817,8 +794,7 @@
void
= reliable_mark_deleted(struct reliable *rel, struct buffer *buf)
= {
- int i;
- for (i =3D 0; i <= rel->size; ++i)
+= for (int i =3D 0; i < rel->size; ++i)
{
struct reliable_entry *e =3D &rel->array[i];
if (buf =3D=3D &e->buf)
@@ -8= 36,10 +812,8 @@
void
reliable_ack_debug_p= rint(const struct reliable_ack *ack, char *desc)
{<= br>- int i;
-
printf("*****= **** struct reliable_ack %s\n", desc);
- for (i =3D 0; i < ack->len; ++i)
= + for (int i =3D 0; i < a= ck->len; ++i)
{
printf(&qu= ot; %d: " packet_id_format "\n", i, (packet_id_print_type) = ack->packet_id[i]);
}
@@ -848,14 +8= 22,13 @@
void
reliable_debug_print(const = struct reliable *rel, char *desc)
{
- int i;
update_time= ();

printf("********* struct re= liable %s\n", desc);
printf(" initial_timeo= ut=3D%d\n", (int)rel->initial_timeout);
printf= (" packet_id=3D" packet_id_format "\n", rel->packet= _id);
printf(" now=3D%" PRIi64 "\n&quo= t;, (int64_t)now);
- = for (i =3D 0; i < rel->size; ++i)
+ for (int i =3D 0; i < rel->size; ++i)=
{
const struct reliable_entry *e = =3D &rel->array[i];
if (e->active)

To view, visit change 1083. To unsubscribe, or f= or help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8cefa9a406fe90bb3cbe4813047= 82c639691a3a0
Gerrit-Change-Number: 1083
Gerrit-PatchSet: 4
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: newpatchset
--hj3jGnqZTZE=--