aboutsummaryrefslogtreecommitdiff
path: root/options.h
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2009-09-27 02:12:15 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2009-09-27 02:12:15 +0000
commit3eee126eba7314e203a50b6398fa5333cbf12ff7 (patch)
tree2b07c330d53e1346c5383bfefe1a997d54bbde7c /options.h
parentThe maximum number of "route" directives (specified in the config (diff)
downloadopenvpn-3eee126eba7314e203a50b6398fa5333cbf12ff7.tar.xz
Eliminated the limitation on the number of options that can be pushed
to clients, including routes. Previously, all pushed options needed to fit within a 1024 byte options string. Remember that to make use of this feature to allow many routes to be pushed to clients, the client config file must specify the max-routes option, and the number of pushed routes cannot exceed this limit. Also, both server and client must include this commit. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@4991 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'options.h')
-rw-r--r--options.h15
1 files changed, 3 insertions, 12 deletions
diff --git a/options.h b/options.h
index 9210aca..fbf0e3c 100644
--- a/options.h
+++ b/options.h
@@ -40,6 +40,7 @@
#include "manage.h"
#include "proxy.h"
#include "lzo.h"
+#include "pushlist.h"
/*
* Maximum number of parameters associated with an option,
@@ -57,17 +58,6 @@ extern const char title_string[];
#if P2MP
-#if P2MP_SERVER
-/* parameters to be pushed to peer */
-
-#define MAX_PUSH_LIST_LEN TLS_CHANNEL_BUF_SIZE /* This parm is related to PLAINTEXT_BUFFER_SIZE in ssl.h */
-
-struct push_list {
- /* newline delimited options, like config file */
- char options[MAX_PUSH_LIST_LEN];
-};
-#endif
-
/* certain options are saved before --pull modifications are applied */
struct options_pre_pull
{
@@ -362,7 +352,7 @@ struct options
in_addr_t server_bridge_pool_start;
in_addr_t server_bridge_pool_end;
- struct push_list *push_list;
+ struct push_list push_list;
bool ifconfig_pool_defined;
in_addr_t ifconfig_pool_start;
in_addr_t ifconfig_pool_end;
@@ -405,6 +395,7 @@ struct options
bool client;
bool pull; /* client pull of config options from server */
+ int push_continuation;
const char *auth_user_pass_file;
struct options_pre_pull *pre_pull;