*: Convert quagga_signal_X to frr_signal_X

Naming functions/data structures more appropriately for
the project we are actually in.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/babeld/babel_main.c b/babeld/babel_main.c
index 61a800eef4a70dc3181711c7637094c4bbd1a87b..b29374fee32d287950ee1651d7a6be5071d8886a 100644 (file)
--- a/babeld/babel_main.c
+++ b/babeld/babel_main.c
@@ -115,7 +115,7 @@ babel_sigusr1 (void)
     zlog_rotate ();
 }
 
-static struct quagga_signal_t babel_signals[] =
+static struct frr_signal_t babel_signals[] =
   {
     {
       .signal = SIGUSR1,

diff --git a/bfdd/bfdd.c b/bfdd/bfdd.c
index 188e47905cfef441876b643030da499814d41545..c7649415133ea10effef0fda327e10818c686259 100644 (file)
--- a/bfdd/bfdd.c
+++ b/bfdd/bfdd.c
@@ -103,7 +103,7 @@ static void sighup_handler(void)
        vty_read_config(NULL, bfdd_di.config_file, config_default);
 }
 
-static struct quagga_signal_t bfd_signals[] = {
+static struct frr_signal_t bfd_signals[] = {
        {
                .signal = SIGUSR1,
                .handler = &sigusr1_handler,

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 08776d200f8a65a49f077e5c7d2e9f1335a3c0cb..6a01a6137c2f164c79ee4f0d12cb3ff574fa0dcd 100644 (file)
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -90,7 +90,7 @@ void sigusr1(void);
 static void bgp_exit(int);
 static void bgp_vrf_terminate(void);
 
-static struct quagga_signal_t bgp_signals[] = {
+static struct frr_signal_t bgp_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,

diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c
index 9acb517d8cf70b30b2c3ab071a2d7bcedea7983b..9dd795f0b0ae03cb65db908e2e9f03a9cd8b2c8b 100644 (file)
--- a/eigrpd/eigrp_main.c
+++ b/eigrpd/eigrp_main.c
@@ -120,7 +120,7 @@ static void sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t eigrp_signals[] = {
+struct frr_signal_t eigrp_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,

diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 6deeebda95b4cd772785f75b7336f0a381633c9a..fb4237f00253e9cefafa1c5c74906e5a96188ae8 100644 (file)
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -147,7 +147,7 @@ void sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t isisd_signals[] = {
+struct frr_signal_t isisd_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,

diff --git a/ldpd/lde.c b/ldpd/lde.c
index 0956310367e36cb0156a4ea0eb6f44497bd114f8..55fa806d4db23b196d8910f20e34eebe4dbd96ec 100644 (file)
--- a/ldpd/lde.c
+++ b/ldpd/lde.c
@@ -107,7 +107,7 @@ sigint(void)
        lde_shutdown();
 }
 
-static struct quagga_signal_t lde_signals[] =
+static struct frr_signal_t lde_signals[] =
 {
        {
                .signal = SIGHUP,

diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index 0ff3238ff955b518b0d0e3ffb25653fe92094b86..6fa0e330f878231fc6931b1b24c9b4b030146204 100644 (file)
--- a/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@ -180,7 +180,7 @@ sigusr1(void)
        zlog_rotate();
 }
 
-static struct quagga_signal_t ldp_signals[] =
+static struct frr_signal_t ldp_signals[] =
 {
        {
                .signal = SIGHUP,

diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c
index fff7ee7c67d648c4f46a4740540baef1b66b120c..31f8026e3f8c36e3838613de68b78aafd94efc4c 100644 (file)
--- a/ldpd/ldpe.c
+++ b/ldpd/ldpe.c
@@ -82,7 +82,7 @@ sigint(void)
        ldpe_shutdown();
 }
 
-static struct quagga_signal_t ldpe_signals[] =
+static struct frr_signal_t ldpe_signals[] =
 {
        {
                .signal = SIGHUP,

diff --git a/lib/libfrr.h b/lib/libfrr.h
index 3dc5d7af81db4c30fb4c04bfc53c4757cadfa3b6..ed7e9c099e3bbabca873e014fd9585fd65e7dc21 100644 (file)
--- a/lib/libfrr.h
+++ b/lib/libfrr.h
@@ -94,7 +94,7 @@ struct frr_daemon_info {
        const char *copyright;
        char startinfo[128];
 
-       struct quagga_signal_t *signals;
+       struct frr_signal_t *signals;
        size_t n_signals;
 
        struct zebra_privs_t *privs;

diff --git a/lib/sigevent.c b/lib/sigevent.c
index 6710527ae9f0d26bd5aefa4cbc4f4b7a88a84b55..00bc31f5172415a824ccb71c89a916780d762926 100644 (file)
--- a/lib/sigevent.c
+++ b/lib/sigevent.c
@@ -36,10 +36,10 @@
 
 
 /* master signals descriptor struct */
-static struct quagga_sigevent_master_t {
+static struct frr_sigevent_master_t {
        struct thread *t;
 
-       struct quagga_signal_t *signals;
+       struct frr_signal_t *signals;
        int sigc;
 
        volatile sig_atomic_t caught;
@@ -48,10 +48,10 @@ static struct quagga_sigevent_master_t {
 /* Generic signal handler
  * Schedules signal event thread
  */
-static void quagga_signal_handler(int signo)
+static void frr_signal_handler(int signo)
 {
        int i;
-       struct quagga_signal_t *sig;
+       struct frr_signal_t *sig;
 
        for (i = 0; i < sigmaster.sigc; i++) {
                sig = &(sigmaster.signals[i]);
@@ -91,9 +91,9 @@ bool frr_sigevent_check(sigset_t *setp)
 }
 
 /* check if signals have been caught and run appropriate handlers */
-int quagga_sigevent_process(void)
+int frr_sigevent_process(void)
 {
-       struct quagga_signal_t *sig;
+       struct frr_signal_t *sig;
        int i;
 #ifdef SIGEVENT_BLOCK_SIGNALS
        /* shouldn't need to block signals, but potentially may be needed */
@@ -110,7 +110,7 @@ int quagga_sigevent_process(void)
 
        if ((sigprocmask(SIG_BLOCK, &newmask, &oldmask)) < 0) {
                flog_err_sys(EC_LIB_SYSTEM_CALL,
-                            "quagga_signal_timer: couldnt block signals!");
+                            "frr_signal_timer: couldnt block signals!");
                return -1;
        }
 #endif /* SIGEVENT_BLOCK_SIGNALS */
@@ -143,15 +143,15 @@ int quagga_sigevent_process(void)
 
 #ifdef SIGEVENT_SCHEDULE_THREAD
 /* timer thread to check signals. shouldn't be needed */
-int quagga_signal_timer(struct thread *t)
+int frr_signal_timer(struct thread *t)
 {
-       struct quagga_sigevent_master_t *sigm;
+       struct frr_sigevent_master_t *sigm;
 
        sigm = THREAD_ARG(t);
        sigm->t = NULL;
-       thread_add_timer(sigm->t->master, quagga_signal_timer, &sigmaster,
-                        QUAGGA_SIGNAL_TIMER_INTERVAL, &sigm->t);
-       return quagga_sigevent_process();
+       thread_add_timer(sigm->t->master, frr_signal_timer, &sigmaster,
+                        FRR_SIGNAL_TIMER_INTERVAL, &sigm->t);
+       return frr_sigevent_process();
 }
 #endif /* SIGEVENT_SCHEDULE_THREAD */
 
@@ -163,7 +163,7 @@ static int signal_set(int signo)
        struct sigaction sig;
        struct sigaction osig;
 
-       sig.sa_handler = &quagga_signal_handler;
+       sig.sa_handler = &frr_signal_handler;
        sigfillset(&sig.sa_mask);
        sig.sa_flags = 0;
        if (signo == SIGALRM) {
@@ -348,11 +348,11 @@ static void trap_default_signals(void)
 }
 
 void signal_init(struct thread_master *m, int sigc,
-                struct quagga_signal_t signals[])
+                struct frr_signal_t signals[])
 {
 
        int i = 0;
-       struct quagga_signal_t *sig;
+       struct frr_signal_t *sig;
 
        /* First establish some default handlers that can be overridden by
           the application. */
@@ -370,7 +370,7 @@ void signal_init(struct thread_master *m, int sigc,
 
 #ifdef SIGEVENT_SCHEDULE_THREAD
        sigmaster.t = NULL;
-       thread_add_timer(m, quagga_signal_timer, &sigmaster,
-                        QUAGGA_SIGNAL_TIMER_INTERVAL, &sigmaster.t);
+       thread_add_timer(m, frr_signal_timer, &sigmaster,
+                        FRR_SIGNAL_TIMER_INTERVAL, &sigmaster.t);
 #endif /* SIGEVENT_SCHEDULE_THREAD */
 }

diff --git a/lib/sigevent.h b/lib/sigevent.h
index 4a39b22889724d4c50144e684705b6d18ea16d59..dd1ee99587b510f009d44bbfc2a1864b9d298010 100644 (file)
--- a/lib/sigevent.h
+++ b/lib/sigevent.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _QUAGGA_SIGNAL_H
-#define _QUAGGA_SIGNAL_H
+#ifndef _FRR_SIGNAL_H
+#define _FRR_SIGNAL_H
 
 #include <thread.h>
 
@@ -29,9 +29,9 @@
 extern "C" {
 #endif
 
-#define QUAGGA_SIGNAL_TIMER_INTERVAL 2L
+#define FRR_SIGNAL_TIMER_INTERVAL 2L
 
-struct quagga_signal_t {
+struct frr_signal_t {
        int signal;         /* signal number    */
        void (*handler)(void); /* handler to call  */
 
@@ -42,11 +42,11 @@ struct quagga_signal_t {
  * takes:
  * - pointer to valid struct thread_master
  * - number of elements in passed in signals array
- * - array of quagga_signal_t's describing signals to handle
+ * - array of frr_signal_t's describing signals to handle
  *   and handlers to use for each signal
  */
 extern void signal_init(struct thread_master *m, int sigc,
-                       struct quagga_signal_t *signals);
+                       struct frr_signal_t *signals);
 
 
 /*
@@ -58,10 +58,10 @@ extern void signal_init(struct thread_master *m, int sigc,
 bool frr_sigevent_check(sigset_t *setp);
 
 /* check whether there are signals to handle, process any found */
-extern int quagga_sigevent_process(void);
+extern int frr_sigevent_process(void);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* _QUAGGA_SIGNAL_H */
+#endif /* _FRR_SIGNAL_H */

diff --git a/lib/thread.c b/lib/thread.c
index 5dbba6363d05d230a7b05bc3c94c6ac7d8ea9fd5..7b223ed6de84f293b51f639a0d9fb52ac7af84c4 100644 (file)
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -1695,7 +1695,7 @@ struct thread *thread_fetch(struct thread_master *m, struct thread *fetch)
        do {
                /* Handle signals if any */
                if (m->handle_signals)
-                       quagga_sigevent_process();
+                       frr_sigevent_process();
 
                pthread_mutex_lock(&m->mtx);
 

diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c
index 4c98f02e1d351796fb3550a7537b19c2880fa7d9..d8f14a3fc0ad70a6c77aa3f4ae033ae917b471e1 100644 (file)
--- a/nhrpd/nhrp_main.c
+++ b/nhrpd/nhrp_main.c
@@ -101,7 +101,7 @@ static void nhrp_request_stop(void)
        exit(0);
 }
 
-static struct quagga_signal_t sighandlers[] = {
+static struct frr_signal_t sighandlers[] = {
        {
                .signal = SIGUSR1,
                .handler = &nhrp_sigusr1,

diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 54cf142ba8739eb9506824cfe6c4ba6a3ba1ba7f..165a764c382dbc4e0ce3d1592040afa22a6c18eb 100644 (file)
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -148,7 +148,7 @@ static void sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t ospf6_signals[] = {
+struct frr_signal_t ospf6_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 257429ebe8fc900d96865ddf225dc4449e609b3a..2f9787bca5661b840dcf7a822c9e02ecf82d36ce 100644 (file)
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -112,7 +112,7 @@ static void sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t ospf_signals[] = {
+struct frr_signal_t ospf_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,

diff --git a/pathd/path_main.c b/pathd/path_main.c
index 7b702cca310393f0475295d51fcea5890a2afae2..0a71c80ef05b8ae6e44693bc41ebb10b8cfbc6f7 100644 (file)
--- a/pathd/path_main.c
+++ b/pathd/path_main.c
@@ -83,7 +83,7 @@ static void sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t path_signals[] = {
+struct frr_signal_t path_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,

diff --git a/pbrd/pbr_main.c b/pbrd/pbr_main.c
index c7cbbb4462686f1b0ec5daf50ef0d2fa1a7b8a50..59aa3676bfe6c2ffa5dbab147b5fb5acfd9d9c9a 100644 (file)
--- a/pbrd/pbr_main.c
+++ b/pbrd/pbr_main.c
@@ -95,7 +95,7 @@ static void sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t pbr_signals[] = {
+struct frr_signal_t pbr_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,

diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c
index 38387d38c3a7d9f23d6e35476491f18a43e09245..47220ccac70f3a2b81179d57365719a1fc729849 100644 (file)
--- a/pimd/pim_signals.c
+++ b/pimd/pim_signals.c
@@ -57,7 +57,7 @@ static void pim_sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t pimd_signals[] = {
+struct frr_signal_t pimd_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &pim_sighup,

diff --git a/pimd/pim_signals.h b/pimd/pim_signals.h
index a82915691b41ee1b96687ba984bfb4ebada0d014..ebc5b8eb21ace95a6e6e26bdc42b0a6cbbd728ba 100644 (file)
--- a/pimd/pim_signals.h
+++ b/pimd/pim_signals.h
@@ -21,6 +21,6 @@
 #define PIM_SIGNALS_H
 
 #include "sigevent.h"
-extern struct quagga_signal_t pimd_signals[];
+extern struct frr_signal_t pimd_signals[];
 
 #endif /* PIM_SIGNALS_H */

diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index 7b9146b13acb84afb552db5530281f4d3e38f906..6fb5ca95a918c2019deac9d8d19ad523ad37a8a3 100644 (file)
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -94,7 +94,7 @@ static void sigusr1(void)
        zlog_rotate();
 }
 
-static struct quagga_signal_t ripd_signals[] = {
+static struct frr_signal_t ripd_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,

diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index 34cd4ab0a7ff52a7164a5faf2d017a17626c11eb..bc169785a923e2ea568d232a9fe1ff848f0e6546 100644 (file)
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -94,7 +94,7 @@ static void sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t ripng_signals[] = {
+struct frr_signal_t ripng_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,

diff --git a/sharpd/sharp_main.c b/sharpd/sharp_main.c
index a646c313e42e73103759ecd0d43ad7c317a92350..8494f479c483c729121fc515e433e4366b43ee53 100644 (file)
--- a/sharpd/sharp_main.c
+++ b/sharpd/sharp_main.c
@@ -94,7 +94,7 @@ static void sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t sharp_signals[] = {
+struct frr_signal_t sharp_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,

diff --git a/staticd/static_main.c b/staticd/static_main.c
index f7a15462a0428f574f51861783a927bb5c5d0dfc..6051b2df1c8febc3c5acd24620a8e4f2c91bf6be 100644 (file)
--- a/staticd/static_main.c
+++ b/staticd/static_main.c
@@ -91,7 +91,7 @@ static void sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t static_signals[] = {
+struct frr_signal_t static_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,

diff --git a/tests/lib/test_segv.c b/tests/lib/test_segv.c
index 8133637adcd6819f16a4705c1d4932128965bcaa..494a162a453d19ad58788408f70811b98f238b80 100644 (file)
--- a/tests/lib/test_segv.c
+++ b/tests/lib/test_segv.c
@@ -28,7 +28,7 @@
 #include "lib/log.h"
 #include "lib/memory.h"
 
-struct quagga_signal_t sigs[] = {};
+struct frr_signal_t sigs[] = {};
 
 struct thread_master *master;
 

diff --git a/tests/lib/test_sig.c b/tests/lib/test_sig.c
index 2aceafb8f0f940b6389f22fb0452c1f14ac6fad7..9165f1850f77a70a37578080921e5929895998cf 100644 (file)
--- a/tests/lib/test_sig.c
+++ b/tests/lib/test_sig.c
@@ -36,18 +36,18 @@ static void sigusr2(void)
        printf("processed usr2\n");
 }
 
-struct quagga_signal_t sigs[] = {{
-                                        .signal = SIGHUP,
-                                        .handler = &sighup,
-                                },
-                                {
-                                        .signal = SIGUSR1,
-                                        .handler = &sigusr1,
-                                },
-                                {
-                                        .signal = SIGUSR2,
-                                        .handler = &sigusr2,
-                                }};
+struct frr_signal_t sigs[] = {{
+                                     .signal = SIGHUP,
+                                     .handler = &sighup,
+                             },
+                             {
+                                     .signal = SIGUSR1,
+                                     .handler = &sigusr1,
+                             },
+                             {
+                                     .signal = SIGUSR2,
+                                     .handler = &sigusr2,
+                             }};
 
 struct thread_master *master;
 struct thread t;

diff --git a/tests/lib/test_zmq.c b/tests/lib/test_zmq.c
index 65195aa3e1be361eed5ed94d5e3ecc22b8904e88..c411de7252540e55a2e2c94081aa320ff1358b88 100644 (file)
--- a/tests/lib/test_zmq.c
+++ b/tests/lib/test_zmq.c
@@ -266,7 +266,7 @@ static void sigchld(void)
        frrzmq_thread_cancel(&cb, &cb->write);
 }
 
-static struct quagga_signal_t sigs[] = {
+static struct frr_signal_t sigs[] = {
        {
                .signal = SIGCHLD,
                .handler = sigchld,

diff --git a/vrrpd/vrrp_main.c b/vrrpd/vrrp_main.c
index 990fa9e3821026c8e4d556b520984f122497034a..59769788e7e5ec6fcb5f313deec9e37bd7efce3d 100644 (file)
--- a/vrrpd/vrrp_main.c
+++ b/vrrpd/vrrp_main.c
@@ -93,7 +93,7 @@ static void sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t vrrp_signals[] = {
+struct frr_signal_t vrrp_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,

diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c
index b09d0924588467e1678bd027675f5c08f90c7305..0d9734a7565ed40ce5967d82add09bb8b22ddddf 100644 (file)
--- a/watchfrr/watchfrr.c
+++ b/watchfrr/watchfrr.c
@@ -1301,7 +1301,7 @@ struct zebra_privs_t watchfrr_privs = {
 #endif
 };
 
-static struct quagga_signal_t watchfrr_signals[] = {
+static struct frr_signal_t watchfrr_signals[] = {
        {
                .signal = SIGINT,
                .handler = sigint,

diff --git a/zebra/main.c b/zebra/main.c
index 6162d36b4358df8855a1ecefbfdf005c345a56fd..5694a442a240511a9fdd8d3f42115bc7cd83aec3 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -235,7 +235,7 @@ static void sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t zebra_signals[] = {
+struct frr_signal_t zebra_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,