Changeset 235:8773740401a5 in freeDiameter for extensions/test_app

Timestamp:

Mar 5, 2010, 7:01:48 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Centralized signal handlers management in the library

Location:

extensions/test_app

Files:

• CMakeLists.txt (modified) (1 diff)
• ta_cli.c (modified) (3 diffs)
• ta_sig.c (deleted)
• test_app.c (modified) (1 diff)
• test_app.h (modified) (2 diffs)

extensions/test_app/CMakeLists.txt

@@ -14 +14 @@
         ta_conf.tab.c
         ta_conf.tab.h
-        ta_sig.c
         ta_dict.c
         ta_cli.c

extensions/test_app/ta_cli.c

@@ -136 +136 @@
 
 /* Create a test message */
-static void ta_cli_test_message(void)
+static void ta_cli_test_message(int sig)
 {
         struct msg * req = NULL;
@@ -236 +236 @@
         CHECK_FCT( fd_sess_handler_create(&ta_cli_reg, free) );
         
-        CHECK_FCT( ta_sig_init(ta_cli_test_message) );
+        CHECK_FCT( fd_sig_register(ta_conf->signal, "test_app.cli", ta_cli_test_message ) );
         
         return 0;
@@ -243 +243 @@
 void ta_cli_fini(void)
 {
-        ta_sig_fini();
-        
-        (void) fd_sess_handler_destroy(&ta_cli_reg);
+        CHECK_FCT_DO( fd_sig_unregister(ta_conf->signal), /* continue */ );
+        
+        CHECK_FCT_DO( fd_sess_handler_destroy(&ta_cli_reg), /* continue */ );
         
         return;

extensions/test_app/test_app.c

@@ -39 +39 @@
 
 #include "test_app.h"
-#include <signal.h>
 
 /* Initialize the configuration */

extensions/test_app/test_app.h

@@ -42 +42 @@
  
 #include <freeDiameter/extension.h>
+#include <signal.h>
 
 #ifndef TEST_APP_DEFAULT_SIGNAL
@@ -69 +70 @@
 int ta_conf_handle(char * conffile);
 
-/* Start or stop the signal handler */
-int ta_sig_init(void (*cb)(void));
-void ta_sig_fini(void);
-
 /* Handle incoming messages (server) */
 int ta_serv_init(void);