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

stream: use a service constructor to create services

Browse Source 
It does not make much sense to reference running services in the manager,
especially as unregistration would need the URI (which a user would have to
store instead of the service reference).
This commit is contained in:
Martin Willi
2013-07-18 16:00:28 +02:00
parent fbdc65debb
commit 047a190600
2 changed files with 8 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/networking/streams/stream_manager.c
+4 -61
View File
@@ -39,11 +39,6 @@ struct private_stream_manager_t {
*/
linked_list_t *services;
/**
* List of registered running services, as running_entry_t
*/
linked_list_t *running;
/**
* Lock for all lists
*/
@@ -70,16 +65,6 @@ typedef struct {
stream_service_constructor_t create;
} service_entry_t;
/**
* Running service
*/
typedef struct {
/** URI of service */
char *uri;
/** stream accept()ing connections */
stream_service_t *service;
} running_entry_t;
METHOD(stream_manager_t, connect_, stream_t*,
private_stream_manager_t *this, char *uri)
{
@@ -106,11 +91,9 @@ METHOD(stream_manager_t, connect_, stream_t*,
return stream;
}
METHOD(stream_manager_t, start_service, bool,
private_stream_manager_t *this, char *uri, int backlog,
stream_service_cb_t cb, void *data, job_priority_t prio, u_int cncrncy)
METHOD(stream_manager_t, create_service, stream_service_t*,
private_stream_manager_t *this, char *uri, int backlog)
{
running_entry_t *running;
enumerator_t *enumerator;
service_entry_t *entry;
stream_service_t *service = NULL;
@@ -131,44 +114,7 @@ METHOD(stream_manager_t, start_service, bool,
enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
if (!service)
{
return FALSE;
}
INIT(running,
.uri = strdup(uri),
.service = service,
);
service->on_accept(service, cb, data, prio, cncrncy);
this->lock->write_lock(this->lock);
this->running->insert_last(this->running, running);
this->lock->unlock(this->lock);
return TRUE;
}
METHOD(stream_manager_t, stop_service, void,
private_stream_manager_t *this, char *uri)
{
enumerator_t *enumerator;
running_entry_t *entry;
this->lock->write_lock(this->lock);
enumerator = this->running->create_enumerator(this->running);
while (enumerator->enumerate(enumerator, &entry))
{
if (streq(entry->uri, uri))
{
this->running->remove_at(this->running, enumerator);
entry->service->destroy(entry->service);
free(entry->uri);
free(entry);
}
}
enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
return service;
}
METHOD(stream_manager_t, add_stream, void,
@@ -254,7 +200,6 @@ METHOD(stream_manager_t, destroy, void,
this->streams->destroy(this->streams);
this->services->destroy(this->services);
this->running->destroy(this->running);
this->lock->destroy(this->lock);
free(this);
}
@@ -269,8 +214,7 @@ stream_manager_t *stream_manager_create()
INIT(this,
.public = {
.connect = _connect_,
.start_service = _start_service,
.stop_service = _stop_service,
.create_service = _create_service,
.add_stream = _add_stream,
.remove_stream = _remove_stream,
.add_service = _add_service,
@@ -279,7 +223,6 @@ stream_manager_t *stream_manager_create()
},
.streams = linked_list_create(),
.services = linked_list_create(),
.running = linked_list_create(),
.lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
);
src/libstrongswan/networking/streams/stream_manager.h
+4 -16
View File
@@ -40,26 +40,14 @@ struct stream_manager_t {
stream_t* (*connect)(stream_manager_t *this, char *uri);
/**
* Start a new service under an URI, accept()ing client connections.
* Create a new service under an URI to accept() client connections.
*
* @param uri URI of service to provide
* @param backlog size of the backlog queue, as passed to listen()
* @param cb callback function invoked for each client connection
* @param data user data to pass to callback
* @param prio job priority to invoke callback with
* @param cncrncy maximum number of parallel callback invocations
* @return TRUE if service started, FALSE on failure
* @return service, NULL on error
*/
bool (*start_service)(stream_manager_t *this, char *uri, int backlog,
stream_service_cb_t cb, void *data,
job_priority_t prio, u_int cncrncy);
/**
* Stop a service previously create with start_service().
*
* @param uri URI of service to stop
*/
void (*stop_service)(stream_manager_t *this, char *uri);
stream_service_t* (*create_service)(stream_manager_t *this, char *uri,
int backlog);
/**
* Register a stream backend to the manager.