Complex route attributes are data structures, shall be in lib also

diff --git a/filter/data.c b/filter/data.c
index 87ef4ff11d8f81284255f238856dc85838fdc97e..381448fa35c9331acb41a62ec5330049c295542f 100644 (file)
--- a/filter/data.c
+++ b/filter/data.c
@@ -19,7 +19,7 @@
 #include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "conf/conf.h"
 #include "filter/filter.h"
 #include "filter/f-inst.h"

diff --git a/filter/filter.c b/filter/filter.c
index 31ae79fe450d4a2a96975de597c9816f11698706..8f946f5b0038ef0a9e83b0f61d111ae9264b244f 100644 (file)
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -38,7 +38,7 @@
 #include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "conf/conf.h"
 #include "filter/filter.h"
 #include "filter/f-inst.h"

diff --git a/filter/filter.h b/filter/filter.h
index 8ce6c1e080f5af737c095e9445a4a8fdecbe2049..385f1179d9ca31aa9217757bf23c73382737ce3e 100644 (file)
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -14,7 +14,7 @@
 #include "lib/ip.h"
 #include "lib/macro.h"
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 
 /* Possible return values of filter execution */
 enum filter_return {

diff --git a/lib/Makefile b/lib/Makefile
index 812f721cc844f4c8fcd325b9c66089122010b566..853e0a22d8aec78a11e72930cce4fdf4f9976b3c 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,7 +1,7 @@
-src := bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c flowspec.c idm.c ip.c lists.c mac.c md5.c mempool.c net.c patmatch.c printf.c resource.c sha1.c sha256.c sha512.c slab.c slists.c strtoul.c tbf.c timer.c xmalloc.c
+src := a-path.c a-set.c bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c flowspec.c idm.c ip.c lists.c mac.c md5.c mempool.c net.c patmatch.c printf.c resource.c sha1.c sha256.c sha512.c slab.c slists.c strtoul.c tbf.c timer.c xmalloc.c
 obj := $(src-o-files)
 $(all-daemon)
 
-tests_src := bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c
+tests_src := a-set_test.c a-path_test.c bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c
 tests_targets := $(tests_targets) $(tests-target-files)
 tests_objs := $(tests_objs) $(src-o-files)

diff --git a/nest/a-path.c b/lib/a-path.c
similarity index 99%
rename from nest/a-path.c
rename to lib/a-path.c
index 64504c93172355e030bc7042a30aae26cf1112d5..0eca8475e742ef656fd7cc56d8542b78f03f021d 100644 (file)
--- a/nest/a-path.c
+++ b/lib/a-path.c
@@ -9,7 +9,7 @@
 
 #include "nest/bird.h"
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "lib/resource.h"
 #include "lib/unaligned.h"
 #include "lib/string.h"

diff --git a/nest/a-path_test.c b/lib/a-path_test.c
similarity index 99%
rename from nest/a-path_test.c
rename to lib/a-path_test.c
index a6b4d3d838bf8e0985c4f85ef24a22924cd2dd7c..38f77642398a5eccfe246772108af5870bd11c09 100644 (file)
--- a/nest/a-path_test.c
+++ b/lib/a-path_test.c
@@ -10,7 +10,7 @@
 #include "test/bt-utils.h"
 
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "lib/resource.h"
 
 #define TESTS_NUM 30

diff --git a/nest/a-set.c b/lib/a-set.c
similarity index 99%
rename from nest/a-set.c
rename to lib/a-set.c
index 93f6431e9a8bc17e274c2628130240acef10eb1d..8ede9b83b7a1ab057a44810197f1460d7a9c1447 100644 (file)
--- a/nest/a-set.c
+++ b/lib/a-set.c
@@ -11,7 +11,7 @@
 
 #include "nest/bird.h"
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "lib/resource.h"
 #include "lib/string.h"
 

diff --git a/nest/a-set_test.c b/lib/a-set_test.c
similarity index 99%
rename from nest/a-set_test.c
rename to lib/a-set_test.c
index daa6ab748e6b535fe020e5e5775741afbaf25e2b..3280031f78526a5fc60dcd83fd1d7f72908cf38d 100644 (file)
--- a/nest/a-set_test.c
+++ b/lib/a-set_test.c
@@ -11,7 +11,7 @@
 
 #include "lib/net.h"
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "lib/resource.h"
 
 #define SET_SIZE 10

diff --git a/nest/attrs.h b/lib/attrs.h
similarity index 100%
rename from nest/attrs.h
rename to lib/attrs.h

diff --git a/nest/Makefile b/nest/Makefile
index 7d451ba429144c3c971499699ad40ad874eecf03..c07655304ac0505db14d75135d9e4b4b81855e35 100644 (file)
--- a/nest/Makefile
+++ b/nest/Makefile
@@ -1,4 +1,4 @@
-src := a-path.c a-set.c cli.c cmds.c iface.c locks.c neighbor.c password.c proto.c proto-build.c rt-attr.c rt-dev.c rt-fib.c rt-show.c rt-table.c
+src := cli.c cmds.c iface.c locks.c neighbor.c password.c proto.c proto-build.c rt-attr.c rt-dev.c rt-fib.c rt-show.c rt-table.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
@@ -8,6 +8,6 @@ $(proto-build-c): $(lastword $(MAKEFILE_LIST))
        $(E)echo GEN $@
        $(Q)echo "$(patsubst %,void %(void); ,$(PROTO_BUILD)) void protos_build_gen(void) { $(patsubst %,  %(); ,$(PROTO_BUILD))}" > $@
 
-tests_src := a-set_test.c a-path_test.c
+tests_src :=
 tests_targets := $(tests_targets) $(tests-target-files)
 tests_objs := $(tests_objs) $(src-o-files)

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 8f4319c50f4ae34ec7935d11b18997f54723b0d5..2fa9b673b2358090cd6dc5ce1cc3d15c6ffc44a7 100644 (file)
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -49,7 +49,7 @@
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "nest/cli.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "lib/alloca.h"
 #include "lib/hash.h"
 #include "lib/idm.h"

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 3265cb5ee33fcfdfd2aa8e7a8ac7606358a4f465..2c0d011fb7991814884c7863158a1f6ee70dd956 100644 (file)
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -16,7 +16,7 @@
 #include "nest/iface.h"
 #include "nest/protocol.h"
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "conf/conf.h"
 #include "lib/resource.h"
 #include "lib/string.h"

diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 5def0f2751c117c24bf885266b22ace88e97aec6..8eeae490d3671f21cc1243e64541665709987d42 100644 (file)
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -16,7 +16,7 @@
 #include "nest/iface.h"
 #include "nest/protocol.h"
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "proto/mrt/mrt.h"
 #include "conf/conf.h"
 #include "lib/unaligned.h"