Change in openvpn[master]: Multi-socket: local_list clean-up
A message that is not in the archive (sent off-list or not yet received): gerrit.1749198097000.I32effed9e273fbe8986d1f4e8da4a4d0ac216463@...2715...
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1039?usp=email
to review the following change.
Change subject: Multi-socket: local_list clean-up
......................................................................
Multi-socket: local_list clean-up
Optimize the current local_list implementation
by replacing the static array with a resizable
one, as the static allocation serves no real
purpose, particularly on the client side.
Github: #682
---
M src/openvpn/options.c
M src/openvpn/options.h
2 files changed, 14 insertions(+), 5 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/39/1039/1
src/openvpn/options.c +12 -4
@@ -2212,12 +2212,20 @@struct local_list *l =alloc_local_list_if_undef (ce, gc);struct local_entry *e; -if (l->len >=CONNECTION_LIST_SIZE ) +if (l->len >= l->capacity) { -msg (msglevel,"Maximum number of 'local' options (%d) exceeded" , -CONNECTION_LIST_SIZE ); +const int new_cap = l->capacity +1 ; +const size_t elem_size =sizeof (*l->array); -return NULL ; +struct local_entry **new_array =gc_realloc (l->array, new_cap * elem_size, gc); +if (!new_array) + { +msg (msglevel,"Unable to process more local options: out of memory. Number of entries = %d" , l->len); +return NULL ; + } + + l->array = new_array; + l->capacity = new_cap; } ALLOC_OBJ_CLEAR_GC(e, struct local_entry, gc);
src/openvpn/options.h +2 -1
@@ -188,8 +188,9 @@struct local_list { +int capacity;int len; -struct local_entry *array[CONNECTION_LIST_SIZE ]; +struct local_entry **array; };struct connection_list
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1039?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I32effed9e273fbe8986d1f4e8da4a4d0ac216463
Gerrit-Change-Number: 1039
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, its_Giaan, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1039?usp=email )
Change subject: Multi-socket: local_list clean-up
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1039?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I32effed9e273fbe8986d1f4e8da4a4d0ac216463
Gerrit-Change-Number: 1039
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Wed, 18 Jun 2025 13:59:57 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH 1/1 Multi-socket: local_list clean-up
In reply to a message not in the archiveFrom: Gianmarco De Gregori <[email protected]...>
Optimize the current local_list implementation
by replacing the static array with a resizable
one, as the static allocation serves no real
purpose, particularly on the client side.
Github: #682
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1039
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/options.c +12 -4
@@ -2212,12 +2212,20 @@struct local_list *l =alloc_local_list_if_undef (ce, gc);struct local_entry *e; -if (l->len >=CONNECTION_LIST_SIZE ) +if (l->len >= l->capacity) { -msg (msglevel,"Maximum number of 'local' options (%d) exceeded" , -CONNECTION_LIST_SIZE ); +const int new_cap = l->capacity +1 ; +const size_t elem_size =sizeof (*l->array); -return NULL ; +struct local_entry **new_array =gc_realloc (l->array, new_cap * elem_size, gc); +if (!new_array) + { +msg (msglevel,"Unable to process more local options: out of memory. Number of entries = %d" , l->len); +return NULL ; + } + + l->array = new_array; + l->capacity = new_cap; } ALLOC_OBJ_CLEAR_GC(e, struct local_entry, gc);
src/openvpn/options.h +2 -1
@@ -188,8 +188,9 @@struct local_list { +int capacity;int len; -struct local_entry *array[CONNECTION_LIST_SIZE ]; +struct local_entry **array; };struct connection_list
[Openvpn-devel] [PATCH applied] Re: Multi-socket: local_list clean-up
Stared-at-code, looks good. Tested on the server instance with lots of --local lines (+ some msg() calls to see l->len and l_capacity), and it does what it promises. Thanks :-)
Your patch has been applied to the master branch.
commit 9bb02bc34f5ecc85364fa7ab64e52b6c5c918055
Author: Gianmarco De Gregori Date: Wed Jun 18 16:00:09 2025 +0200
Multi-socket: local_list clean-up
Signed-off-by: Gianmarco De Gregori <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31927.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#2) to the change originally created by its_Giaan. ( http://gerrit.openvpn.net/c/openvpn/+/1039?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: Multi-socket: local_list clean-up
......................................................................
Multi-socket: local_list clean-up
Optimize the current local_list implementation
by replacing the static array with a resizable
one, as the static allocation serves no real
purpose, particularly on the client side.
Github: OpenVPN/openvpn#682
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31927.html
---
M src/openvpn/options.c
M src/openvpn/options.h
2 files changed, 14 insertions(+), 5 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/39/1039/2
src/openvpn/options.c +12 -4
@@ -2067,12 +2067,20 @@struct local_list *l =alloc_local_list_if_undef (ce, gc);struct local_entry *e; -if (l->len >=CONNECTION_LIST_SIZE ) +if (l->len >= l->capacity) { -msg (msglevel,"Maximum number of 'local' options (%d) exceeded" , -CONNECTION_LIST_SIZE ); +const int new_cap = l->capacity +1 ; +const size_t elem_size =sizeof (*l->array); -return NULL ; +struct local_entry **new_array =gc_realloc (l->array, new_cap * elem_size, gc); +if (!new_array) + { +msg (msglevel,"Unable to process more local options: out of memory. Number of entries = %d" , l->len); +return NULL ; + } + + l->array = new_array; + l->capacity = new_cap; } ALLOC_OBJ_CLEAR_GC(e, struct local_entry, gc);
src/openvpn/options.h +2 -1
@@ -188,8 +188,9 @@struct local_list { +int capacity;int len; -struct local_entry *array[CONNECTION_LIST_SIZE ]; +struct local_entry **array; };struct connection_list
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1039?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I32effed9e273fbe8986d1f4e8da4a4d0ac216463
Gerrit-Change-Number: 1039
Gerrit-PatchSet: 2
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1039?usp=email )
Change subject: Multi-socket: local_list clean-up
......................................................................
Multi-socket: local_list clean-up
Optimize the current local_list implementation
by replacing the static array with a resizable
one, as the static allocation serves no real
purpose, particularly on the client side.
Github: OpenVPN/openvpn#682
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31927.html
---
M src/openvpn/options.c
M src/openvpn/options.h
2 files changed, 14 insertions(+), 5 deletions(-)
src/openvpn/options.c +12 -4
@@ -2067,12 +2067,20 @@struct local_list *l =alloc_local_list_if_undef (ce, gc);struct local_entry *e; -if (l->len >=CONNECTION_LIST_SIZE ) +if (l->len >= l->capacity) { -msg (msglevel,"Maximum number of 'local' options (%d) exceeded" , -CONNECTION_LIST_SIZE ); +const int new_cap = l->capacity +1 ; +const size_t elem_size =sizeof (*l->array); -return NULL ; +struct local_entry **new_array =gc_realloc (l->array, new_cap * elem_size, gc); +if (!new_array) + { +msg (msglevel,"Unable to process more local options: out of memory. Number of entries = %d" , l->len); +return NULL ; + } + + l->array = new_array; + l->capacity = new_cap; } ALLOC_OBJ_CLEAR_GC(e, struct local_entry, gc);
src/openvpn/options.h +2 -1
@@ -188,8 +188,9 @@struct local_list { +int capacity;int len; -struct local_entry *array[CONNECTION_LIST_SIZE ]; +struct local_entry **array; };struct connection_list
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1039?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I32effed9e273fbe8986d1f4e8da4a4d0ac216463
Gerrit-Change-Number: 1039
Gerrit-PatchSet: 2
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged