summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@rambler-co.ru>2009-08-19 17:56:47 +0400
committerVsevolod Stakhov <vsevolod@rambler-co.ru>2009-08-19 17:56:47 +0400
commitc20b6d238d2ab997736af53237d48200226b8c08 (patch)
treed37613075a09291127ecf427f626f3296aee0699 /src
parent4f5c104c782b4965bd1fd6ff86be4e9deede33a8 (diff)
downloadrspamd-c20b6d238d2ab997736af53237d48200226b8c08.tar.gz
rspamd-c20b6d238d2ab997736af53237d48200226b8c08.zip
* Fix descriptors leakage in controller
Diffstat (limited to 'src')
-rw-r--r--src/controller.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/controller.c b/src/controller.c
index 30daa26fc..d7917508a 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -141,6 +141,8 @@ free_session (struct controller_session *session, gboolean is_soft)
rspamd_remove_dispatcher (session->dispatcher);
}
+ close (session->sock);
+
memory_pool_delete (session->session_pool);
g_free (session);
}
@@ -524,9 +526,7 @@ controller_write_socket (void *arg)
struct controller_session *session = (struct controller_session *)arg;
if (session->state == STATE_QUIT) {
- msg_info ("closing control connection");
/* Free buffers */
- close (session->sock);
free_session (session, TRUE);
return;
}
@@ -541,10 +541,7 @@ controller_err_socket (GError *err, void *arg)
{
struct controller_session *session = (struct controller_session *)arg;
- if (err->code == EOF) {
- msg_info ("controller_err_socket: client closed control connection");
- }
- else {
+ if (err->code != EOF) {
msg_info ("controller_err_socket: abnormally closing control connection, error: %s", err->message);
}
/* Free buffers */