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 2a25e6298eef4ef619ec4a1dd31199d5cb607254..8da2e8ef4efc01664a041614439e92747da60b5f 100644 (file)
--- 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 c76046ee6905aa686bb9abdea23bbdcda5afbb23..84a4c0480df60da06c0afd571a8a0c19a931a0c4 100644 (file)
--- 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 0c6dc9972124dc7c0e5df035f4536ed1999b6a5c..fd94047f756b1fbfa90a12377597a84c66bcbce6 100644 (file)
--- 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 bf8a88b7e53346522b632e40535286f373662c70..d3ed4a62c7ed667804c2a59f1b2ae968cd460b57 100644 (file)
--- 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 e014b22482337d6e72380526c3f9955a16c666ce..15e825d44999576674b8fcb93d6c1b661295cf1f 100644 (file)
--- 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 c5597734d526a8cea72ab744612bb553d2027f24..9d3d0c2802507dc671eae95dccaf437514440a88 100644 (file)
--- 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 1ece636a95d4328222403a669962135aa716d8a5..92c89fbe1913d7cdc25a0ea2653a5105f33f3bd7 100644 (file)
--- 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 a7a22e40ada7d93a69aa182246a2abfe06cdf543..5154f9ba51cd91207fdb89b7d2300446a2a234fb 100644 (file)
--- 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 08c6c96cb7a65400da77a50907c1333e12e196a8..2388fc1392eed43067a7d4a7c95e6cc5774088f3 100644 (file)
--- 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 dcb86058c88c481e5e23901c4213ee0e5b801af8..393df608029b524f761b26f6312fac084fbe3c31 100644 (file)
--- 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 79b5cf9a39a2d995783f5b43e780d4527d6b9772..e401ba6be26372ac734c88c74a7cdd15a379f7c9 100644 (file)
--- 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 612deb25c4877c8ec226e9ae9bcad9258e308611..f96921424ff6551f178acaf974690cc39282d0b9 100644 (file)
--- 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 7984f0880412d6b989720753594e04c6e121053c..de65e9d5e08b69755f507e1bd96c13e9032425b3 100644 (file)
--- 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 f624f098d14809176902de7f8e68fe3c86622593..706161b32f6493180fb5d7b55a0d2614cebc4ca2 100644 (file)
--- 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 635f84b9be2849361a4db8f28b11299650a9aef1..721f96a8adbbd855ca11224d6027e596433dc732 100644 (file)
--- 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 201dff30fba57db3f4ae5cfff59ed4e7bc1722a1..0d24853f34c936d6bed88b90e035e6b97b11fe49 100644 (file)
--- 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 8ae563b531fb549093a9c29e10643e14b04b231e..c728b5f333b39f87b7f86c1b0306d2ce5a8bb426 100644 (file)
--- 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 801561da10b072a62974736d4940d1a744cb8aa4..43e3039def0b5f0d603bd74e5ce433e077d4ee71 100644 (file)
--- 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 b796cc682bffa9fe2dba3cd1859e9cb5db4a79b5..d9d7b6566f0e848a058602e380500abe7f61bfbd 100644 (file)
--- 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 6f19936f15b4f158ac164eba8ce02e1d5f761b20..b3041bf31bd2f4ce80be6b7c242dd62ebea68c3d 100644 (file)
--- 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 8d0fc4036386ff810d5073c894504d83c8b6b5d6..6d36d7eb02873358d6efd31cd3bae7dbff2c223c 100644 (file)
--- 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 5f33bd834959e384abff14724ed424e2d171a33a..112171c189c580d2be7384172d7e32ceb31aeea2 100644 (file)
--- 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 a4b7d63c2a894e48c07ef999bc56e27c49fdd4a7..47ab1e4d3edc4c8b4c4b036b5d000a306ea6268b 100644 (file)
--- 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 510456e8ce699e5db83bda9389cde9cb25c1778e..4fdf9e197b226c3ffef8c8d47e66f5c1870d3b57 100644 (file)
--- 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 de0f2f0a4840bc272f1059e17e4779c536ff1718..3fd846cedcc40a7979fbf7f062ecef2f8d9b262d 100644 (file)
--- 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 079a98ea2b14d3aaac7f0620d7dd692c97ac2129..c3c19a67be91a39019c845301bb3d327ff2cd83a 100644 (file)
--- 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 c7b3ac0e7ac8910877c8c236cd47ec108ab37e3c..b14f22a6378e944b5d1155c8c6616228017047ed 100644 (file)
--- 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 f535a3915af80e03d62f9d04b894baab8cc120e5..04865089d70688f496ae2e1b481b35896c8f0c01 100644 (file)
--- 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 3477ba5ab3824e8ecee9e37b35ffdf4c716835ba..91204667e060c584f9df3f52fa0aa74b70f20d92 100644 (file)
--- 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 02723a301de5d13373904e5021ae3d8bebcfaf67..227b51be41afdcee866ac2aa90f7a12c29a6a85d 100644 (file)
--- 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 442a951f7b42fd02ab976e1bac7240169d06de4a..6c55ae75978e985d6da424ed0a8377db8b27e7ba 100644 (file)
--- 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 ff5426d4cb32c9428142f7db9924dcd1ef66ed42..100dd83ec657bd78d92aa0d77904176d5e02a07b 100644 (file)
--- 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 6d70df46526c81a085f81efff49ffbc2ee22fc95..260451d18a23f9a4197c07510545cd8009e2ce97 100644 (file)
--- 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 2025384461d11375e6fab886035b5d3e7f14f9a2..a70a2027b08841175c5675f8cec9730f87187c35 100644 (file)
--- 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 2c3e09f4ba5920c76d4f5f98c9a2c208ce97362d..dbce77efbf03ab5c8377b30e8a93945d725a0590 100644 (file)
--- 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 ea7ca33b8cc3a62e9df86a6c9e5625809c94de19..cda230403eec6b211da80447e4d5cb1ef4d45e47 100644 (file)
--- 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 420824432fc4736d4386ffd7498de62252ec50f0..83edfafd309d71746e9233d2d665a4ec2b8aee82 100644 (file)
--- 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 2ce08e9d0122670bab01a3bc8d7fcdf817c39bd7..e2599e1c4ffb0f567d4a1f048514a9d67f5e78b1 100644 (file)
--- 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 0187bf0eafbcfd7c328fafb6b36636f6974bb964..19978a75f789d8e01c2ef565057419f804a49d6f 100644 (file)
--- 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 41c1be26c84f898ad08be4748e938cb48cba9893..f0ed85e2588b1e23c993ac3d91e4cc58e4173071 100644 (file)
--- 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 c2e44c14eb7a03b07be2cd0f20baaa921d601bf9..53ee92d2b6485a3ed75a625494aee9f2605c92b1 100644 (file)
--- 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"