From: Fabian Knittel <fabian.knit...@lettink.de>
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.knit...@lettink.de>
Signed-off-by: Arne Schwabe <a...@rfc2549.org>
---
src/openvpn/multi.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 8fc69a07..bc9fddce 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -2041,6 +2041,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);
+
}
/**
@@ -2086,6 +2092,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);
}
@@ -2115,19 +2128,11 @@ 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);
+
multi_client_connect_call_plugin_v2(m, mi, &option_types_found,
&cc_succeeded,
&cc_succeeded_count);
--
2.19.1
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
