From 87a217f9f1640ed08dbe06564f6fbcd3cdfdeefb Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 20 Mar 2006 15:43:26 +0000 Subject: - works quite well now with ipsec.conf & ipsec starter --- Source/charon/threads/stroke.h | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'Source/charon/threads/stroke.h') diff --git a/Source/charon/threads/stroke.h b/Source/charon/threads/stroke.h index 4fc0fe5e7..267c455f0 100644 --- a/Source/charon/threads/stroke.h +++ b/Source/charon/threads/stroke.h @@ -60,20 +60,10 @@ struct stroke_msg_t { struct { char *name; struct { - union { - u_int16_t family; - struct sockaddr saddr; - struct sockaddr_in v4; - struct sockaddr_in6 v6; - } address; char *id; - union { - u_int16_t family; - struct sockaddr saddr; - struct sockaddr_in v4; - struct sockaddr_in6 v6; - } subnet; - u_int8_t subnet_netbits; + char *address; + char *subnet; + u_int8_t subnet_mask; } me, other; } add_conn; }; @@ -99,10 +89,12 @@ typedef struct stroke_t stroke_t; * stroke_t.interface_xy to access the specific interface! You have * been warned... * + * @todo Add clean thread cancellation + * * @b Constructors: * - stroke_create() * - * @ingroup config + * @ingroup threads */ struct stroke_t { @@ -135,7 +127,7 @@ struct stroke_t { * * @return stroke_t object * - * @ingroup config + * @ingroup threads */ stroke_t *stroke_create(); -- cgit v1.2.3