From: Maria Matejka <mq@ucw.cz>
Date: Sun, 29 Oct 2023 15:25:01 +0000 (+0100)
Subject: Renamed nest/rt.h back to nest/route.h
X-Git-Tag: v3.0.0~368
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddf698ec99284a8c634e3396550c0cbed28907a5;p=thirdparty%2Fbird.git

Renamed nest/rt.h back to nest/route.h

Some [redacted] (yes, myself) had a really bad idea
to rename nest/route.h to nest/rt.h while refactoring
some data structures out of it.

This led to unnecessarily complex problems with
merging updates from v2. Reverting this change
to make my life a bit easier.

At least it needed only one find-sed command:

    find -name '*.[chlY]' -type f -exec sed -i 's#nest/rt.h#nest/route.h#' '{}' +
---

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 2a25e6298..8da2e8ef4 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -42,7 +42,7 @@
 #define PARSER 1
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "filter/filter.h"
 #include "filter/f-inst.h"
diff --git a/conf/conf.c b/conf/conf.c
index c76046ee6..84a4c0480 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -46,7 +46,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/resource.h"
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 0c6dc9972..fd94047f7 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -19,7 +19,7 @@ CF_HDR
 #include "lib/string.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/bfd.h"
 #include "nest/cli.h"
 #include "filter/filter.h"
diff --git a/filter/data.c b/filter/data.c
index bf8a88b7e..d3ed4a62c 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -16,7 +16,7 @@
 #include "lib/unaligned.h"
 #include "lib/net.h"
 #include "lib/ip.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/attrs.h"
diff --git a/filter/f-util.c b/filter/f-util.c
index e014b2248..15e825d44 100644
--- a/filter/f-util.c
+++ b/filter/f-util.c
@@ -13,7 +13,7 @@
 #include "filter/f-inst.h"
 #include "lib/idm.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 
 #define P(a,b) ((a<<8) | b)
 
diff --git a/filter/filter.c b/filter/filter.c
index c5597734d..9d3d0c280 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -35,7 +35,7 @@
 #include "lib/ip.h"
 #include "lib/net.h"
 #include "lib/flowspec.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/attrs.h"
diff --git a/filter/filter.h b/filter/filter.h
index 1ece636a9..92c89fbe1 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -13,7 +13,7 @@
 #include "lib/resource.h"
 #include "lib/ip.h"
 #include "lib/macro.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "filter/data.h"
 #include "conf/conf.h"
diff --git a/lib/a-path.c b/lib/a-path.c
index a7a22e40a..5154f9ba5 100644
--- a/lib/a-path.c
+++ b/lib/a-path.c
@@ -8,7 +8,7 @@
  */
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "lib/resource.h"
 #include "lib/unaligned.h"
diff --git a/lib/a-path_test.c b/lib/a-path_test.c
index 08c6c96cb..2388fc139 100644
--- a/lib/a-path_test.c
+++ b/lib/a-path_test.c
@@ -9,7 +9,7 @@
 #include "test/birdtest.h"
 #include "test/bt-utils.h"
 
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "lib/resource.h"
 #include "filter/data.h"
diff --git a/lib/a-set.c b/lib/a-set.c
index dcb86058c..393df6080 100644
--- a/lib/a-set.c
+++ b/lib/a-set.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "lib/resource.h"
 #include "lib/string.h"
diff --git a/lib/a-set_test.c b/lib/a-set_test.c
index 79b5cf9a3..e401ba6be 100644
--- a/lib/a-set_test.c
+++ b/lib/a-set_test.c
@@ -10,7 +10,7 @@
 #include "test/bt-utils.h"
 
 #include "lib/net.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "lib/resource.h"
 
diff --git a/lib/event_test.c b/lib/event_test.c
index 612deb25c..f96921424 100644
--- a/lib/event_test.c
+++ b/lib/event_test.c
@@ -15,7 +15,7 @@
 #include "nest/locks.h"
 #include "sysdep/unix/unix.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 
 #define MAX_NUM 4
 
diff --git a/nest/cmds.c b/nest/cmds.c
index 7984f0880..de65e9d5e 100644
--- a/nest/cmds.c
+++ b/nest/cmds.c
@@ -8,7 +8,7 @@
 
 #include "nest/bird.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "nest/cmds.h"
diff --git a/nest/proto.c b/nest/proto.c
index f624f098d..706161b32 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -16,7 +16,7 @@
 #include "lib/timer.h"
 #include "lib/string.h"
 #include "conf/conf.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/iface.h"
 #include "nest/cli.h"
 #include "filter/filter.h"
diff --git a/nest/protocol.h b/nest/protocol.h
index 635f84b9b..721f96a8a 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -14,7 +14,7 @@
 #include "lib/event.h"
 #include "nest/iface.h"
 #include "lib/settle.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/limit.h"
 #include "conf/conf.h"
 #include "filter/data.h"
diff --git a/nest/rt.h b/nest/route.h
similarity index 100%
rename from nest/rt.h
rename to nest/route.h
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 201dff30f..0d24853f3 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -45,7 +45,7 @@
  */
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "nest/cli.h"
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index 8ae563b53..c728b5f33 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -18,7 +18,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/rt-dev.h"
 #include "conf/conf.h"
 #include "lib/resource.h"
diff --git a/nest/rt-fib.c b/nest/rt-fib.c
index 801561da1..43e3039de 100644
--- a/nest/rt-fib.c
+++ b/nest/rt-fib.c
@@ -55,7 +55,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/string.h"
 
 /*
diff --git a/nest/rt-fib_test.c b/nest/rt-fib_test.c
index b796cc682..d9d7b6566 100644
--- a/nest/rt-fib_test.c
+++ b/nest/rt-fib_test.c
@@ -9,7 +9,7 @@
 #include "test/birdtest.h"
 #include "test/bt-utils.h"
 
-#include "nest/rt.h"
+#include "nest/route.h"
 
 
 #define TESTS_NUM		10
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 6f19936f1..b3041bf31 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -10,7 +10,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/cli.h"
 #include "nest/iface.h"
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 8d0fc4036..6d36d7eb0 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -93,7 +93,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/resource.h"
diff --git a/proto/babel/babel.h b/proto/babel/babel.h
index 5f33bd834..112171c18 100644
--- a/proto/babel/babel.h
+++ b/proto/babel/babel.h
@@ -16,7 +16,7 @@
 #include "nest/bird.h"
 #include "nest/cli.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/locks.h"
 #include "nest/password.h"
diff --git a/proto/bfd/bfd.h b/proto/bfd/bfd.h
index a4b7d63c2..47ab1e4d3 100644
--- a/proto/bfd/bfd.h
+++ b/proto/bfd/bfd.h
@@ -13,7 +13,7 @@
 #include "nest/cli.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/password.h"
 #include "conf/conf.h"
 #include "lib/hash.h"
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 510456e8c..4fdf9e197 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -15,7 +15,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "conf/conf.h"
 #include "lib/resource.h"
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index de0f2f0a4..3fd846ced 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -115,7 +115,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "nest/locks.h"
 #include "conf/conf.h"
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 079a98ea2..c3c19a67b 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <setjmp.h>
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/bfd.h"
 //#include "lib/lists.h"
 #include "lib/hash.h"
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index c7b3ac0e7..b14f22a63 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -15,7 +15,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "proto/mrt/mrt.h"
 #include "conf/conf.h"
diff --git a/proto/mrt/mrt.h b/proto/mrt/mrt.h
index f535a3915..04865089d 100644
--- a/proto/mrt/mrt.h
+++ b/proto/mrt/mrt.h
@@ -13,7 +13,7 @@
 #include "nest/bird.h"
 #include "nest/protocol.h"
 #include "lib/lists.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/event.h"
 #include "lib/hash.h"
 
diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h
index 3477ba5ab..91204667e 100644
--- a/proto/ospf/ospf.h
+++ b/proto/ospf/ospf.h
@@ -22,7 +22,7 @@
 #include "lib/resource.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "nest/locks.h"
 #include "nest/bfd.h"
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index 02723a301..227b51be4 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -18,7 +18,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "filter/filter.h"
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 442a951f7..6c55ae759 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -35,7 +35,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "filter/filter.h"
diff --git a/proto/radv/radv.h b/proto/radv/radv.h
index ff5426d4c..100dd83ec 100644
--- a/proto/radv/radv.h
+++ b/proto/radv/radv.h
@@ -19,7 +19,7 @@
 #include "lib/resource.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "nest/locks.h"
 #include "conf/conf.h"
diff --git a/proto/rip/rip.h b/proto/rip/rip.h
index 6d70df465..260451d18 100644
--- a/proto/rip/rip.h
+++ b/proto/rip/rip.h
@@ -16,7 +16,7 @@
 #include "nest/cli.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/password.h"
 #include "nest/locks.h"
 #include "nest/bfd.h"
diff --git a/proto/rpki/rpki.h b/proto/rpki/rpki.h
index 202538446..a70a2027b 100644
--- a/proto/rpki/rpki.h
+++ b/proto/rpki/rpki.h
@@ -13,7 +13,7 @@
 #define _BIRD_RPKI_H_
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "lib/socket.h"
 #include "lib/ip.h"
diff --git a/proto/static/static.c b/proto/static/static.c
index 2c3e09f4b..dbce77efb 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -38,7 +38,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "filter/filter.h"
diff --git a/proto/static/static.h b/proto/static/static.h
index ea7ca33b8..cda230403 100644
--- a/proto/static/static.h
+++ b/proto/static/static.h
@@ -9,7 +9,7 @@
 #ifndef _BIRD_STATIC_H_
 #define _BIRD_STATIC_H_
 
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/bfd.h"
 #include "lib/buffer.h"
 
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index 420824432..83edfafd3 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -25,7 +25,7 @@
 
 #include "nest/bird.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "sysdep/unix/unix.h"
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index 2ce08e9d0..e2599e1c4 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -16,7 +16,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/alloca.h"
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 0187bf0ea..19978a75f 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -53,7 +53,7 @@
 
 #include "nest/bird.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "filter/filter.h"
 #include "conf/conf.h"
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 41c1be26c..f0ed85e25 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -31,7 +31,7 @@
 #include "lib/locking.h"
 #include "lib/timer.h"
 #include "lib/string.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "nest/cli.h"
diff --git a/test/bt-utils.c b/test/bt-utils.c
index c2e44c14e..53ee92d2b 100644
--- a/test/bt-utils.c
+++ b/test/bt-utils.c
@@ -14,7 +14,7 @@
 #include "test/bt-utils.h"
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 
 #include "sysdep/unix/unix.h"