aboutsummaryrefslogtreecommitdiff
path: root/socket.h
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 /socket.h
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 'socket.h')
-rw-r--r--socket.h36
1 files changed, 6 insertions, 30 deletions
diff --git a/socket.h b/socket.h
index 460b85c..6a393e5 100644
--- a/socket.h
+++ b/socket.h
@@ -47,22 +47,6 @@
*/
#define RESOLV_RETRY_INFINITE 1000000000
-#define REMOTE_LIST_SIZE 64
-
-struct remote_entry
-{
- const char *hostname;
- int port;
-};
-
-struct remote_list
-{
- int len;
- int current;
- bool no_advance;
- struct remote_entry array[REMOTE_LIST_SIZE];
-};
-
/*
* packet_size_type is used to communicate packet size
* over the wire when stream oriented protocols are
@@ -175,8 +159,9 @@ struct link_socket
/* used for long-term queueing of pre-accepted socket listen */
bool listen_persistent_queued;
- /* set on initial call to init phase 1 */
- struct remote_list *remote_list;
+ /* Does config file contain any <connection> ... </connection> blocks? */
+ bool connection_profiles_defined;
+
const char *remote_host;
int remote_port;
const char *local_host;
@@ -290,9 +275,11 @@ int openvpn_connect (socket_descriptor_t sd,
void
link_socket_init_phase1 (struct link_socket *sock,
+ const bool connection_profiles_defined,
const char *local_host,
- struct remote_list *remote_list,
int local_port,
+ const char *remote_host,
+ int remote_port,
int proto,
int mode,
const struct link_socket *accept_from,
@@ -391,8 +378,6 @@ void link_socket_bad_outgoing_addr (void);
void setenv_trusted (struct env_set *es, const struct link_socket_info *info);
-void remote_list_randomize (struct remote_list *l);
-
bool link_socket_update_flags (struct link_socket *ls, unsigned int sockflags);
void link_socket_update_buffer_sizes (struct link_socket *ls, int rcvbuf, int sndbuf);
@@ -467,15 +452,6 @@ datagram_overhead (int proto)
* Misc inline functions
*/
-static inline int
-remote_list_len (const struct remote_list *rl)
-{
- if (rl)
- return rl->len;
- else
- return 0;
-}
-
static inline bool
legal_ipv4_port (int port)
{