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/+/1555?usp=email
to review the following change.
Change subject: socket: restore per-connection lport override over global
default
......................................................................
socket: restore per-connection lport override over global default
OpenVPN 2.7.x introduced a regression where --lport specified
inside a <connection> block did not override a globally defined
local port. As a result, the socket was bound to the global
default port instead of the per-connection value.
Adjust the socket local_port selection logic to honour
local_port_defined when set for the active connection profile.
This change restores the documented and previously working
behaviour from 2.6.x, where connection-level lport takes
precedence over global defaults.
Github: #995
Change-Id: I7cf5d5ef7e2531f397ad97baf4663e3763072f6b
Signed-off-by: Gianmarco De Gregori <[email protected]>
---
M src/openvpn/socket.c
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/55/1555/1
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index 1df1001..32e2a65 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -1347,7 +1347,9 @@
ASSERT(sock);
const char *host = o->ce.local_list->array[sock_index]->local;
- const char *port = o->ce.local_list->array[sock_index]->port;
+ const char *port = (o->mode == MODE_POINT_TO_POINT &&
o->ce.local_port_defined)
+ ? o->ce.local_port
+ : o->ce.local_list->array[sock_index]->port;
int proto = o->ce.local_list->array[sock_index]->proto;
const char *remote_host = o->ce.remote;
const char *remote_port = o->ce.remote_port;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1555?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I7cf5d5ef7e2531f397ad97baf4663e3763072f6b
Gerrit-Change-Number: 1555
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
