*: 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>
FRRouting · Nov 11, 2021 · 7cc91e6 · 7cc91e6
1 parent 7347a48
commit 7cc91e6
Show file tree

Hide file tree

Showing 29 changed files with 63 additions and 63 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -20,18 +20,18 @@
  * 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>
 
 #ifdef __cplusplus
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,