aboutsummaryrefslogtreecommitdiff
path: root/helper.c
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-06-11 10:48:50 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-06-11 10:48:50 +0000
commit4e9a51d78ffa0696cf7d14ff0292ca8863689f70 (patch)
tree0509760011393888bddef1bfc0330d6a5b670671 /helper.c
parentUpdated version to 2.1_rc7e. (diff)
downloadopenvpn-4e9a51d78ffa0696cf7d14ff0292ca8863689f70.tar.xz
Merged connection profiles from
http://svn.openvpn.net/projects/openvpn/test/conn git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2993 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'helper.c')
-rw-r--r--helper.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/helper.c b/helper.c
index a216687..4ec63f2 100644
--- a/helper.c
+++ b/helper.c
@@ -281,9 +281,6 @@ helper_client_server (struct options *o)
o->push_ifconfig_constraint_network = o->server_network;
o->push_ifconfig_constraint_netmask = o->server_netmask;
}
-
- if (o->proto == PROTO_TCPv4)
- o->proto = PROTO_TCPv4_SERVER;
}
/*
@@ -325,9 +322,6 @@ helper_client_server (struct options *o)
ifconfig_pool_verify_range (M_USAGE, o->ifconfig_pool_start, o->ifconfig_pool_end);
o->ifconfig_pool_netmask = o->server_bridge_netmask;
push_option (o, print_opt_route_gateway (o->server_bridge_ip, &o->gc), M_USAGE);
-
- if (o->proto == PROTO_TCPv4)
- o->proto = PROTO_TCPv4_SERVER;
}
else
#endif /* P2MP_SERVER */
@@ -349,16 +343,10 @@ helper_client_server (struct options *o)
o->pull = true;
o->tls_client = true;
-
- if (o->proto == PROTO_TCPv4)
- o->proto = PROTO_TCPv4_CLIENT;
}
#endif /* P2MP */
- if (o->proto == PROTO_TCPv4)
- msg (M_USAGE, "--proto tcp is ambiguous in this context. Please specify --proto tcp-server or --proto tcp-client");
-
gc_free (&gc);
}