diff --git a/conf/cf-lex.l b/conf/cf-lex.l index 2a25e629..8da2e8ef 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 c76046ee..84a4c048 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 0c6dc997..fd94047f 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 bf8a88b7..d3ed4a62 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 e014b224..15e825d4 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 c5597734..9d3d0c28 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 1ece636a..92c89fbe 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 a7a22e40..5154f9ba 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 08c6c96c..2388fc13 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 dcb86058..393df608 100644 --- a/lib/a-set.c +++ b/lib/a-set.c @@ -10,7 +10,7 @@ #include #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 79b5cf9a..e401ba6b 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 612deb25..f9692142 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 7984f088..de65e9d5 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 f624f098..706161b3 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 635f84b9..721f96a8 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 201dff30..0d24853f 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 8ae563b5..c728b5f3 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 801561da..43e3039d 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 b796cc68..d9d7b656 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 6f19936f..b3041bf3 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 8d0fc403..6d36d7eb 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 5f33bd83..112171c1 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 a4b7d63c..47ab1e4d 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 510456e8..4fdf9e19 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 de0f2f0a..3fd846ce 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 079a98ea..c3c19a67 100644 --- a/proto/bgp/bgp.h +++ b/proto/bgp/bgp.h @@ -14,7 +14,7 @@ #include #include #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 c7b3ac0e..b14f22a6 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 f535a391..04865089 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 3477ba5a..91204667 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 02723a30..227b51be 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 442a951f..6c55ae75 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 ff5426d4..100dd83e 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 6d70df46..260451d1 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 20253844..a70a2027 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 2c3e09f4..dbce77ef 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 ea7ca33b..cda23040 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 42082443..83edfafd 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 2ce08e9d..e2599e1c 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 0187bf0e..19978a75 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 41c1be26..f0ed85e2 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 c2e44c14..53ee92d2 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"