aboutsummaryrefslogtreecommitdiff
path: root/ssl.h
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-15 08:44:02 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-15 08:44:02 +0000
commit8bc93d7ffbc127e0b095c7274a68eb0c175f93ae (patch)
treebe0d71b15492041caeb3deb1ac923123a44ea96e /ssl.h
parentMerged --capath patch (Thomas Noel). (diff)
downloadopenvpn-8bc93d7ffbc127e0b095c7274a68eb0c175f93ae.tar.xz
svn merge -r 618:619 $SO/patches/openvpn-2-0_rc16-mh/openvpn
Merged --multihome patch + aggregated sockflags. Pre-2.1_beta3 git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@622 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to '')
-rw-r--r--ssl.h18
1 files changed, 12 insertions, 6 deletions
diff --git a/ssl.h b/ssl.h
index 77c2e73..0e41690 100644
--- a/ssl.h
+++ b/ssl.h
@@ -344,8 +344,8 @@ struct key_state
time_t must_die; /* this object is destroyed at this time */
int initial_opcode; /* our initial P_ opcode */
- struct session_id session_id_remote; /* peer's random session ID */
- struct sockaddr_in remote_addr; /* peer's IP addr */
+ struct session_id session_id_remote; /* peer's random session ID */
+ struct link_socket_actual remote_addr; /* peer's IP addr */
struct packet_id packet_id; /* for data channel, to prevent replay attacks */
struct key_ctx_bi key; /* data channel keys for encrypt/decrypt/hmac */
@@ -488,7 +488,7 @@ struct tls_session
bool verified; /* true if peer certificate was verified against CA */
/* not-yet-authenticated incoming client */
- struct sockaddr_in untrusted_sockaddr;
+ struct link_socket_actual untrusted_addr;
struct key_state key[KS_SIZE];
};
@@ -535,6 +535,12 @@ struct tls_multi
struct key_state *save_ks; /* temporary pointer used between pre/post routines */
/*
+ * Used to return outgoing address from
+ * tls_multi_process.
+ */
+ struct link_socket_actual to_link_addr;
+
+ /*
* Number of sessions negotiated thus far.
*/
int n_sessions;
@@ -590,19 +596,19 @@ void tls_multi_init_set_options(struct tls_multi* multi,
bool tls_multi_process (struct tls_multi *multi,
struct buffer *to_link,
- struct sockaddr_in *to_link_addr,
+ struct link_socket_actual **to_link_addr,
struct link_socket_info *to_link_socket_info,
interval_t *wakeup);
void tls_multi_free (struct tls_multi *multi, bool clear);
bool tls_pre_decrypt (struct tls_multi *multi,
- struct sockaddr_in *from,
+ const struct link_socket_actual *from,
struct buffer *buf,
struct crypto_options *opt);
bool tls_pre_decrypt_lite (const struct tls_auth_standalone *tas,
- const struct sockaddr_in *from,
+ const struct link_socket_actual *from,
const struct buffer *buf);
void tls_pre_encrypt (struct tls_multi *multi,