Move rfc5444 library into rfc5444 subsystem
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Fri, 7 Nov 2014 10:32:08 +0000 (11:32 +0100)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Fri, 7 Nov 2014 10:32:08 +0000 (11:32 +0100)
52 files changed:
CMakeLists.txt
cmake/OONFBuildLibrary.cmake
cmake/link_app_dynamic.cmake
cmake/link_app_static.cmake
examples/rfc5444_reader_writer/reader.c
src-api/CMakeLists.txt
src-api/rfc5444/CMakeLists.txt [deleted file]
src-plugins/nhdp/constant_metric/constant_metric.c
src-plugins/nhdp/ff_dat_metric/ff_dat_metric.c
src-plugins/nhdp/hysteresis_olsrv1/hysteresis_olsrv1.c
src-plugins/nhdp/mpr/mpr.c
src-plugins/nhdp/mpr/neighbor-graph-flooding.c
src-plugins/nhdp/mpr/neighbor-graph-routing.c
src-plugins/nhdp/mpr/neighbor-graph.c
src-plugins/nhdp/mpr/selection-rfc7181.c
src-plugins/nhdp/nhdp/nhdp.c
src-plugins/nhdp/nhdp/nhdp_db.c
src-plugins/nhdp/nhdp/nhdp_db.h
src-plugins/nhdp/nhdp/nhdp_domain.c
src-plugins/nhdp/nhdp/nhdp_domain.h
src-plugins/nhdp/nhdp/nhdp_hysteresis.c
src-plugins/nhdp/nhdp/nhdp_hysteresis.h
src-plugins/nhdp/nhdp/nhdp_interfaces.c
src-plugins/nhdp/nhdp/nhdp_interfaces.h
src-plugins/nhdp/nhdp/nhdp_reader.c
src-plugins/nhdp/nhdp/nhdp_writer.c
src-plugins/nhdp/nhdpcheck/nhdpcheck.c
src-plugins/olsrv2/olsrv2/olsrv2.c
src-plugins/olsrv2/olsrv2/olsrv2_lan.c
src-plugins/olsrv2/olsrv2/olsrv2_reader.c
src-plugins/olsrv2/olsrv2/olsrv2_routing.c
src-plugins/olsrv2/olsrv2/olsrv2_tc.c
src-plugins/olsrv2/olsrv2/olsrv2_writer.c
src-plugins/subsystems/CMakeLists.txt
src-plugins/subsystems/oonf_rfc5444.h
src-plugins/subsystems/rfc5444/rfc5444.c [moved from src-api/rfc5444/rfc5444.c with 99% similarity]
src-plugins/subsystems/rfc5444/rfc5444.h [moved from src-api/rfc5444/rfc5444.h with 99% similarity]
src-plugins/subsystems/rfc5444/rfc5444_api_config.h [moved from src-api/rfc5444/rfc5444_api_config.h.in with 88% similarity]
src-plugins/subsystems/rfc5444/rfc5444_context.c [moved from src-api/rfc5444/rfc5444_context.c with 99% similarity]
src-plugins/subsystems/rfc5444/rfc5444_context.h [moved from src-api/rfc5444/rfc5444_context.h with 99% similarity]
src-plugins/subsystems/rfc5444/rfc5444_iana.c [moved from src-api/rfc5444/rfc5444_iana.c with 98% similarity]
src-plugins/subsystems/rfc5444/rfc5444_iana.h [moved from src-api/rfc5444/rfc5444_iana.h with 100% similarity]
src-plugins/subsystems/rfc5444/rfc5444_msg_generator.c [moved from src-api/rfc5444/rfc5444_msg_generator.c with 99% similarity]
src-plugins/subsystems/rfc5444/rfc5444_pkt_generator.c [moved from src-api/rfc5444/rfc5444_pkt_generator.c with 99% similarity]
src-plugins/subsystems/rfc5444/rfc5444_print.c [moved from src-api/rfc5444/rfc5444_print.c with 99% similarity]
src-plugins/subsystems/rfc5444/rfc5444_print.h [moved from src-api/rfc5444/rfc5444_print.h with 98% similarity]
src-plugins/subsystems/rfc5444/rfc5444_reader.c [moved from src-api/rfc5444/rfc5444_reader.c with 99% similarity]
src-plugins/subsystems/rfc5444/rfc5444_reader.h [moved from src-api/rfc5444/rfc5444_reader.h with 99% similarity]
src-plugins/subsystems/rfc5444/rfc5444_tlv_writer.c [moved from src-api/rfc5444/rfc5444_tlv_writer.c with 98% similarity]
src-plugins/subsystems/rfc5444/rfc5444_tlv_writer.h [moved from src-api/rfc5444/rfc5444_tlv_writer.h with 100% similarity]
src-plugins/subsystems/rfc5444/rfc5444_writer.c [moved from src-api/rfc5444/rfc5444_writer.c with 99% similarity]
src-plugins/subsystems/rfc5444/rfc5444_writer.h [moved from src-api/rfc5444/rfc5444_writer.h with 99% similarity]

index e71f321..79eeb18 100644 (file)
@@ -57,13 +57,13 @@ endif (NOT OONF_NO_TESTING)
 add_subdirectory(src-api)
 add_subdirectory(src-plugins)
 add_subdirectory(external)
-add_subdirectory(examples)
+add_subdirectory(examples)
 add_subdirectory(src)
 
 get_property (targets GLOBAL PROPERTY OONF_TARGETS)
 export (TARGETS ${targets} FILE "${PROJECT_BINARY_DIR}/OONFLibraryDepends_api.cmake")
 if (NOT OONF_NO_TESTING)
-    add_subdirectory(tests)
+#    add_subdirectory(tests)
 endif (NOT OONF_NO_TESTING)
 
 ###############################
index 8e846a4..0c1ffce 100644 (file)
@@ -55,7 +55,7 @@ function (oonf_create_library libname source include linkto_internal linkto_exte
 endfunction (oonf_create_library)
 
 function (oonf_create_plugin libname source include linkto_external)
-    SET (linkto_internal oonf_core oonf_config oonf_rfc5444 oonf_common)
+    SET (linkto_internal oonf_core oonf_config oonf_common)
     
     oonf_create_library("${libname}" "${source}" "" "${linkto_internal}" "${linkto_external}")
 endfunction (oonf_create_plugin)
index 9232c28..91ed561 100644 (file)
@@ -17,11 +17,6 @@ TARGET_LINK_LIBRARIES(${OONF_EXE} oonf_subsystems)
 # link core
 TARGET_LINK_LIBRARIES(${OONF_EXE} oonf_core)
 
-# link packetbb if necessary
-IF(OONF_NEED_PACKETBB)
-    TARGET_LINK_LIBRARIES(${OONF_EXE} oonf_rfc5444)
-ENDIF(OONF_NEED_PACKETBB)
-
 # link config and common API
 TARGET_LINK_LIBRARIES(${OONF_EXE} oonf_config)
 TARGET_LINK_LIBRARIES(${OONF_EXE} oonf_common)
index 88d389a..32ea655 100644 (file)
@@ -18,11 +18,6 @@ ENDFOREACH(plugin)
 # link core
 TARGET_LINK_LIBRARIES(${OONF_EXE} -Wl,--whole-archive oonf_static_core -Wl,--no-whole-archive)
 
-# link packetbb if necessary
-IF(OONF_NEED_PACKETBB)
-    TARGET_LINK_LIBRARIES(${OONF_EXE} -Wl,--whole-archive oonf_static_rfc5444 -Wl,--no-whole-archive)
-ENDIF(OONF_NEED_PACKETBB)
-
 # link config and common API
 TARGET_LINK_LIBRARIES(${OONF_EXE} -Wl,--whole-archive oonf_static_config -Wl,--no-whole-archive)
 TARGET_LINK_LIBRARIES(${OONF_EXE} -Wl,--whole-archive oonf_static_common -Wl,--no-whole-archive)
index 9cca869..26341c4 100644 (file)
@@ -44,7 +44,7 @@
 
 #include "common/common_types.h"
 #include "common/netaddr.h"
-#include "rfc5444/rfc5444_reader.h"
+#include "subsystems/rfc5444/rfc5444_reader.h"
 
 #include "rfc5444_reader_writer/reader.h"
 
index 1d4ee12..26d003f 100644 (file)
@@ -2,4 +2,3 @@
 add_subdirectory(common)
 add_subdirectory(config)
 add_subdirectory(core)
-add_subdirectory(rfc5444)
diff --git a/src-api/rfc5444/CMakeLists.txt b/src-api/rfc5444/CMakeLists.txt
deleted file mode 100644 (file)
index b31375d..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# prepare rfc5444 API configuration
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rfc5444_api_config.h.in ${CMAKE_BINARY_DIR}/rfc5444/rfc5444_api_config.h)
-
-SET(OONF_RFC5444_SRCS rfc5444_context.c
-                       rfc5444_msg_generator.c
-                       rfc5444_pkt_generator.c
-                       rfc5444_reader.c
-                       rfc5444_tlv_writer.c
-                       rfc5444_writer.c
-                       rfc5444.c
-                       rfc5444_iana.c
-                       rfc5444_print.c)
-
-SET(OONF_RFC5444_INCLUDES rfc5444_context.h
-                          rfc5444_reader.h
-                          rfc5444_tlv_writer.h
-                          rfc5444_writer.h
-                          rfc5444.h
-                          rfc5444_iana.h
-                          rfc5444_print.h
-                          rfc5444_api_config.h)
-
-oonf_create_library("rfc5444" "${OONF_RFC5444_SRCS}" "${OONF_RFC5444_INCLUDES}" "oonf_common" "")
index e1139d7..a77377c 100644 (file)
@@ -51,9 +51,9 @@
 #include "core/oonf_cfg.h"
 #include "core/oonf_logging.h"
 #include "core/oonf_subsystem.h"
-#include "rfc5444/rfc5444.h"
 #include "subsystems/oonf_class.h"
 #include "subsystems/oonf_interface.h"
+#include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_timer.h"
 
 #include "nhdp/nhdp.h"
index a69fbd4..665338a 100644 (file)
 #include "common/common_types.h"
 #include "common/isonumber.h"
 #include "common/autobuf.h"
-#include "rfc5444/rfc5444_iana.h"
-#include "rfc5444/rfc5444.h"
-#include "rfc5444/rfc5444_reader.h"
-
 #include "core/oonf_cfg.h"
 #include "core/oonf_logging.h"
 #include "core/oonf_subsystem.h"
index 9387822..01d34d2 100644 (file)
@@ -43,9 +43,6 @@
 
 #include "common/common_types.h"
 #include "common/autobuf.h"
-#include "rfc5444/rfc5444_iana.h"
-#include "rfc5444/rfc5444.h"
-#include "rfc5444/rfc5444_reader.h"
 #include "core/oonf_cfg.h"
 #include "core/oonf_logging.h"
 #include "core/oonf_subsystem.h"
index d11f7ac..6e83170 100644 (file)
@@ -50,8 +50,8 @@
 #include "config/cfg_schema.h"
 #include "core/oonf_logging.h"
 #include "core/oonf_subsystem.h"
-#include "rfc5444/rfc5444.h"
 #include "subsystems/oonf_class.h"
+#include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_timer.h"
 
 #include "nhdp/nhdp.h"
index e986933..98d5f81 100644 (file)
@@ -41,7 +41,6 @@
 #include "nhdp/nhdp.h"
 #include "nhdp/nhdp_db.h"
 #include "nhdp/nhdp_domain.h"
-#include "rfc5444/rfc5444.h"
 #include "nhdp/nhdp_interfaces.h"
 
 #include "common/common_types.h"
@@ -51,8 +50,8 @@
 #include "common/container_of.h"
 #include "config/cfg_schema.h"
 #include "core/oonf_logging.h"
-#include "rfc5444/rfc5444.h"
 #include "subsystems/oonf_class.h"
+#include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_timer.h"
 
 #include "mpr/mpr_internal.h"
index 3d1f7ce..fbd16bb 100644 (file)
@@ -41,7 +41,6 @@
 #include "nhdp/nhdp.h"
 #include "nhdp/nhdp_db.h"
 #include "nhdp/nhdp_domain.h"
-#include "rfc5444/rfc5444.h"
 #include "nhdp/nhdp_interfaces.h"
 
 #include "common/common_types.h"
@@ -51,8 +50,8 @@
 #include "common/container_of.h"
 #include "config/cfg_schema.h"
 #include "core/oonf_logging.h"
-#include "rfc5444/rfc5444.h"
 #include "subsystems/oonf_class.h"
+#include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_timer.h"
 
 #include "mpr/mpr_internal.h"
index 2a4aabf..a0f6dd6 100644 (file)
@@ -42,7 +42,6 @@
 #include "nhdp/nhdp.h"
 #include "nhdp/nhdp_db.h"
 #include "nhdp/nhdp_domain.h"
-#include "rfc5444/rfc5444.h"
 #include "nhdp/nhdp_interfaces.h"
 
 #include "common/common_types.h"
@@ -53,8 +52,8 @@
 #include "config/cfg_schema.h"
 #include "core/oonf_cfg.h"
 #include "core/oonf_logging.h"
-#include "rfc5444/rfc5444.h"
 #include "subsystems/oonf_class.h"
+#include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_timer.h"
 
 #include "mpr/mpr_internal.h"
index d4c9655..5146177 100644 (file)
@@ -41,7 +41,6 @@
 #include "nhdp/nhdp.h"
 #include "nhdp/nhdp_db.h"
 #include "nhdp/nhdp_domain.h"
-#include "rfc5444/rfc5444.h"
 #include "nhdp/nhdp_interfaces.h"
 
 #include "common/common_types.h"
@@ -51,7 +50,7 @@
 #include "common/container_of.h"
 #include "config/cfg_schema.h"
 #include "core/oonf_logging.h"
-#include "rfc5444/rfc5444.h"
+#include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_class.h"
 #include "subsystems/oonf_timer.h"
 
index b851784..58f67ac 100644 (file)
@@ -41,7 +41,6 @@
 
 #include "common/common_types.h"
 #include "config/cfg_schema.h"
-#include "rfc5444/rfc5444_writer.h"
 #include "core/oonf_logging.h"
 #include "core/oonf_subsystem.h"
 #include "subsystems/oonf_class.h"
index a32266e..8701fdd 100644 (file)
 #include "common/list.h"
 #include "common/netaddr.h"
 
-#include "rfc5444/rfc5444.h"
-
 #include "core/oonf_logging.h"
 #include "subsystems/oonf_class.h"
+#include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_timer.h"
 
 #include "nhdp/nhdp_internal.h"
index f2dc882..bb52f31 100644 (file)
@@ -46,7 +46,7 @@
 #include "common/avl.h"
 #include "common/list.h"
 #include "common/netaddr.h"
-#include "rfc5444/rfc5444_iana.h"
+#include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_timer.h"
 
 #include "nhdp/nhdp.h"
index bbde52a..bcdda22 100644 (file)
 #include "common/common_types.h"
 #include "common/list.h"
 #include "common/netaddr.h"
-#include "rfc5444/rfc5444.h"
-#include "rfc5444/rfc5444_reader.h"
 #include "core/oonf_cfg.h"
 #include "core/oonf_logging.h"
 #include "subsystems/oonf_class.h"
+#include "subsystems/oonf_rfc5444.h"
 
 #include "nhdp/nhdp.h"
 #include "nhdp/nhdp_db.h"
index f97146c..a1895d0 100644 (file)
@@ -44,7 +44,6 @@
 
 #include "common/common_types.h"
 #include "common/list.h"
-#include "rfc5444/rfc5444_writer.h"
 #include "subsystems/oonf_rfc5444.h"
 
 #include "nhdp/nhdp_db.h"
index 42a2058..5b10b17 100644 (file)
@@ -40,8 +40,8 @@
  */
 
 #include "common/common_types.h"
-#include "rfc5444/rfc5444_reader.h"
 #include "core/oonf_logging.h"
+#include "subsystems/oonf_rfc5444.h"
 
 #include "nhdp/nhdp_db.h"
 #include "nhdp/nhdp_hysteresis.h"
index a854e6e..5852330 100644 (file)
@@ -43,7 +43,7 @@
 #define NHDP_HYSTERESIS_H_
 
 #include "common/common_types.h"
-#include "rfc5444/rfc5444_reader.h"
+#include "subsystems/oonf_rfc5444.h"
 
 #include "nhdp/nhdp_db.h"
 
index dc55b86..80920f7 100644 (file)
 #include "common/container_of.h"
 #include "common/netaddr.h"
 #include "common/netaddr_acl.h"
-#include "rfc5444/rfc5444_iana.h"
-#include "rfc5444/rfc5444_writer.h"
 #include "core/oonf_cfg.h"
 #include "core/oonf_logging.h"
 #include "subsystems/oonf_class.h"
 #include "subsystems/oonf_interface.h"
+#include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_timer.h"
 
 #include "nhdp/nhdp.h"
index 491c135..6889d47 100644 (file)
@@ -50,7 +50,6 @@ struct nhdp_interface_addr;
 #include "common/list.h"
 #include "common/netaddr.h"
 #include "common/netaddr_acl.h"
-#include "rfc5444/rfc5444_iana.h"
 #include "subsystems/oonf_interface.h"
 #include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_timer.h"
index af3819c..7b0076b 100644 (file)
@@ -41,9 +41,6 @@
 
 #include "common/common_types.h"
 #include "common/netaddr.h"
-#include "rfc5444/rfc5444_iana.h"
-#include "rfc5444/rfc5444.h"
-#include "rfc5444/rfc5444_reader.h"
 #include "core/oonf_logging.h"
 #include "core/oonf_subsystem.h"
 #include "subsystems/oonf_rfc5444.h"
index c0f5af2..49bc874 100644 (file)
@@ -42,9 +42,6 @@
 #include "common/common_types.h"
 #include "common/avl.h"
 #include "common/avl_comp.h"
-#include "rfc5444/rfc5444_iana.h"
-#include "rfc5444/rfc5444.h"
-#include "rfc5444/rfc5444_writer.h"
 #include "core/oonf_logging.h"
 #include "subsystems/oonf_rfc5444.h"
 
index 9ea19fe..e802589 100644 (file)
@@ -44,9 +44,6 @@
 
 #include "core/oonf_logging.h"
 #include "core/oonf_subsystem.h"
-#include "rfc5444/rfc5444_iana.h"
-#include "rfc5444/rfc5444.h"
-#include "rfc5444/rfc5444_reader.h"
 #include "subsystems/oonf_rfc5444.h"
 
 #include "nhdp/nhdp_interfaces.h"
index 10d0dca..9572565 100644 (file)
@@ -47,7 +47,6 @@
 #include "common/netaddr.h"
 #include "common/netaddr_acl.h"
 #include "config/cfg_schema.h"
-#include "rfc5444/rfc5444.h"
 #include "core/oonf_logging.h"
 #include "core/oonf_subsystem.h"
 #include "core/os_core.h"
index 4440e7c..83b2468 100644 (file)
@@ -46,7 +46,7 @@
 #include "core/oonf_logging.h"
 #include "core/oonf_subsystem.h"
 #include "subsystems/oonf_class.h"
-#include "rfc5444/rfc5444.h"
+#include "subsystems/oonf_rfc5444.h"
 
 #include "nhdp/nhdp.h"
 #include "olsrv2/olsrv2.h"
index 38828f8..0b1af6d 100644 (file)
@@ -41,9 +41,6 @@
 
 #include "common/common_types.h"
 #include "common/netaddr.h"
-#include "rfc5444/rfc5444.h"
-#include "rfc5444/rfc5444_iana.h"
-#include "rfc5444/rfc5444_reader.h"
 #include "core/oonf_logging.h"
 #include "core/oonf_subsystem.h"
 #include "subsystems/oonf_duplicate_set.h"
index a623d38..e50ecd4 100644 (file)
@@ -48,8 +48,8 @@
 #include "common/netaddr.h"
 #include "core/oonf_logging.h"
 #include "subsystems/oonf_class.h"
+#include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_timer.h"
-#include "rfc5444/rfc5444.h"
 
 #include "nhdp/nhdp_db.h"
 #include "nhdp/nhdp_domain.h"
index 7476cb2..693bde7 100644 (file)
@@ -43,8 +43,8 @@
 #include "common/avl_comp.h"
 #include "common/common_types.h"
 #include "common/netaddr.h"
-#include "rfc5444/rfc5444.h"
 #include "subsystems/oonf_class.h"
+#include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_timer.h"
 
 #include "nhdp/nhdp_domain.h"
index b9e8ea6..9c3660e 100644 (file)
@@ -43,9 +43,6 @@
 #include "common/common_types.h"
 #include "common/list.h"
 #include "common/netaddr.h"
-#include "rfc5444/rfc5444_iana.h"
-#include "rfc5444/rfc5444.h"
-#include "rfc5444/rfc5444_writer.h"
 #include "core/oonf_logging.h"
 #include "subsystems/oonf_class.h"
 #include "subsystems/oonf_rfc5444.h"
index 2edb00f..c394609 100644 (file)
@@ -6,18 +6,37 @@ SET(SINGLE_FILE_NAMES    oonf_class
                          oonf_interface
                          oonf_layer2
                          oonf_packet_socket
-                         oonf_rfc5444
                          oonf_socket
                          oonf_stream_socket
                          oonf_telnet
                          oonf_timer
-                         oonf_viewer
-                         )
+                         oonf_viewer)
 
 foreach(name ${SINGLE_FILE_NAMES})
     oonf_create_plugin("${name}" "${name}.c" "${name.h}" "")
 endforeach(name)
 
+# generate rfc5444 plugin
+SET(RFC5444_SOURCE  oonf_rfc5444.c
+                    rfc5444/rfc5444.c
+                    rfc5444/rfc5444_context.c
+                    rfc5444/rfc5444_iana.c
+                    rfc5444/rfc5444_msg_generator.c
+                    rfc5444/rfc5444_pkt_generator.c
+                    rfc5444/rfc5444_print.c
+                    rfc5444/rfc5444_reader.c
+                    rfc5444/rfc5444_tlv_writer.c
+                    rfc5444/rfc5444_writer.c)
+SET(RFC5444_INCLUDE oonf_rfc5444.h
+                    rfc5444/rfc5444_context.h
+                    rfc5444/rfc5444.h
+                    rfc5444/rfc5444_iana.h
+                    rfc5444/rfc5444_print.h
+                    rfc5444/rfc5444_reader.h
+                    rfc5444/rfc5444_tlv_writer.h
+                    rfc5444/rfc5444_writer.h)
+oonf_create_plugin("oonf_rfc5444" "${RFC5444_SOURCE}" "${RFC5444_INCLUDE}" "")
+
 # generate the os-specific plugins
 # TODO: add BSD and WIN32
 
index 9d62c19..4e1a265 100644 (file)
 #include "common/common_types.h"
 #include "common/avl.h"
 #include "common/netaddr.h"
-#include "rfc5444/rfc5444_reader.h"
-#include "rfc5444/rfc5444_writer.h"
+#include "subsystems/rfc5444/rfc5444.h"
+#include "subsystems/rfc5444/rfc5444_context.h"
+#include "subsystems/rfc5444/rfc5444_iana.h"
+#include "subsystems/rfc5444/rfc5444_reader.h"
+#include "subsystems/rfc5444/rfc5444_writer.h"
 #include "subsystems/oonf_duplicate_set.h"
 #include "subsystems/oonf_packet_socket.h"
 #include "subsystems/oonf_timer.h"
similarity index 99%
rename from src-api/rfc5444/rfc5444.c
rename to src-plugins/subsystems/rfc5444/rfc5444.c
index c1da2bd..7039ecb 100644 (file)
@@ -41,7 +41,7 @@
 #include <assert.h>
 
 #include "common/common_types.h"
-#include "rfc5444/rfc5444.h"
+#include "rfc5444.h"
 
 /**
  * Retrieve a timetlv value from a vector of hopcount/value sequences.
similarity index 99%
rename from src-api/rfc5444/rfc5444.h
rename to src-plugins/subsystems/rfc5444/rfc5444.h
index 4ae370d..c5bb491 100644 (file)
@@ -42,7 +42,7 @@
 #define RFC5444_CONVERSION_H_
 
 #include "common/common_types.h"
-#include "rfc5444/rfc5444_iana.h"
+#include "rfc5444_iana.h"
 
 enum {
   /* timetlv_max = 14 * 2^28 * 1000 / 1024 = 14000 << 18 = 3 670 016 000 ms */
@@ -42,9 +42,9 @@
 #ifndef RFC5444_API_CONFIG_H_
 #define RFC5444_API_CONFIG_H_
 
-#define DISALLOW_CONSUMER_CONTEXT_DROP ${RFC5444_DISALLOW_CONSUMER_CONTEXT_DROP}
-#define WRITER_STATE_MACHINE ${RFC5444_WRITER_STATE_MACHINE}
-#define DEBUG_CLEANUP ${RFC5444_DEBUG_CLEANUP}
-#define DO_ADDR_COMPRESSION ${RFC5444_DO_ADDR_COMPRESSION}
+#define DISALLOW_CONSUMER_CONTEXT_DROP false
+#define WRITER_STATE_MACHINE           true
+#define DEBUG_CLEANUP                  false
+#define DO_ADDR_COMPRESSION            true
 
 #endif /* RFC5444_API_CONFIG_H_ */
similarity index 99%
rename from src-api/rfc5444/rfc5444_context.c
rename to src-plugins/subsystems/rfc5444/rfc5444_context.c
index 6a47bd9..7734800 100644 (file)
@@ -38,7 +38,7 @@
  * the copyright holders.
  *
  */
-#include <rfc5444/rfc5444_context.h>
+#include "rfc5444_context.h"
 
 static const char *_rfc5444_positive_result_texts[] = {
   [RFC5444_OKAY]                 = "Okay",
similarity index 99%
rename from src-api/rfc5444/rfc5444_context.h
rename to src-plugins/subsystems/rfc5444/rfc5444_context.h
index 129a57a..d592bc2 100644 (file)
@@ -42,7 +42,7 @@
 #define RFC5444_CONTEXT_H_
 
 #include "common/common_types.h"
-#include "rfc5444/rfc5444_api_config.h"
+#include "rfc5444_api_config.h"
 
 /*
  * Return values for reader callbacks and API calls (and internal functions)
similarity index 98%
rename from src-api/rfc5444/rfc5444_iana.c
rename to src-plugins/subsystems/rfc5444/rfc5444_iana.c
index a163884..5e7298a 100644 (file)
@@ -41,7 +41,7 @@
 #include "common/common_types.h"
 #include "common/netaddr.h"
 
-#include "rfc5444/rfc5444_iana.h"
+#include "rfc5444_iana.h"
 
 const struct netaddr RFC5444_MANET_MULTICAST_V4 = {
   ._addr = { 224,0,0,109, 0,0,0,0,0,0,0,0,0,0,0,0 },
@@ -43,8 +43,8 @@
 #include <string.h>
 
 #include "common/common_types.h"
-#include "rfc5444/rfc5444_writer.h"
-#include "rfc5444/rfc5444_api_config.h"
+#include "rfc5444_writer.h"
+#include "rfc5444_api_config.h"
 
 /* data necessary for automatic address compression */
 struct _rfc5444_internal_addr_compress_session {
@@ -43,8 +43,8 @@
 
 #include "common/common_types.h"
 #include "common/list.h"
-#include "rfc5444/rfc5444_writer.h"
-#include "rfc5444/rfc5444_api_config.h"
+#include "rfc5444_writer.h"
+#include "rfc5444_api_config.h"
 
 static void _write_pktheader(struct rfc5444_writer_target *target);
 
similarity index 99%
rename from src-api/rfc5444/rfc5444_print.c
rename to src-plugins/subsystems/rfc5444/rfc5444_print.c
index 4b3e04d..c2e8716 100644 (file)
@@ -45,8 +45,8 @@
 #include <arpa/inet.h>
 
 #include "common/netaddr.h"
-#include "rfc5444/rfc5444_reader.h"
-#include "rfc5444/rfc5444_print.h"
+#include "rfc5444_reader.h"
+#include "rfc5444_print.h"
 
 static enum rfc5444_result _cb_print_pkt_start(
     struct rfc5444_reader_tlvblock_context *context);
similarity index 98%
rename from src-api/rfc5444/rfc5444_print.h
rename to src-plugins/subsystems/rfc5444/rfc5444_print.h
index 0b400d8..0e61855 100644 (file)
@@ -43,7 +43,7 @@
 
 #include "common/common_types.h"
 #include "common/autobuf.h"
-#include "rfc5444/rfc5444_reader.h"
+#include "rfc5444_reader.h"
 
 struct rfc5444_print_session {
   struct autobuf *output;
similarity index 99%
rename from src-api/rfc5444/rfc5444_reader.c
rename to src-plugins/subsystems/rfc5444/rfc5444_reader.c
index 290f558..83e6188 100644 (file)
@@ -45,8 +45,8 @@
 #include "common/avl.h"
 #include "common/avl_comp.h"
 #include "common/common_types.h"
-#include "rfc5444/rfc5444_reader.h"
-#include "rfc5444/rfc5444_api_config.h"
+#include "rfc5444_reader.h"
+#include "rfc5444_api_config.h"
 
 #if DISALLOW_CONSUMER_CONTEXT_DROP == true
 #define RFC5444_CONSUMER_DROP_ONLY(value, def) (def)
similarity index 99%
rename from src-api/rfc5444/rfc5444_reader.h
rename to src-plugins/subsystems/rfc5444/rfc5444_reader.h
index 6962741..475639c 100644 (file)
@@ -45,7 +45,7 @@
 #include "common/avl.h"
 #include "common/common_types.h"
 #include "common/netaddr.h"
-#include "rfc5444/rfc5444_context.h"
+#include "rfc5444_context.h"
 
 /* Bitarray with 256 elements for skipping addresses/tlvs */
 struct rfc5444_reader_bitarray256 {
similarity index 98%
rename from src-api/rfc5444/rfc5444_tlv_writer.c
rename to src-plugins/subsystems/rfc5444/rfc5444_tlv_writer.c
index 3e0b0e1..aca40be 100644 (file)
@@ -42,9 +42,9 @@
 #include <string.h>
 
 #include "common/common_types.h"
-#include "rfc5444/rfc5444_tlv_writer.h"
-#include "rfc5444/rfc5444_context.h"
-#include "rfc5444/rfc5444_api_config.h"
+#include "rfc5444_tlv_writer.h"
+#include "rfc5444_context.h"
+#include "rfc5444_api_config.h"
 
 static size_t _calc_tlv_size(bool exttype, size_t length);
 static void _write_tlv(uint8_t *ptr, uint8_t type, uint8_t exttype,
similarity index 99%
rename from src-api/rfc5444/rfc5444_writer.c
rename to src-plugins/subsystems/rfc5444/rfc5444_writer.c
index 46ebe6d..2e87ea9 100644 (file)
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-// #include <stdio.h>
 
 #include "common/avl.h"
 #include "common/avl_comp.h"
 #include "common/common_types.h"
 #include "common/list.h"
-#include "rfc5444/rfc5444_context.h"
-#include "rfc5444/rfc5444_writer.h"
-#include "rfc5444/rfc5444_api_config.h"
+#include "rfc5444_context.h"
+#include "rfc5444_writer.h"
+#include "rfc5444_api_config.h"
 
 static void _register_addrtlvtype(struct rfc5444_writer *writer,
     struct rfc5444_writer_message *msg,
similarity index 99%
rename from src-api/rfc5444/rfc5444_writer.h
rename to src-plugins/subsystems/rfc5444/rfc5444_writer.h
index 8f88991..75e24b3 100644 (file)
@@ -49,9 +49,9 @@ struct rfc5444_writer_message;
 #include "common/common_types.h"
 #include "common/list.h"
 #include "common/netaddr.h"
-#include "rfc5444/rfc5444_context.h"
-#include "rfc5444/rfc5444_reader.h"
-#include "rfc5444/rfc5444_tlv_writer.h"
+#include "rfc5444_context.h"
+#include "rfc5444_reader.h"
+#include "rfc5444_tlv_writer.h"
 /*
  * Macros to iterate over existing addresses in a message(fragment)
  * during message generation (finishMessageHeader/finishMessageTLVs