daemon: improve cleanup code.

Resolves all memory leaks that can be possibly resolved, glib
nonwithstanding.

Signed-off-by: Gediminas Jakutis <gediminas@varciai.lt>

1 files changed, 18 insertions, 1 deletions

diff --git a/src/daemon/main.c b/src/daemon/main.c
index 41e798b..94e59fd 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -21,11 +21,18 @@
 
 #include <unistd.h>
 #include <time.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "settings.h"
 #include "net.h"
 #include "purple.h"
 
+static struct _state {
+	int nd;
+} _progstate;
+
+void cleanup(void);
+
 /* the logic is a placeholder right now */
 int main(int argc, char **argv)
 {
@@ -34,8 +41,9 @@ int main(int argc, char **argv)
 
 	printf("Usurpation daemon version %s starting\n", version);
 
+	atexit(cleanup);
 	settings_init();
-	net_init(setting_port()); /* TODO: get port from settings. */
+	_progstate.nd = net_init(setting_port());
 	if (purple_init() && setting_verbose()) {
 		fprintf(stderr, "libpurple initialization failed\n");
 	}
@@ -52,4 +60,13 @@ int main(int argc, char **argv)
 		/* noop */
 
 	}
+
+	return 0;
+}
+
+void cleanup(void)
+{
+	purple_close();
+	net_close(_progstate.nd);
+	settings_cleanup();
 }