denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deferred instantiation of socket implmentations until registration.

Browse Source 
Instantiating the implementations on plugin load was problematic
in case multiple socket plugins were loaded. Now, the first one
registered is instantiated.
This commit is contained in:
Tobias Brunner
2010-10-15 17:30:21 +02:00
parent 4de8398f93
commit fa20849431
11 changed files with 104 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/socket_default/socket_default_plugin.c
+6 -13
View File
@@ -1,4 +1,6 @@
/*
* Copyright (C) 2010 Tobias Brunner
* Hochschule fuer Technik Rapperswil
* Copyright (C) 2010 Martin Willi
* Copyright (C) 2010 revosec AG
*
@@ -31,17 +33,13 @@ struct private_socket_default_plugin_t {
*/
socket_default_plugin_t public;
/**
* Socket instance.
*/
socket_default_socket_t *socket;
};
METHOD(plugin_t, destroy, void,
private_socket_default_plugin_t *this)
{
charon->socket->remove_socket(charon->socket, &this->socket->socket);
this->socket->destroy(this->socket);
charon->socket->remove_socket(charon->socket,
(socket_constructor_t)socket_default_socket_create);
free(this);
}
@@ -58,15 +56,10 @@ plugin_t *socket_default_plugin_create()
.destroy = _destroy,
},
},
.socket = socket_default_socket_create(),
);
if (!this->socket)
{
free(this);
return NULL;
}
charon->socket->add_socket(charon->socket, &this->socket->socket);
charon->socket->add_socket(charon->socket,
(socket_constructor_t)socket_default_socket_create);
return &this->public.plugin;
}
src/libcharon/plugins/socket_default/socket_default_socket.c
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2006-2009 Tobias Brunner
* Copyright (C) 2006-2010 Tobias Brunner
* Copyright (C) 2006 Daniel Roethlisberger
* Copyright (C) 2005-2010 Martin Willi
* Copyright (C) 2005 Jan Hutter
@@ -546,7 +546,7 @@ static int open_socket(private_socket_default_socket_t *this,
return skt;
}
METHOD(socket_default_socket_t, destroy, void,
METHOD(socket_t, destroy, void,
private_socket_default_socket_t *this)
{
if (this->ipv4)
@@ -580,8 +580,8 @@ socket_default_socket_t *socket_default_socket_create()
.socket = {
.send = _sender,
.receive = _receiver,
.destroy = _destroy,
},
.destroy = _destroy,
},
.max_packet = lib->settings->get_int(lib->settings,
"charon.max_packet", MAX_PACKET),
src/libcharon/plugins/socket_default/socket_default_socket.h
-4
View File
@@ -35,10 +35,6 @@ struct socket_default_socket_t {
*/
socket_t socket;
/**
* Destroy a socket_default_socket_t.
*/
void (*destroy)(socket_default_socket_t *this);
};
/**
src/libcharon/plugins/socket_dynamic/socket_dynamic_plugin.c
+6 -13
View File
@@ -1,4 +1,6 @@
/*
* Copyright (C) 2010 Tobias Brunner
* Hochschule fuer Technik Rapperswil
* Copyright (C) 2010 Martin Willi
* Copyright (C) 2010 revosec AG
*
@@ -31,17 +33,13 @@ struct private_socket_dynamic_plugin_t {
*/
socket_dynamic_plugin_t public;
/**
* Socket instance.
*/
socket_dynamic_socket_t *socket;
};
METHOD(plugin_t, destroy, void,
private_socket_dynamic_plugin_t *this)
{
charon->socket->remove_socket(charon->socket, &this->socket->socket);
this->socket->destroy(this->socket);
charon->socket->remove_socket(charon->socket,
(socket_constructor_t)socket_dynamic_socket_create);
free(this);
}
@@ -58,15 +56,10 @@ plugin_t *socket_dynamic_plugin_create()
.destroy = _destroy,
},
},
.socket = socket_dynamic_socket_create(),
);
if (!this->socket)
{
free(this);
return NULL;
}
charon->socket->add_socket(charon->socket, &this->socket->socket);
charon->socket->add_socket(charon->socket,
(socket_constructor_t)socket_dynamic_socket_create);
return &this->public.plugin;
}
src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2006-2009 Tobias Brunner
* Copyright (C) 2006-2010 Tobias Brunner
* Copyright (C) 2006 Daniel Roethlisberger
* Copyright (C) 2005-2010 Martin Willi
* Copyright (C) 2005 Jan Hutter
@@ -572,7 +572,7 @@ METHOD(socket_t, sender, status_t,
return SUCCESS;
}
METHOD(socket_dynamic_socket_t, destroy, void,
METHOD(socket_t, destroy, void,
private_socket_dynamic_socket_t *this)
{
enumerator_t *enumerator;
@@ -605,8 +605,8 @@ socket_dynamic_socket_t *socket_dynamic_socket_create()
.socket = {
.send = _sender,
.receive = _receiver,
.destroy = _destroy,
},
.destroy = _destroy,
},
.lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
.max_packet = lib->settings->get_int(lib->settings,
src/libcharon/plugins/socket_raw/socket_raw_plugin.c
+6 -13
View File
@@ -1,4 +1,6 @@
/*
* Copyright (C) 2010 Tobias Brunner
* Hochschule fuer Technik Rapperswil
* Copyright (C) 2010 Martin Willi
* Copyright (C) 2010 revosec AG
*
@@ -31,17 +33,13 @@ struct private_socket_raw_plugin_t {
*/
socket_raw_plugin_t public;
/**
* Raw socket instance.
*/
socket_raw_socket_t *socket;
};
METHOD(plugin_t, destroy, void,
private_socket_raw_plugin_t *this)
{
charon->socket->remove_socket(charon->socket, &this->socket->socket);
this->socket->destroy(this->socket);
charon->socket->remove_socket(charon->socket,
(socket_constructor_t)socket_raw_socket_create);
free(this);
}
@@ -58,15 +56,10 @@ plugin_t *socket_raw_plugin_create()
.destroy = _destroy,
},
},
.socket = socket_raw_socket_create(),
);
if (!this->socket)
{
free(this);
return NULL;
}
charon->socket->add_socket(charon->socket, &this->socket->socket);
charon->socket->add_socket(charon->socket,
(socket_constructor_t)socket_raw_socket_create);
return &this->public.plugin;
}
src/libcharon/plugins/socket_raw/socket_raw_socket.c
+4 -3
View File
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2006 Tobias Brunner, Daniel Roethlisberger
* Copyright (C) 2006-2010 Tobias Brunner
* Copyright (C) 2005-2010 Martin Willi
* Copyright (C) 2006 Daniel Roethlisberger
* Copyright (C) 2005 Jan Hutter
* Hochschule fuer Technik Rapperswil
*
@@ -612,7 +613,7 @@ static int open_recv_socket(private_socket_raw_socket_t *this, int family)
return skt;
}
METHOD(socket_raw_socket_t, destroy, void,
METHOD(socket_t, destroy, void,
private_socket_raw_socket_t *this)
{
if (this->recv4)
@@ -654,8 +655,8 @@ socket_raw_socket_t *socket_raw_socket_create()
.socket = {
.send = _sender,
.receive = _receiver,
.destroy = _destroy,
},
.destroy = _destroy,
},
.max_packet = lib->settings->get_int(lib->settings,
"charon.max_packet", MAX_PACKET),
src/libcharon/plugins/socket_raw/socket_raw_socket.h
-4
View File
@@ -41,10 +41,6 @@ struct socket_raw_socket_t {
*/
socket_t socket;
/**
* Destroy a socket_raw_socket_t.
*/
void (*destroy)(socket_raw_socket_t *this);
};
/**