Changeset 97:00e36de5dcc4 in freeDiameter

Timestamp:

Dec 8, 2009, 10:55:57 AM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Resolved signal conflict

Location:

extensions

Files:

• app_test/app_test.c (modified) (2 diffs)
• app_test/app_test.h (modified) (2 diffs)
• dbg_monitor/monitor.c (modified) (2 diffs)

extensions/app_test/app_test.c

@@ -39 +39 @@
 
 #include "app_test.h"
+#include <signal.h>
 
 /* Initialize the configuration */
@@ -57 +58 @@
         atst_conf->dest_realm = strdup(fd_g_config->cnf_diamrlm);
         atst_conf->dest_host  = NULL;
-        atst_conf->signal     = 10; /* SIGUSR1 */
+        atst_conf->signal     = APP_TEST_DEFAULT_SIGNAL;
         
         return 0;

extensions/app_test/app_test.h

@@ -43 +43 @@
 #include <freeDiameter/extension.h>
 
+#ifndef APP_TEST_DEFAULT_SIGNAL
+#define APP_TEST_DEFAULT_SIGNAL SIGUSR1
+#endif /* APP_TEST_DEFAULT_SIGNAL */
+
+
 /* Mode for the extension */
 #define MODE_SERV       0x1
@@ -56 +61 @@
         char    *       dest_realm;     /* default local realm */
         char    *       dest_host;      /* default NULL */
-        int             signal;         /* default SIGUSR1 */
+        int             signal;         /* default APP_TEST_DEFAULT_SIGNAL */
 };
 extern struct atst_conf * atst_conf;

extensions/dbg_monitor/monitor.c

@@ -36 +36 @@
 /* Monitoring extension:
  - periodically display queues and peers information
- - upon SIGUSR1, display additional debug information
+ - upon SIGUSR2, display additional debug information
  */
 
 #include <freeDiameter/extension.h>
 #include <signal.h>
+
+#ifndef MONITOR_SIGNAL
+#define MONITOR_SIGNAL  SIGUSR2
+#endif /* MONITOR_SIGNAL */
 
 static int       monitor_main(char * conffile);
@@ -64 +68 @@
         memset(&act, 0, sizeof(act));
         act.sa_handler = got_sig;
-        CHECK_SYS_DO( sigaction(SIGUSR1, &act, NULL), /* conitnue */ );
+        CHECK_SYS_DO( sigaction(MONITOR_SIGNAL, &act, NULL), /* conitnue */ );
         sigemptyset(&sig);
-        sigaddset(&sig, SIGUSR1);
+        sigaddset(&sig, MONITOR_SIGNAL);
         CHECK_POSIX_DO(  pthread_sigmask(SIG_UNBLOCK, &sig, NULL), /* conitnue */  );