diff options
| -rw-r--r-- | doc/user/babeld.rst | 2 | ||||
| -rw-r--r-- | gdb/lib.txt | 4 | ||||
| -rw-r--r-- | lib/if.h | 12 | ||||
| -rw-r--r-- | ospfd/ospf_packet.c | 2 | ||||
| -rw-r--r-- | ospfd/ospf_snmp.c | 2 | ||||
| -rw-r--r-- | ospfd/ospfd.c | 2 | ||||
| -rw-r--r-- | zebra/kernel_socket.c | 2 | ||||
| -rw-r--r-- | zebra/main.c | 2 |
8 files changed, 12 insertions, 16 deletions
diff --git a/doc/user/babeld.rst b/doc/user/babeld.rst index c8015bb7e..2d9fef13c 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/gdb/lib.txt b/gdb/lib.txt index 60a004e1e..913b455ed 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 @@ -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/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index 1ebb14f2a..ede0ad39e 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 a1ea4e45d..7ec3db789 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 1e1057dc3..dd0a49c9b 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/zebra/kernel_socket.c b/zebra/kernel_socket.c index 2db3e6e90..5ff66f7c6 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 5694a442a..e4363bd89 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; |