Sender: Fabian Knittel From: Fabian Knittel Date: Sat, 17 Jan 2015 12:30:26 +0000 Message-Id: <1421497831-3424-5-git-send-email-fabian.knittel@...1547...> In-Reply-To: <1421497831-3424-1-git-send-email-fabian.knittel@...1547...> References: <1412978966-15392-1-git-send-email-fabian.knittel@...1547...> <1421497831-3424-1-git-send-email-fabian.knittel@...1547...> Subject: [Openvpn-devel] [PATCH v2 4/9] client-connect: Move multi_client_connect_setenv into early_setup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: openvpn-devel@lists.sourceforge.net 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 --- src/openvpn/multi.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 8cc61d7..e9fbdc6 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1646,15 +1646,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); @@ -1711,6 +1702,10 @@ 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); } /* @@ -1753,6 +1748,12 @@ multi_client_connect_source_ccd (struct multi_context *m, 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_set_virtual_addr_env (m, mi); } gc_free (&gc); -- 2.1.4