diff options
44 files changed, 97 insertions, 101 deletions
diff --git a/babeld/babel_main.c b/babeld/babel_main.c index 61a800eef4..b29374fee3 100644 --- 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 188e47905c..c764941513 100644 --- 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_fsm.c b/bgpd/bgp_fsm.c index 5b997867e0..91265ed358 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -756,8 +756,8 @@ void bgp_update_delay_end(struct bgp *bgp) bgp->implicit_eors = 0; bgp->explicit_eors = 0; - quagga_timestamp(3, bgp->update_delay_end_time, - sizeof(bgp->update_delay_end_time)); + frr_timestamp(3, bgp->update_delay_end_time, + sizeof(bgp->update_delay_end_time)); /* * Add an end-of-initial-update marker to the main process queues so @@ -804,8 +804,8 @@ void bgp_start_routeadv(struct bgp *bgp) if (bgp->main_peers_update_hold) return; - quagga_timestamp(3, bgp->update_delay_peers_resume_time, - sizeof(bgp->update_delay_peers_resume_time)); + frr_timestamp(3, bgp->update_delay_peers_resume_time, + sizeof(bgp->update_delay_peers_resume_time)); for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) { if (!peer_established(peer)) @@ -1057,8 +1057,8 @@ static void bgp_update_delay_begin(struct bgp *bgp) thread_add_timer(bm->master, bgp_establish_wait_timer, bgp, bgp->v_establish_wait, &bgp->t_establish_wait); - quagga_timestamp(3, bgp->update_delay_begin_time, - sizeof(bgp->update_delay_begin_time)); + frr_timestamp(3, bgp->update_delay_begin_time, + sizeof(bgp->update_delay_begin_time)); } static void bgp_update_delay_process_status_change(struct peer *peer) diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 08776d200f..6a01a6137c 100644 --- 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/bgpd/bgp_route.c b/bgpd/bgp_route.c index fdaee9b600..962a35a4ad 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -2775,8 +2775,8 @@ static void bgp_process_main_one(struct bgp *bgp, struct bgp_dest *dest, } /* Is it end of initial update? (after startup) */ if (!dest) { - quagga_timestamp(3, bgp->update_delay_zebra_resume_time, - sizeof(bgp->update_delay_zebra_resume_time)); + frr_timestamp(3, bgp->update_delay_zebra_resume_time, + sizeof(bgp->update_delay_zebra_resume_time)); bgp->main_zebra_update_hold = 0; FOREACH_AFI_SAFI (afi, safi) { diff --git a/doc/user/babeld.rst b/doc/user/babeld.rst index c8015bb7e5..2d9fef13c3 100644 --- a/doc/user/babeld.rst +++ b/doc/user/babeld.rst @@ -268,6 +268,6 @@ Babel sample configuration file ! babel hello-interval 12000 ! babel update-interval 36000 - ! log file /var/log/quagga/babeld.log + ! log file /var/log/frr/babeld.log log stdout diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c index 9acb517d8c..9dd795f0b0 100644 --- 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/gdb/lib.txt b/gdb/lib.txt index 60a004e1e1..913b455ed1 100644 --- a/gdb/lib.txt +++ b/gdb/lib.txt @@ -1,6 +1,6 @@ # GDB macros for use with Quagga. # -# Macros in this file are not daemon specific. E.g., OS or Quagga library +# Macros in this file are not daemon specific. E.g., OS or FRR library # APIs. # # The macro file can be loaded with 'source <filename>'. They can then be @@ -9,7 +9,7 @@ # # E.g.: # -# (gdb) source ~paul/code/quagga/gdb/lib.txt +# (gdb) source ~paul/code/frr/gdb/lib.txt # (gdb) break bgp_packet.c:613 # Breakpoint 3 at 0x7fa883033a32: file bgp_packet.c, line 613. # (gdb) cont diff --git a/isisd/isis_main.c b/isisd/isis_main.c index 6deeebda95..fb4237f002 100644 --- 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 0956310367..55fa806d4d 100644 --- 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 0ff3238ff9..6fa0e330f8 100644 --- 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 fff7ee7c67..31f8026e3f 100644 --- 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, @@ -399,16 +399,12 @@ struct connected { /* The ZEBRA_IFC_REAL flag should be set if and only if this address exists in the kernel and is actually usable. (A case where it exists - but - is not yet usable would be IPv6 with DAD) + but is not yet usable would be IPv6 with DAD) The ZEBRA_IFC_CONFIGURED flag should be set if and only if this - address - was configured by the user from inside quagga. + address was configured by the user from inside frr. The ZEBRA_IFC_QUEUED flag should be set if and only if the address - exists - in the kernel. It may and should be set although the address might - not be - usable yet. (compare with ZEBRA_IFC_REAL) + exists in the kernel. It may and should be set although the + address might not be usable yet. (compare with ZEBRA_IFC_REAL) The ZEBRA_IFC_DOWN flag is used to record that an address is present, but down/unavailable. */ diff --git a/lib/libfrr.h b/lib/libfrr.h index 3dc5d7af81..ed7e9c099e 100644 --- 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; @@ -64,7 +64,7 @@ const char *lookup_msg(const struct message *mz, int kz, const char *nf) } /* For time string format. */ -size_t quagga_timestamp(int timestamp_precision, char *buf, size_t buflen) +size_t frr_timestamp(int timestamp_precision, char *buf, size_t buflen) { static struct { time_t last; @@ -102,9 +102,9 @@ extern void zlog_backtrace_sigsafe(int priority, void *program_counter); It caches the most recent localtime result and can therefore avoid multiple calls within the same second. If buflen is too small, *buf will be set to '\0', and 0 will be returned. */ -#define QUAGGA_TIMESTAMP_LEN 40 -extern size_t quagga_timestamp(int timestamp_precision /* # subsecond digits */, - char *buf, size_t buflen); +#define FRR_TIMESTAMP_LEN 40 +extern size_t frr_timestamp(int timestamp_precision /* # subsecond digits */, + char *buf, size_t buflen); extern void zlog_hexdump(const void *mem, size_t len); extern const char *zlog_sanitize(char *buf, size_t bufsz, const void *in, @@ -135,8 +135,8 @@ struct timestamp_control { size_t len; /* length of rendered timestamp */ int precision; /* configuration parameter */ int already_rendered; /* should be initialized to 0 */ - char buf[QUAGGA_TIMESTAMP_LEN]; /* will contain the rendered timestamp - */ + char buf[FRR_TIMESTAMP_LEN]; /* will contain the rendered timestamp + */ }; /* Defines for use in command construction: */ diff --git a/lib/sigevent.c b/lib/sigevent.c index 6710527ae9..00bc31f517 100644 --- 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 4a39b22889..dd1ee99587 100644 --- 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 5dbba6363d..7b223ed6de 100644 --- 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); @@ -283,10 +283,10 @@ done: /* Output current time to the vty. */ void vty_time_print(struct vty *vty, int cr) { - char buf[QUAGGA_TIMESTAMP_LEN]; + char buf[FRR_TIMESTAMP_LEN]; - if (quagga_timestamp(0, buf, sizeof(buf)) == 0) { - zlog_info("quagga_timestamp error"); + if (frr_timestamp(0, buf, sizeof(buf)) == 0) { + zlog_info("frr_timestamp error"); return; } if (cr) diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c index 4c98f02e1d..d8f14a3fc0 100644 --- 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 54cf142ba8..165a764c38 100644 --- 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 257429ebe8..2f9787bca5 100644 --- 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/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index 1ebb14f2a0..ede0ad39e6 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -398,7 +398,7 @@ static int ospf_make_md5_digest(struct ospf_interface *oi, /* We do this here so when we dup a packet, we don't have to waste CPU rewriting other headers. - Note that quagga_time /deliberately/ is not used here */ + Note that frr_time /deliberately/ is not used here */ t = (time(NULL) & 0xFFFFFFFF); if (t > oi->crypt_seqnum) oi->crypt_seqnum = t; diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c index a1ea4e45d7..7ec3db7894 100644 --- a/ospfd/ospf_snmp.c +++ b/ospfd/ospf_snmp.c @@ -2090,7 +2090,7 @@ static struct ospf_neighbor *ospfNbrLookup(struct variable *v, oid *name, return NULL; } -/* map internal quagga neighbor states to official MIB values: +/* map internal frr neighbor states to official MIB values: ospfNbrState OBJECT-TYPE SYNTAX INTEGER { diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index 1e1057dc39..dd0a49c9bc 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -192,7 +192,7 @@ void ospf_process_refresh_data(struct ospf *ospf, bool reset) hit asserts in ospf_refresher_unregister_lsa(). This step is needed - because the current quagga code does look-up for + because the current frr code does look-up for self-originated LSAs based on the self router-id alone but expects OSPF_LSA_SELF to be diff --git a/pathd/path_main.c b/pathd/path_main.c index 7b702cca31..0a71c80ef0 100644 --- 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 c7cbbb4462..59aa3676bf 100644 --- 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 38387d38c3..47220ccac7 100644 --- 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 a82915691b..ebc5b8eb21 100644 --- 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 7b9146b13a..6fb5ca95a9 100644 --- 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 34cd4ab0a7..bc169785a9 100644 --- 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 a646c313e4..8494f479c4 100644 --- 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 f7a15462a0..6051b2df1c 100644 --- 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 8133637adc..494a162a45 100644 --- 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 2aceafb8f0..9165f1850f 100644 --- 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 65195aa3e1..c411de7252 100644 --- 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 990fa9e382..59769788e7 100644 --- 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/vtysh/vtysh.c b/vtysh/vtysh.c index 53349452e6..2537ff4571 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -484,7 +484,7 @@ static int vtysh_execute_func(const char *line, int pager) if (vtysh_add_timestamp && strncmp(line, "exit", 4)) { char ts[48]; - (void)quagga_timestamp(3, ts, sizeof(ts)); + (void)frr_timestamp(3, ts, sizeof(ts)); vty_out(vty, "%% %s\n\n", ts); } diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index b09d092458..0d9734a756 100644 --- 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/interface.c b/zebra/interface.c index 6479dbb58a..49a1e49175 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -1026,7 +1026,7 @@ void if_up(struct interface *ifp) zif = ifp->info; zif->up_count++; - quagga_timestamp(2, zif->up_last, sizeof(zif->up_last)); + frr_timestamp(2, zif->up_last, sizeof(zif->up_last)); /* Notify the protocol daemons. */ if (ifp->ptm_enable && (ifp->ptm_status == ZEBRA_PTM_STATUS_DOWN)) { @@ -1090,7 +1090,7 @@ void if_down(struct interface *ifp) zif = ifp->info; zif->down_count++; - quagga_timestamp(2, zif->down_last, sizeof(zif->down_last)); + frr_timestamp(2, zif->down_last, sizeof(zif->down_last)); if_down_nhg_dependents(ifp); diff --git a/zebra/interface.h b/zebra/interface.h index 23e22bdda8..771398b547 100644 --- a/zebra/interface.h +++ b/zebra/interface.h @@ -340,9 +340,9 @@ struct zebra_if { /* Information about up/down changes */ unsigned int up_count; - char up_last[QUAGGA_TIMESTAMP_LEN]; + char up_last[FRR_TIMESTAMP_LEN]; unsigned int down_count; - char down_last[QUAGGA_TIMESTAMP_LEN]; + char down_last[FRR_TIMESTAMP_LEN]; #if defined(HAVE_RTADV) struct rtadvconf rtadv; diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index 2db3e6e904..5ff66f7c63 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -61,7 +61,7 @@ extern struct zebra_privs_t zserv_privs; * Alignment of zero-sized sockaddrs is nonsensical, but historically * BSD defines RT_ROUNDUP(0) to be the alignment interval (rather than * 0). We follow this practice without questioning it, but it is a - * bug if quagga calls ROUNDUP with 0. + * bug if frr calls ROUNDUP with 0. */ #ifdef __APPLE__ #define ROUNDUP_TYPE int diff --git a/zebra/main.c b/zebra/main.c index 6162d36b43..e4363bd899 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -71,7 +71,7 @@ struct thread_master *master; /* Route retain mode flag. */ int retain_mode = 0; -/* Allow non-quagga entities to delete quagga routes */ +/* Allow non-frr entities to delete frr routes */ int allow_delete = 0; int graceful_restart; @@ -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, |