Changeset 1190:6a1042d8075b in freeDiameter for libfdcore/cnxctx.c

Timestamp:

Jun 10, 2013, 5:44:18 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Replace FDEV_TERMINATE events with calls to fd_core_shutdown to handle the core state properly

File:

• libfdcore/cnxctx.c (modified) (5 diffs)

libfdcore/cnxctx.c

@@ -611 +611 @@
         /* An unrecoverable error occurred, stop the daemon */
         ASSERT(0);
-        CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );       
+        CHECK_FCT_DO(fd_core_shutdown(), );     
 }
 
@@ -843 +843 @@
                         { 
                                 free_rcvdata(&rcv_data);
-                                CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
-                                return NULL; 
+                                goto fatal; 
                         } );
                 
@@ -855 +854 @@
 fatal:
         /* An unrecoverable error occurred, stop the daemon */
-        CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+        CHECK_FCT_DO(fd_core_shutdown(), );
         goto out;
 }
@@ -908 +907 @@
 fatal:
         /* An unrecoverable error occurred, stop the daemon */
-        CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+        CHECK_FCT_DO(fd_core_shutdown(), );
         goto out;
 }
@@ -1099 +1098 @@
                         { 
                                 free_rcvdata(&rcv_data);
-                                CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+                                CHECK_FCT_DO(fd_core_shutdown(), );
                                 return ret; 
                         } );