Changes in freeDiameter/main.c [20:277ec00d793e:25:67ca08d5bc48] in freeDiameter

File:

• freeDiameter/main.c (modified) (5 diffs)

freeDiameter/main.c

@@ -51 +51 @@
 struct fd_config * fd_g_config = &conf;
 
+/* gcrypt functions to support posix threads */
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
@@ -105 +106 @@
         CHECK_FCT(  fd_ext_load()  );
         
+        fd_conf_dump();
+        
+        /* Start the servers */
+        CHECK_FCT( fd_servers_start() );
+        
         /* Start the peer state machines */
         CHECK_FCT( fd_psm_start() );
@@ -110 +116 @@
         /* Now, just wait for events */
         TRACE_DEBUG(INFO, FD_PROJECT_BINARY " daemon initialized.");
-        fd_conf_dump();
         while (1) {
-                int code;
-                CHECK_FCT_DO(  fd_event_get(fd_g_config->cnf_main_ev, &code, NULL),  break  );
+                int code; size_t sz; void * data;
+                CHECK_FCT_DO(  fd_event_get(fd_g_config->cnf_main_ev, &code, &sz, &data),  break  );
                 switch (code) {
                         case FDEV_DUMP_DICT:
@@ -154 +159 @@
         
         /* cleanups */
+        CHECK_FCT_DO( fd_servers_stop(), /* Stop accepting new connections */ );
         TODO("Stop dispatch thread(s) properly (no cancel yet)");
         CHECK_FCT_DO( fd_peer_fini(), /* Stop all connections */ );
@@ -333 +339 @@
         
         TRACE_DEBUG(INFO, "Received signal %s (%d), exiting", SIGNALSTR(sig), sig);
-        CHECK_FCT_DO( fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, NULL), exit(2) );
+        CHECK_FCT_DO( fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), exit(2) );
         return NULL;
 }