mirror/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-09-20 03:52:28 +02:00
Code

client-connect: Move multi_client_connect_setenv into early_setup

Browse Source 
This patch moves multi_client_connect_setenv into
multi_client_connect_early_setup and makes sure that every client-connect
handling function updates the virtual address selection.

Background: This unifies how the client-connect handling functions work.

Signed-off-by: Fabian Knittel <fabian.knittel@lettink.de>
Signed-off-by: Arne Schwabe <arne@rfc2549.org>

Patch V5: Rebase on master

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20200711093655.23686-4-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20288.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Fabian Knittel 2020-07-11 11:36:45 +02:00 committed by Gert Doering
parent 62a840e2ab
commit 380a142a6b
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/openvpn/multi.c
View File

@ -2159,6 +2159,12 @@ multi_client_connect_early_setup(struct multi_context *m,
/* reset pool handle to null */
mi->vaddr_handle = -1;
/* do --client-connect setenvs */
multi_select_virtual_addr(m, mi);
multi_client_connect_setenv(m, mi);
}
/**
@ -2204,6 +2210,13 @@ multi_client_connect_source_ccd(struct multi_context *m,
CLIENT_CONNECT_OPT_MASK,
option_types_found,
mi->context.c2.es);
/*
* Select a virtual address from either --ifconfig-push in
* --client-config-dir file or --ifconfig-pool.
*/
multi_select_virtual_addr(m, mi);
multi_client_connect_setenv(m, mi);
}
gc_free(&gc);
}
@ -2245,15 +2258,6 @@ multi_connection_established(struct multi_context *m, struct multi_instance *mi)
multi_client_connect_source_ccd(m, mi, &option_types_found);
/*
* Select a virtual address from either --ifconfig-push in
* --client-config-dir file or --ifconfig-pool.
*/
multi_select_virtual_addr(m, mi);
/* do --client-connect setenvs */
multi_client_connect_setenv(m, mi);
multi_client_connect_call_plugin_v1(m, mi, &option_types_found,
&cc_succeeded,
&cc_succeeded_count);