Rename "subsystems" directory to "base"
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 14 May 2018 04:55:49 +0000 (06:55 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 14 May 2018 04:55:49 +0000 (06:55 +0200)
156 files changed:
include/oonf/base/oonf_class.h [moved from include/oonf/subsystems/oonf_class.h with 100% similarity]
include/oonf/base/oonf_clock.h [moved from include/oonf/subsystems/oonf_clock.h with 100% similarity]
include/oonf/base/oonf_duplicate_set.h [moved from include/oonf/subsystems/oonf_duplicate_set.h with 99% similarity]
include/oonf/base/oonf_http.h [moved from include/oonf/subsystems/oonf_http.h with 99% similarity]
include/oonf/base/oonf_layer2.h [moved from include/oonf/subsystems/oonf_layer2.h with 99% similarity]
include/oonf/base/oonf_packet_socket.h [moved from include/oonf/subsystems/oonf_packet_socket.h with 98% similarity]
include/oonf/base/oonf_rfc5444.h [moved from include/oonf/subsystems/oonf_rfc5444.h with 99% similarity]
include/oonf/base/oonf_socket.h [moved from include/oonf/subsystems/oonf_socket.h with 99% similarity]
include/oonf/base/oonf_stream_socket.h [moved from include/oonf/subsystems/oonf_stream_socket.h with 98% similarity]
include/oonf/base/oonf_telnet.h [moved from include/oonf/subsystems/oonf_telnet.h with 99% similarity]
include/oonf/base/oonf_timer.h [moved from include/oonf/subsystems/oonf_timer.h with 99% similarity]
include/oonf/base/oonf_viewer.h [moved from include/oonf/subsystems/oonf_viewer.h with 98% similarity]
include/oonf/base/os_clock.h [moved from include/oonf/subsystems/os_clock.h with 93% similarity]
include/oonf/base/os_fd.h [moved from include/oonf/subsystems/os_fd.h with 96% similarity]
include/oonf/base/os_generic/os_fd_generic_configsocket.h [moved from include/oonf/subsystems/os_generic/os_fd_generic_configsocket.h with 85% similarity]
include/oonf/base/os_generic/os_fd_generic_getrawsocket.h [moved from include/oonf/subsystems/os_generic/os_fd_generic_getrawsocket.h with 92% similarity]
include/oonf/base/os_generic/os_fd_generic_getsocket.h [moved from include/oonf/subsystems/os_generic/os_fd_generic_getsocket.h with 92% similarity]
include/oonf/base/os_generic/os_fd_generic_join_mcast.h [moved from include/oonf/subsystems/os_generic/os_fd_generic_join_mcast.h with 94% similarity]
include/oonf/base/os_generic/os_fd_generic_set_dscp.h [moved from include/oonf/subsystems/os_generic/os_fd_generic_set_dscp.h with 89% similarity]
include/oonf/base/os_generic/os_fd_generic_set_nonblocking.h [moved from include/oonf/subsystems/os_generic/os_fd_generic_set_nonblocking.h with 90% similarity]
include/oonf/base/os_generic/os_interface_generic.h [moved from include/oonf/subsystems/os_generic/os_interface_generic.h with 94% similarity]
include/oonf/base/os_generic/os_routing_generic_init_half_route_key.h [moved from include/oonf/subsystems/os_generic/os_routing_generic_init_half_route_key.h with 91% similarity]
include/oonf/base/os_generic/os_routing_generic_rt_to_string.h [moved from include/oonf/subsystems/os_generic/os_routing_generic_rt_to_string.h with 91% similarity]
include/oonf/base/os_interface.h [moved from include/oonf/subsystems/os_interface.h with 97% similarity]
include/oonf/base/os_linux/os_clock_linux.h [moved from include/oonf/subsystems/os_linux/os_clock_linux.h with 100% similarity]
include/oonf/base/os_linux/os_fd_linux.h [moved from include/oonf/subsystems/os_linux/os_fd_linux.h with 97% similarity]
include/oonf/base/os_linux/os_interface_linux.h [moved from include/oonf/subsystems/os_linux/os_interface_linux.h with 98% similarity]
include/oonf/base/os_linux/os_interface_linux_internal.h [moved from include/oonf/subsystems/os_linux/os_interface_linux_internal.h with 98% similarity]
include/oonf/base/os_linux/os_routing_linux.h [moved from include/oonf/subsystems/os_linux/os_routing_linux.h with 97% similarity]
include/oonf/base/os_linux/os_system_linux.h [moved from include/oonf/subsystems/os_linux/os_system_linux.h with 98% similarity]
include/oonf/base/os_linux/os_tunnel_linux.h [moved from include/oonf/subsystems/os_linux/os_tunnel_linux.h with 98% similarity]
include/oonf/base/os_linux/os_vif_linux.h [moved from include/oonf/subsystems/os_linux/os_vif_linux.h with 98% similarity]
include/oonf/base/os_routing.h [moved from include/oonf/subsystems/os_routing.h with 98% similarity]
include/oonf/base/os_system.h [moved from include/oonf/subsystems/os_system.h with 93% similarity]
include/oonf/base/os_tunnel.h [moved from include/oonf/subsystems/os_tunnel.h with 98% similarity]
include/oonf/base/os_vif.h [moved from include/oonf/subsystems/os_vif.h with 97% similarity]
include/oonf/crypto/rfc5444_signature/rfc5444_signature.h
include/oonf/generic/dlep/dlep_extension.h
include/oonf/generic/dlep/dlep_interface.h
include/oonf/generic/dlep/dlep_reader.h
include/oonf/generic/dlep/dlep_session.h
include/oonf/generic/dlep/dlep_writer.h
include/oonf/generic/dlep/ext_base_proto/proto.h
include/oonf/generic/dlep/radio/dlep_radio_interface.h
include/oonf/generic/dlep/radio/dlep_radio_session.h
include/oonf/generic/dlep/router/dlep_router_interface.h
include/oonf/generic/dlep/router/dlep_router_session.h
include/oonf/generic/nl80211_listener/nl80211_listener.h
include/oonf/nhdp/nhdp/nhdp.h
include/oonf/nhdp/nhdp/nhdp_db.h
include/oonf/nhdp/nhdp/nhdp_domain.h
include/oonf/nhdp/nhdp/nhdp_hysteresis.h
include/oonf/nhdp/nhdp/nhdp_interfaces.h
include/oonf/nhdp/nhdp/nhdp_reader.h
include/oonf/nhdp/nhdp/nhdp_writer.h
include/oonf/olsrv2/olsrv2/olsrv2_lan.h
include/oonf/olsrv2/olsrv2/olsrv2_originator.h
include/oonf/olsrv2/olsrv2/olsrv2_reader.h
include/oonf/olsrv2/olsrv2/olsrv2_routing.h
include/oonf/olsrv2/olsrv2/olsrv2_tc.h
include/oonf/olsrv2/olsrv2/olsrv2_writer.h
src/CMakeLists.txt
src/base/CMakeLists.txt [moved from src/subsystems/CMakeLists.txt with 100% similarity]
src/base/oonf_class.c [moved from src/subsystems/oonf_class.c with 99% similarity]
src/base/oonf_clock.c [moved from src/subsystems/oonf_clock.c with 98% similarity]
src/base/oonf_duplicate_set.c [moved from src/subsystems/oonf_duplicate_set.c with 98% similarity]
src/base/oonf_http.c [moved from src/subsystems/oonf_http.c with 99% similarity]
src/base/oonf_layer2.c [moved from src/subsystems/oonf_layer2.c with 99% similarity]
src/base/oonf_packet_socket.c [moved from src/subsystems/oonf_packet_socket.c with 99% similarity]
src/base/oonf_rfc5444.c [moved from src/subsystems/oonf_rfc5444.c with 99% similarity]
src/base/oonf_socket.c [moved from src/subsystems/oonf_socket.c with 97% similarity]
src/base/oonf_stream_socket.c [moved from src/subsystems/oonf_stream_socket.c with 99% similarity]
src/base/oonf_telnet.c [moved from src/subsystems/oonf_telnet.c with 99% similarity]
src/base/oonf_timer.c [moved from src/subsystems/oonf_timer.c with 98% similarity]
src/base/oonf_viewer.c [moved from src/subsystems/oonf_viewer.c with 99% similarity]
src/base/os_generic/os_fd_generic_configsocket.c [moved from src/subsystems/os_generic/os_fd_generic_configsocket.c with 97% similarity]
src/base/os_generic/os_fd_generic_getrawsocket.c [moved from src/subsystems/os_generic/os_fd_generic_getrawsocket.c with 95% similarity]
src/base/os_generic/os_fd_generic_getsocket.c [moved from src/subsystems/os_generic/os_fd_generic_getsocket.c with 96% similarity]
src/base/os_generic/os_fd_generic_join_mcast.c [moved from src/subsystems/os_generic/os_fd_generic_join_mcast.c with 98% similarity]
src/base/os_generic/os_fd_generic_set_dscp.c [moved from src/subsystems/os_generic/os_fd_generic_set_dscp.c with 96% similarity]
src/base/os_generic/os_fd_generic_set_nonblocking.c [moved from src/subsystems/os_generic/os_fd_generic_set_nonblocking.c with 95% similarity]
src/base/os_generic/os_interface_generic.c [moved from src/subsystems/os_generic/os_interface_generic.c with 99% similarity]
src/base/os_generic/os_routing_generic_init_half_route_key.c [moved from src/subsystems/os_generic/os_routing_generic_init_half_route_key.c with 98% similarity]
src/base/os_generic/os_routing_generic_rt_to_string.c [moved from src/subsystems/os_generic/os_routing_generic_rt_to_string.c with 98% similarity]
src/base/os_generic/os_routing_generic_rtkey_avlcomp.c [moved from src/subsystems/os_generic/os_routing_generic_rtkey_avlcomp.c with 98% similarity]
src/base/os_linux/os_clock_linux.c [moved from src/subsystems/os_linux/os_clock_linux.c with 99% similarity]
src/base/os_linux/os_fd_linux.c [moved from src/subsystems/os_linux/os_fd_linux.c with 98% similarity]
src/base/os_linux/os_interface_linux.c [moved from src/subsystems/os_linux/os_interface_linux.c with 99% similarity]
src/base/os_linux/os_routing_linux.c [moved from src/subsystems/os_linux/os_routing_linux.c with 99% similarity]
src/base/os_linux/os_system_linux.c [moved from src/subsystems/os_linux/os_system_linux.c with 99% similarity]
src/base/os_linux/os_tunnel_linux.c [moved from src/subsystems/os_linux/os_tunnel_linux.c with 99% similarity]
src/base/os_linux/os_vif_linux.c [moved from src/subsystems/os_linux/os_vif_linux.c with 99% similarity]
src/crypto/rfc5444_signature/rfc5444_signature.c
src/crypto/rfc7182_provider/rfc7182_provider.c
src/crypto/sharedkey_sig/sharedkey_sig.c
src/crypto/simple_security/simple_security.c
src/generic/dlep/dlep_extension.c
src/generic/dlep/dlep_interface.c
src/generic/dlep/dlep_session.c
src/generic/dlep/ext_base_ip/ip.c
src/generic/dlep/ext_base_metric/metric.c
src/generic/dlep/ext_base_proto/proto.c
src/generic/dlep/ext_base_proto/proto_radio.c
src/generic/dlep/ext_lid/lid.c
src/generic/dlep/radio/dlep_radio.c
src/generic/dlep/radio/dlep_radio_interface.c
src/generic/dlep/radio/dlep_radio_session.c
src/generic/dlep/router/dlep_router.c
src/generic/dlep/router/dlep_router_interface.c
src/generic/dlep/router/dlep_router_session.c
src/generic/eth_listener/eth_listener.c
src/generic/example/example.c
src/generic/layer2_config/layer2_config.c
src/generic/layer2_generator/layer2_generator.c
src/generic/layer2info/layer2info.c
src/generic/link_config/link_config.c
src/generic/nl80211_listener/genl_get_family.c
src/generic/nl80211_listener/nl80211_get_interface.c
src/generic/nl80211_listener/nl80211_get_mpp.c
src/generic/nl80211_listener/nl80211_get_station_dump.c
src/generic/nl80211_listener/nl80211_get_survey.c
src/generic/nl80211_listener/nl80211_get_wiphy.c
src/generic/nl80211_listener/nl80211_listener.c
src/generic/plugin_controller/plugin_controller.c
src/generic/remotecontrol/remotecontrol.c
src/generic/systeminfo/systeminfo.c
src/nhdp/auto_ll4/auto_ll4.c
src/nhdp/constant_metric/constant_metric.c
src/nhdp/ff_dat_metric/ff_dat_metric.c
src/nhdp/hysteresis_olsrv1/hysteresis_olsrv1.c
src/nhdp/mpr/mpr.c
src/nhdp/mpr/neighbor-graph-flooding.c
src/nhdp/mpr/neighbor-graph-routing.c
src/nhdp/mpr/neighbor-graph.c
src/nhdp/mpr/selection-rfc7181.c
src/nhdp/neighbor_probing/neighbor_probing.c
src/nhdp/nhdp/nhdp.c
src/nhdp/nhdp/nhdp_db.c
src/nhdp/nhdp/nhdp_domain.c
src/nhdp/nhdp/nhdp_hysteresis.c
src/nhdp/nhdp/nhdp_interfaces.c
src/nhdp/nhdp/nhdp_reader.c
src/nhdp/nhdp/nhdp_writer.c
src/nhdp/nhdpcheck/nhdpcheck.c
src/nhdp/nhdpinfo/nhdpinfo.c
src/olsrv2/lan_import/lan_import.c
src/olsrv2/netjsoninfo/netjsoninfo.c
src/olsrv2/olsrv2/olsrv2.c
src/olsrv2/olsrv2/olsrv2_lan.c
src/olsrv2/olsrv2/olsrv2_originator.c
src/olsrv2/olsrv2/olsrv2_reader.c
src/olsrv2/olsrv2/olsrv2_routing.c
src/olsrv2/olsrv2/olsrv2_tc.c
src/olsrv2/olsrv2/olsrv2_writer.c
src/olsrv2/olsrv2info/olsrv2info.c
src/olsrv2/route_modifier/route_modifier.c

similarity index 99%
rename from include/oonf/subsystems/oonf_duplicate_set.h
rename to include/oonf/base/oonf_duplicate_set.h
index cae0110..86c5347 100644 (file)
@@ -49,7 +49,7 @@
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_timer.h>
 
 /*! subsystem identifier */
 #define OONF_DUPSET_SUBSYSTEM "duplicate_set"
similarity index 99%
rename from include/oonf/subsystems/oonf_http.h
rename to include/oonf/base/oonf_http.h
index 41baa8e..d9efa65 100644 (file)
@@ -51,7 +51,7 @@
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcommon/netaddr_acl.h>
 #include <oonf/libcommon/string.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
+#include <oonf/base/oonf_stream_socket.h>
 
 /*! subsystem identifier */
 #define OONF_HTTP_SUBSYSTEM "http"
similarity index 99%
rename from include/oonf/subsystems/oonf_layer2.h
rename to include/oonf/base/oonf_layer2.h
index 51ca7f0..744e8d7 100644 (file)
@@ -49,7 +49,7 @@
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/os_interface.h>
 
 /*! subsystem identifier */
 #define OONF_LAYER2_SUBSYSTEM "layer2"
similarity index 98%
rename from include/oonf/subsystems/oonf_packet_socket.h
rename to include/oonf/base/oonf_packet_socket.h
index db3bf90..ef509d6 100644 (file)
@@ -51,8 +51,8 @@
 #include <oonf/libcommon/list.h>
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcommon/netaddr_acl.h>
-#include <oonf/subsystems/oonf_socket.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_socket.h>
+#include <oonf/base/os_interface.h>
 
 #ifndef _WIN32
 #include <net/if.h>
similarity index 99%
rename from include/oonf/subsystems/oonf_rfc5444.h
rename to include/oonf/base/oonf_rfc5444.h
index b0bab21..b9c773f 100644 (file)
@@ -49,9 +49,9 @@
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
-#include <oonf/subsystems/oonf_duplicate_set.h>
-#include <oonf/subsystems/oonf_packet_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_duplicate_set.h>
+#include <oonf/base/oonf_packet_socket.h>
+#include <oonf/base/oonf_timer.h>
 #include <oonf/librfc5444/rfc5444.h>
 #include <oonf/librfc5444/rfc5444_context.h>
 #include <oonf/librfc5444/rfc5444_iana.h>
similarity index 99%
rename from include/oonf/subsystems/oonf_socket.h
rename to include/oonf/base/oonf_socket.h
index f703dd1..8218b08 100644 (file)
@@ -50,7 +50,7 @@
 #include <oonf/oonf.h>
 #include <oonf/libcommon/list.h>
 #include <oonf/libcommon/netaddr_acl.h>
-#include <oonf/subsystems/os_fd.h>
+#include <oonf/base/os_fd.h>
 
 /*! subsystem identifier */
 #define OONF_SOCKET_SUBSYSTEM "socket"
similarity index 98%
rename from include/oonf/subsystems/oonf_stream_socket.h
rename to include/oonf/base/oonf_stream_socket.h
index 938a4e7..044af6e 100644 (file)
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcommon/netaddr_acl.h>
 
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_socket.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 /*! subsystem identifier */
 #define OONF_STREAM_SUBSYSTEM "stream_socket"
similarity index 99%
rename from include/oonf/subsystems/oonf_telnet.h
rename to include/oonf/base/oonf_telnet.h
index 85dce02..0d3ffd5 100644 (file)
@@ -51,7 +51,7 @@
 #include <oonf/libcommon/list.h>
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcommon/netaddr_acl.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
+#include <oonf/base/oonf_stream_socket.h>
 
 /*! subsystem identifier */
 #define OONF_TELNET_SUBSYSTEM "telnet"
similarity index 99%
rename from include/oonf/subsystems/oonf_timer.h
rename to include/oonf/base/oonf_timer.h
index 9b51952..38640ad 100644 (file)
@@ -50,7 +50,7 @@
 #include <oonf/oonf.h>
 #include <oonf/libcommon/list.h>
 
-#include <oonf/subsystems/oonf_clock.h>
+#include <oonf/base/oonf_clock.h>
 
 /*! subsystem identifier */
 #define OONF_TIMER_SUBSYSTEM "timer"
similarity index 98%
rename from include/oonf/subsystems/oonf_viewer.h
rename to include/oonf/base/oonf_viewer.h
index ba6cdbd..6ce5e20 100644 (file)
@@ -52,7 +52,7 @@
 #include <oonf/libcommon/template.h>
 
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_telnet.h> /* compile-time dependency */
+#include <oonf/base/oonf_telnet.h> /* compile-time dependency */
 
 /*! subsystem identifier */
 #define OONF_VIEWER_SUBSYSTEM "viewer"
similarity index 93%
rename from include/oonf/subsystems/os_clock.h
rename to include/oonf/base/os_clock.h
index 17fd147..3a75157 100644 (file)
 #define OONF_OS_CLOCK_SUBSYSTEM "os_clock"
 
 #if defined(__linux__)
-#include <oonf/subsystems/os_linux/os_clock_linux.h>
+#include <oonf/base/os_linux/os_clock_linux.h>
 #elif defined(BSD)
-#include <oonf/subsystems/os_bsd/os_clock_bsd.h>
+#include <oonf/base/os_bsd/os_clock_bsd.h>
 #elif defined(_WIN32)
-#include <oonf/subsystems/os_win32/os_clock_win32.h>
+#include <oonf/base/os_win32/os_clock_win32.h>
 #else
 #error "Unknown operation system"
 #endif
similarity index 96%
rename from include/oonf/subsystems/os_fd.h
rename to include/oonf/base/os_fd.h
index 9e21c91..8f74cf6 100644 (file)
@@ -54,8 +54,8 @@
 #include <oonf/libcommon/list.h>
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 /*! subsystem identifier */
 #define OONF_OS_FD_SUBSYSTEM "os_fd"
@@ -114,11 +114,11 @@ static INLINE uint8_t *os_fd_skip_rawsocket_prefix(uint8_t *ptr, ssize_t *len, i
 
 /* include os-specific headers */
 #if defined(__linux__)
-#include <oonf/subsystems/os_linux/os_fd_linux.h>
+#include <oonf/base/os_linux/os_fd_linux.h>
 #elif defined(BSD)
-#include <oonf/subsystems/os_bsd/os_fd_bsd.h>
+#include <oonf/base/os_bsd/os_fd_bsd.h>
 #elif defined(_WIN32)
-#include <oonf/subsystems/os_win32/os_fd_win32.h>
+#include <oonf/base/os_win32/os_fd_win32.h>
 #else
 #error "Unknown operation system"
 #endif
@@ -10,8 +10,8 @@
 
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/os_fd.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/os_fd.h>
+#include <oonf/base/os_interface.h>
 
 EXPORT int os_fd_generic_configsocket(struct os_fd *sock, const union netaddr_socket *bind_to, size_t recvbuf,
   bool rawip, const struct os_interface *os_if, enum oonf_log_source log_src);
@@ -9,7 +9,7 @@
 #define _OS_FD_GENERIC_GETRAWSOCKET_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_fd.h>
+#include <oonf/base/os_fd.h>
 
 EXPORT int os_fd_generic_getrawsocket(struct os_fd *sock, const union netaddr_socket *bind_to, int protocol,
   size_t recvbuf, const struct os_interface *os_if, enum oonf_log_source log_src);
@@ -9,7 +9,7 @@
 #define _OS_FD_GENERIC_GETSOCKET_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_fd.h>
+#include <oonf/base/os_fd.h>
 
 EXPORT int os_fd_generic_getsocket(struct os_fd *sock, const union netaddr_socket *bind_to, bool tcp, size_t recvbuf,
   const struct os_interface *os_if, enum oonf_log_source log_src);
@@ -9,7 +9,7 @@
 #define _OS_FD_GENERIC_JOIN_MCAST_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_fd.h>
+#include <oonf/base/os_fd.h>
 
 EXPORT int os_fd_generic_join_mcast_recv(
   struct os_fd *sock, const struct netaddr *multicast, const struct os_interface *os_if, enum oonf_log_source log_src);
@@ -9,7 +9,7 @@
 #define _OS_FD_GENERIC_SET_DSCP_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_fd.h>
+#include <oonf/base/os_fd.h>
 
 EXPORT int os_fd_generic_set_dscp(struct os_fd *sock, int dscp, bool ipv6);
 
@@ -9,7 +9,7 @@
 #define _OS_FD_GENERIC_SET_NONBLOCKING_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_fd.h>
+#include <oonf/base/os_fd.h>
 
 EXPORT int os_fd_generic_set_nonblocking(struct os_fd *sock);
 
@@ -10,7 +10,7 @@
 
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr_acl.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/os_interface.h>
 
 EXPORT const struct netaddr *os_interface_generic_get_bindaddress(
   int af_type, struct netaddr_acl *filter, struct os_interface *os_if);
@@ -9,7 +9,7 @@
 #define _OS_ROUTING_GENERIC_INIT_HALF_ROUTE_KEY_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_routing.h>
+#include <oonf/base/os_routing.h>
 
 EXPORT void os_routing_generic_init_half_os_route_key(
   struct netaddr *ipany, struct netaddr *specific, const struct netaddr *source);
@@ -9,7 +9,7 @@
 #define _OS_GENERIC_OS_ROUTING_GENERIC_RT_TO_STRING_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_routing.h>
+#include <oonf/base/os_routing.h>
 
 const char *os_routing_generic_rt_to_string(struct os_route_str *buf, const struct os_route_parameter *route_parameter);
 
similarity index 97%
rename from include/oonf/subsystems/os_interface.h
rename to include/oonf/base/os_interface.h
index 5cea94a..a967137 100644 (file)
@@ -52,8 +52,8 @@
 #include <oonf/oonf.h>
 #include <oonf/libcommon/list.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 /*! subsystem identifier */
 #define OONF_OS_INTERFACE_SUBSYSTEM "os_interface"
@@ -63,7 +63,7 @@
 
 /* include os-specific headers */
 #if defined(__linux__)
-#include <oonf/subsystems/os_linux/os_interface_linux_internal.h>
+#include <oonf/base/os_linux/os_interface_linux_internal.h>
 #else
 #error "Unknown operation system"
 #endif
@@ -240,7 +240,7 @@ struct os_interface_listener {
 
 /* include os-specific headers */
 #if defined(__linux__)
-#include <oonf/subsystems/os_linux/os_interface_linux.h>
+#include <oonf/base/os_linux/os_interface_linux.h>
 #else
 #error "Unknown operation system"
 #endif
similarity index 97%
rename from include/oonf/subsystems/os_linux/os_fd_linux.h
rename to include/oonf/base/os_linux/os_fd_linux.h
index 20ca699..8007c23 100644 (file)
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <oonf/subsystems/os_fd.h>
-#include <oonf/subsystems/os_generic/os_fd_generic_configsocket.h>
-#include <oonf/subsystems/os_generic/os_fd_generic_getrawsocket.h>
-#include <oonf/subsystems/os_generic/os_fd_generic_getsocket.h>
-#include <oonf/subsystems/os_generic/os_fd_generic_join_mcast.h>
-#include <oonf/subsystems/os_generic/os_fd_generic_set_dscp.h>
-#include <oonf/subsystems/os_generic/os_fd_generic_set_nonblocking.h>
+#include <oonf/base/os_fd.h>
+#include <oonf/base/os_generic/os_fd_generic_configsocket.h>
+#include <oonf/base/os_generic/os_fd_generic_getrawsocket.h>
+#include <oonf/base/os_generic/os_fd_generic_getsocket.h>
+#include <oonf/base/os_generic/os_fd_generic_join_mcast.h>
+#include <oonf/base/os_generic/os_fd_generic_set_dscp.h>
+#include <oonf/base/os_generic/os_fd_generic_set_nonblocking.h>
 
 /*! name of the loopback interface */
 #define IF_LOOPBACK_NAME "lo"
@@ -50,8 +50,8 @@
 #include <linux/rtnetlink.h>
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_generic/os_interface_generic.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/os_generic/os_interface_generic.h>
+#include <oonf/base/os_interface.h>
 
 enum
 {
@@ -50,7 +50,7 @@
 #include <linux/rtnetlink.h>
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/os_interface.h>
 
 /**
  * define scope of address on interface
@@ -69,8 +69,8 @@ struct os_route_listener_internal {
   struct list_entity _node;
 };
 
-#include <oonf/subsystems/os_generic/os_routing_generic_init_half_route_key.h>
-#include <oonf/subsystems/os_generic/os_routing_generic_rt_to_string.h>
+#include <oonf/base/os_generic/os_routing_generic_init_half_route_key.h>
+#include <oonf/base/os_generic/os_routing_generic_rt_to_string.h>
 
 EXPORT bool os_routing_linux_supports_source_specific(int af_family);
 EXPORT int os_routing_linux_set(struct os_route *, bool set, bool del_similar);
@@ -51,8 +51,8 @@
 
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_socket.h>
+#include <oonf/base/oonf_timer.h>
 
 /*! default timeout for netlink messages */
 #define OS_SYSTEM_NETLINK_TIMEOUT 1000
@@ -47,7 +47,7 @@
 #define OS_TUNNEL_LINUX_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_tunnel.h>
+#include <oonf/base/os_tunnel.h>
 
 struct os_tunnel_internal {};
 
similarity index 98%
rename from include/oonf/subsystems/os_linux/os_vif_linux.h
rename to include/oonf/base/os_linux/os_vif_linux.h
index 6090d41..1f94106 100644 (file)
@@ -47,7 +47,7 @@
 #define OS_VIF_LINUX_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_vif.h>
+#include <oonf/base/os_vif.h>
 
 /**
  * Linux internal data for handling virtual interfaces (tun/tap)
similarity index 98%
rename from include/oonf/subsystems/os_routing.h
rename to include/oonf/base/os_routing.h
index 94fa528..7b34548 100644 (file)
@@ -53,8 +53,8 @@
 #include <oonf/libcommon/list.h>
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/os_interface.h>
-#include <oonf/subsystems/os_system.h>
+#include <oonf/base/os_interface.h>
+#include <oonf/base/os_system.h>
 
 /*! subsystem identifier */
 #define OONF_OS_ROUTING_SUBSYSTEM "os_routing"
@@ -162,7 +162,7 @@ struct os_route_parameter {
 
 /* include os-specific headers */
 #if defined(__linux__)
-#include <oonf/subsystems/os_linux/os_routing_linux.h>
+#include <oonf/base/os_linux/os_routing_linux.h>
 #else
 #error "Unknown operation system"
 #endif
similarity index 93%
rename from include/oonf/subsystems/os_system.h
rename to include/oonf/base/os_system.h
index feda34e..7104731 100644 (file)
 
 /* include os-specific headers */
 #if defined(__linux__)
-#include <oonf/subsystems/os_linux/os_system_linux.h>
+#include <oonf/base/os_linux/os_system_linux.h>
 #elif defined(BSD)
-#include <oonf/subsystems/os_bsd/os_system_bsd.h>
+#include <oonf/base/os_bsd/os_system_bsd.h>
 #elif defined(_WIN32)
-#include <oonf/subsystems/os_win32/os_system_win32.h>
+#include <oonf/base/os_win32/os_system_win32.h>
 #else
 #error "Unknown operation system"
 #endif
similarity index 98%
rename from include/oonf/subsystems/os_tunnel.h
rename to include/oonf/base/os_tunnel.h
index 5ff2afa..1aad34a 100644 (file)
@@ -57,7 +57,7 @@ struct os_tunnel;
 
 /* include os-specific headers */
 #if defined(__linux__)
-#include <oonf/subsystems/os_linux/os_tunnel_linux.h>
+#include <oonf/base/os_linux/os_tunnel_linux.h>
 #else
 #error "Unknown operation system"
 #endif
similarity index 97%
rename from include/oonf/subsystems/os_vif.h
rename to include/oonf/base/os_vif.h
index fb2ed9d..d98f49f 100644 (file)
@@ -49,7 +49,7 @@
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
 
-#include <oonf/subsystems/os_fd.h>
+#include <oonf/base/os_fd.h>
 
 /*! subsystem identifier */
 #define OONF_OS_VIF_SUBSYSTEM "os_vif"
@@ -58,7 +58,7 @@ struct os_vif;
 
 /* include os-specific headers */
 #if defined(__linux__)
-#include <oonf/subsystems/os_linux/os_vif_linux.h>
+#include <oonf/base/os_linux/os_vif_linux.h>
 #else
 #error "Unknown operation system"
 #endif
index 4869c82..517116e 100644 (file)
@@ -49,7 +49,7 @@
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
 #include <oonf/crypto/rfc7182_provider/rfc7182_provider.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_rfc5444.h>
 #include <oonf/librfc5444/rfc5444_writer.h>
 
 enum
index 45bb082..c7a6579 100644 (file)
@@ -52,7 +52,7 @@ struct dlep_extension;
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
 
-#include <oonf/subsystems/oonf_layer2.h>
+#include <oonf/base/oonf_layer2.h>
 
 #include <oonf/generic/dlep/dlep_session.h>
 
index 8ac0d20..3ac5e23 100644 (file)
@@ -49,7 +49,7 @@
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_packet_socket.h>
+#include <oonf/base/oonf_packet_socket.h>
 
 #define DLEP_IF_UDP_NONE_STR           "none"
 #define DLEP_IF_UDP_SINGLE_SESSION_STR "single_session"
index 193b995..193d770 100644 (file)
@@ -49,7 +49,7 @@
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
 
-#include <oonf/subsystems/oonf_layer2.h>
+#include <oonf/base/oonf_layer2.h>
 
 #include <oonf/generic/dlep/dlep_extension.h>
 
index c20118b..c704f25 100644 (file)
@@ -53,10 +53,10 @@ struct dlep_writer;
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_stream_socket.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/generic/dlep/dlep_extension.h>
 #include <oonf/generic/dlep/dlep_iana.h>
index b1ec95c..540ddcd 100644 (file)
@@ -50,7 +50,7 @@
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
 
-#include <oonf/subsystems/oonf_layer2.h>
+#include <oonf/base/oonf_layer2.h>
 
 #include <oonf/generic/dlep/dlep_session.h>
 
index 3eac9c9..732ccb0 100644 (file)
@@ -49,7 +49,7 @@
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
 
-#include <oonf/subsystems/oonf_layer2.h>
+#include <oonf/base/oonf_layer2.h>
 #include <oonf/generic/dlep/dlep_extension.h>
 #include <oonf/generic/dlep/dlep_session.h>
 
index 2fa8524..8d14c3a 100644 (file)
@@ -48,8 +48,8 @@
 
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
-#include <oonf/subsystems/oonf_packet_socket.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
+#include <oonf/base/oonf_packet_socket.h>
+#include <oonf/base/oonf_stream_socket.h>
 
 #include <oonf/generic/dlep/dlep_interface.h>
 #include <oonf/generic/dlep/dlep_session.h>
index 86c1d15..eaab1b0 100644 (file)
@@ -49,9 +49,9 @@
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_packet_socket.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_packet_socket.h>
+#include <oonf/base/oonf_stream_socket.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/dlep/dlep_session.h>
 #include <oonf/generic/dlep/radio/dlep_radio_session.h>
index 40c452d..c0a625b 100644 (file)
@@ -48,7 +48,7 @@
 
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/dlep/dlep_interface.h>
 #include <oonf/generic/dlep/dlep_session.h>
index 0abf471..b8e82be 100644 (file)
@@ -49,9 +49,9 @@
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_stream_socket.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/generic/dlep/router/dlep_router_interface.h>
 
index 7265060..10acf62 100644 (file)
@@ -48,8 +48,8 @@
 
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/os_interface.h>
 
 /*! subsystem identifier */
 #define OONF_NL80211_LISTENER_SUBSYSTEM "nl80211_listener"
index 444f754..98dbe93 100644 (file)
@@ -50,7 +50,7 @@
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 /*! subsystem identifier */
 #define OONF_NHDP_SUBSYSTEM "nhdp"
index bb871ac..e741cce 100644 (file)
@@ -55,8 +55,8 @@ struct nhdp_laddr;
 #include <oonf/oonf.h>
 #include <oonf/libcommon/list.h>
 #include <oonf/libcommon/netaddr.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_rfc5444.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 
index da67e7a..d27f3ce 100644 (file)
@@ -48,8 +48,8 @@
 
 #include <oonf/oonf.h>
 #include <oonf/libcommon/list.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/nhdp/nhdp_db.h>
 #include <oonf/nhdp/nhdp/nhdp_interfaces.h>
index aa49c9d..377dc3e 100644 (file)
@@ -47,7 +47,7 @@
 #define NHDP_HYSTERESIS_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/nhdp/nhdp_db.h>
 
index 601f38c..a79d6ff 100644 (file)
@@ -55,9 +55,9 @@ struct nhdp_interface_domaindata;
 #include <oonf/libcommon/list.h>
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcommon/netaddr_acl.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_rfc5444.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/nhdp/nhdp/nhdp_db.h>
 
index 2d955b6..b1f7f56 100644 (file)
@@ -47,7 +47,7 @@
 #define NHDP_INCOMING_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 void nhdp_reader_init(struct oonf_rfc5444_protocol *);
 void nhdp_reader_cleanup(void);
index 3733628..cb84226 100644 (file)
@@ -47,7 +47,7 @@
 #define NHDP_WRITER_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 int nhdp_writer_init(struct oonf_rfc5444_protocol *) __attribute__((warn_unused_result));
 void nhdp_writer_cleanup(void);
index dd23262..1522679 100644 (file)
@@ -52,7 +52,7 @@
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/olsrv2/olsrv2/olsrv2.h>
-#include <oonf/subsystems/os_routing.h>
+#include <oonf/base/os_routing.h>
 
 /**
  * per-domain data for locally attached networks
index b20f631..482382f 100644 (file)
@@ -49,7 +49,7 @@
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_timer.h>
 
 /**
  * Former originator address of the local node
index 1c6ff8e..f49c931 100644 (file)
@@ -47,7 +47,7 @@
 #define OLSRV2_READER_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 void olsrv2_reader_init(struct oonf_rfc5444_protocol *);
 void olsrv2_reader_cleanup(void);
index c8d999b..a1d80e0 100644 (file)
@@ -51,7 +51,7 @@
 #include <oonf/libcommon/list.h>
 #include <oonf/libcommon/netaddr.h>
 
-#include <oonf/subsystems/os_routing.h>
+#include <oonf/base/os_routing.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/nhdp/nhdp/nhdp_db.h>
index f5e1304..7333458 100644 (file)
@@ -50,7 +50,7 @@
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
 
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/nhdp/nhdp/nhdp_domain.h>
index 2e878df..e0e3361 100644 (file)
@@ -47,7 +47,7 @@
 #define OLSRV2_WRITER_H_
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 int olsrv2_writer_init(struct oonf_rfc5444_protocol *) __attribute__((warn_unused_result));
 void olsrv2_writer_cleanup(void);
index 13369fc..bb91f0b 100644 (file)
@@ -7,7 +7,7 @@ add_subdirectory(librfc5444)
 add_subdirectory(generic)
 add_subdirectory(nhdp)
 add_subdirectory(olsrv2)
-add_subdirectory(subsystems)
+add_subdirectory(base)
 
 if (NOT OONF_NO_TESTING)
     add_subdirectory(tests)
similarity index 99%
rename from src/subsystems/oonf_class.c
rename to src/base/oonf_class.c
index 2c4b89d..e4f63c4 100644 (file)
@@ -50,7 +50,7 @@
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
 
-#include <oonf/subsystems/oonf_class.h>
+#include <oonf/base/oonf_class.h>
 
 /* Definitions */
 #define LOG_CLASS (_oonf_class_subsystem.logging)
similarity index 98%
rename from src/subsystems/oonf_clock.c
rename to src/base/oonf_clock.c
index d9c814d..5780b11 100644 (file)
@@ -56,9 +56,9 @@
 
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/os_clock.h>
+#include <oonf/base/os_clock.h>
 
-#include <oonf/subsystems/oonf_clock.h>
+#include <oonf/base/oonf_clock.h>
 
 /* definitions */
 #define LOG_CLOCK _oonf_clock_subsystem.logging
similarity index 98%
rename from src/subsystems/oonf_duplicate_set.c
rename to src/base/oonf_duplicate_set.c
index 9d69cd7..48c061d 100644 (file)
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcore/oonf_subsystem.h>
 #include <oonf/librfc5444/rfc5444.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_timer.h>
 
-#include <oonf/subsystems/oonf_duplicate_set.h>
+#include <oonf/base/oonf_duplicate_set.h>
 
 /* Definitions */
 #define LOG_DUPLICATE_SET _oonf_duplicate_set_subsystem.logging
similarity index 99%
rename from src/subsystems/oonf_http.c
rename to src/base/oonf_http.c
index 2d5e2b5..7649143 100644 (file)
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
 #include <oonf/libcore/os_core.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
-#include <oonf/subsystems/oonf_telnet.h>
+#include <oonf/base/oonf_stream_socket.h>
+#include <oonf/base/oonf_telnet.h>
 
-#include <oonf/subsystems/oonf_http.h>
+#include <oonf/base/oonf_http.h>
 
 #ifndef O_DIRECTORY
 /* uClibc does not define it */
similarity index 99%
rename from src/subsystems/oonf_layer2.c
rename to src/base/oonf_layer2.c
index c3ba01e..f4903b8 100644 (file)
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/os_interface.h>
 
-#include <oonf/subsystems/oonf_layer2.h>
+#include <oonf/base/oonf_layer2.h>
 
 /* Definitions */
 #define LOG_LAYER2 _oonf_layer2_subsystem.logging
similarity index 99%
rename from src/subsystems/oonf_packet_socket.c
rename to src/base/oonf_packet_socket.c
index 4bc5184..32c5974 100644 (file)
 #include <oonf/libcommon/netaddr_acl.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_packet_socket.h>
-#include <oonf/subsystems/oonf_socket.h>
-#include <oonf/subsystems/os_fd.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_packet_socket.h>
+#include <oonf/base/oonf_socket.h>
+#include <oonf/base/os_fd.h>
+#include <oonf/base/os_interface.h>
 
 /* Defintions */
 #define LOG_PACKET _oonf_packet_socket_subsystem.logging
similarity index 99%
rename from src/subsystems/oonf_rfc5444.c
rename to src/base/oonf_rfc5444.c
index ee0993b..842b087 100644 (file)
 #include <oonf/librfc5444/rfc5444_print.h>
 #include <oonf/librfc5444/rfc5444_reader.h>
 #include <oonf/librfc5444/rfc5444_writer.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_duplicate_set.h>
-#include <oonf/subsystems/oonf_packet_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_duplicate_set.h>
+#include <oonf/base/oonf_packet_socket.h>
+#include <oonf/base/oonf_timer.h>
 
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 /* constants and definitions */
 #define LOG_RFC5444 _oonf_rfc5444_subsystem.logging
similarity index 97%
rename from src/subsystems/oonf_socket.c
rename to src/base/oonf_socket.c
index c97f3b8..b4da0a4 100644 (file)
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_main.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_clock.h>
-#include <oonf/subsystems/oonf_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_clock.h>
-#include <oonf/subsystems/os_fd.h>
+#include <oonf/base/oonf_clock.h>
+#include <oonf/base/oonf_socket.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_clock.h>
+#include <oonf/base/os_fd.h>
 
 /* Definitions */
 #define LOG_SOCKET _oonf_socket_subsystem.logging
similarity index 99%
rename from src/subsystems/oonf_stream_socket.c
rename to src/base/oonf_stream_socket.c
index fc45eda..b2e09e7 100644 (file)
 #include <oonf/libcommon/list.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_fd.h>
-#include <oonf/subsystems/os_interface.h>
-#include <oonf/subsystems/os_system.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_stream_socket.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_fd.h>
+#include <oonf/base/os_interface.h>
+#include <oonf/base/os_system.h>
 
 /* Definitions */
 #define LOG_STREAM _oonf_stream_socket_subsystem.logging
similarity index 99%
rename from src/subsystems/oonf_telnet.c
rename to src/base/oonf_telnet.c
index dad27d6..cfa2eb6 100644 (file)
 
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_stream_socket.h>
+#include <oonf/base/oonf_timer.h>
 
-#include <oonf/subsystems/oonf_telnet.h>
+#include <oonf/base/oonf_telnet.h>
 
 /* Definitions */
 #define LOG_TELNET _oonf_telnet_subsystem.logging
similarity index 98%
rename from src/subsystems/oonf_timer.c
rename to src/base/oonf_timer.c
index 0317c3a..e98af75 100644 (file)
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
 #include <oonf/libcore/os_core.h>
-#include <oonf/subsystems/oonf_clock.h>
-#include <oonf/subsystems/os_clock.h>
+#include <oonf/base/oonf_clock.h>
+#include <oonf/base/os_clock.h>
 
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_timer.h>
 
 /* Definitions */
 #define LOG_TIMER _oonf_timer_subsystem.logging
similarity index 99%
rename from src/subsystems/oonf_viewer.c
rename to src/base/oonf_viewer.c
index aa052af..d191747 100644 (file)
  * @file
  */
 
-#include <oonf/subsystems/oonf_viewer.h>
+#include <oonf/base/oonf_viewer.h>
 #include <oonf/libcommon/autobuf.h>
 #include <oonf/oonf.h>
 #include <oonf/libcommon/json.h>
 #include <oonf/libcommon/template.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_telnet.h> /* compile-time dependency */
+#include <oonf/base/oonf_telnet.h> /* compile-time dependency */
 
 /* Definitions */
 #define LOG_VIEWER _oonf_viewer_subsystem.logging
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcommon/string.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/os_interface.h>
 
-#include <oonf/subsystems/os_fd.h>
-#include <oonf/subsystems/os_generic/os_fd_generic_configsocket.h>
+#include <oonf/base/os_fd.h>
+#include <oonf/base/os_generic/os_fd_generic_configsocket.h>
 
 /**
  * Configure a network socket
@@ -50,9 +50,9 @@
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcore/oonf_logging.h>
 
-#include <oonf/subsystems/os_fd.h>
-#include <oonf/subsystems/os_generic/os_fd_generic_getrawsocket.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/os_fd.h>
+#include <oonf/base/os_generic/os_fd_generic_getrawsocket.h>
+#include <oonf/base/os_interface.h>
 
 /**
  * Creates a new raw socket and configures it
@@ -50,8 +50,8 @@
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcore/oonf_logging.h>
 
-#include <oonf/subsystems/os_fd.h>
-#include <oonf/subsystems/os_generic/os_fd_generic_getsocket.h>
+#include <oonf/base/os_fd.h>
+#include <oonf/base/os_generic/os_fd_generic_getsocket.h>
 
 /**
  * Creates a new socket and configures it
@@ -50,9 +50,9 @@
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcommon/string.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/os_interface.h>
 
-#include <oonf/subsystems/os_fd.h>
+#include <oonf/base/os_fd.h>
 
 /**
  * Join a socket into a multicast group
@@ -49,8 +49,8 @@
 #include <sys/socket.h>
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_fd.h>
-#include <oonf/subsystems/os_generic/os_fd_generic_set_dscp.h>
+#include <oonf/base/os_fd.h>
+#include <oonf/base/os_generic/os_fd_generic_set_dscp.h>
 
 /**
  * Sets the DSCP value for outgoing packets on a socket
@@ -46,9 +46,9 @@
 #include <fcntl.h>
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_fd.h>
+#include <oonf/base/os_fd.h>
 
-#include <oonf/subsystems/os_generic/os_fd_generic_set_nonblocking.h>
+#include <oonf/base/os_generic/os_fd_generic_set_nonblocking.h>
 
 /**
  * Set a socket to non-blocking mode
@@ -7,7 +7,7 @@
 
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/os_interface.h>
 
 static const struct netaddr *_get_fixed_prefix(int af_type, struct netaddr_acl *filter);
 static const struct netaddr *_get_exact_match_bindaddress(
@@ -46,7 +46,7 @@
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
 
-#include <oonf/subsystems/os_routing.h>
+#include <oonf/base/os_routing.h>
 
 /**
  * Copy one address to 'specific', fill the other one with the
@@ -44,7 +44,7 @@
  */
 
 #include <oonf/libcommon/netaddr.h>
-#include <oonf/subsystems/os_routing.h>
+#include <oonf/base/os_routing.h>
 
 static const char *_route_types[] = {
   [OS_ROUTE_UNDEFINED] = "undefined",
@@ -45,7 +45,7 @@
 
 #include <oonf/oonf.h>
 
-#include <oonf/subsystems/os_routing.h>
+#include <oonf/base/os_routing.h>
 
 /**
  * avl comparator for routing key
similarity index 99%
rename from src/subsystems/os_linux/os_clock_linux.c
rename to src/base/os_linux/os_clock_linux.c
index 9e614d1..fdb2b0d 100644 (file)
@@ -47,7 +47,7 @@
 
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/os_clock.h>
+#include <oonf/base/os_clock.h>
 
 /* prototypes */
 static int _init(void);
similarity index 98%
rename from src/subsystems/os_linux/os_fd_linux.c
rename to src/base/os_linux/os_fd_linux.c
index d0b1278..fc8fec0 100644 (file)
@@ -51,9 +51,9 @@
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_clock.h>
+#include <oonf/base/oonf_clock.h>
 
-#include <oonf/subsystems/os_fd.h>
+#include <oonf/base/os_fd.h>
 
 /* Defintions */
 #define LOG_OS_SOCKET _oonf_os_fd_subsystem.logging
similarity index 99%
rename from src/subsystems/os_linux/os_interface_linux.c
rename to src/base/os_linux/os_interface_linux.c
index 2a6219f..5cf6a93 100644 (file)
 #include <oonf/libcore/oonf_cfg.h>
 #include <oonf/libcore/oonf_main.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_system.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_system.h>
 
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/os_interface.h>
 
 /* Definitions */
 #define LOG_OS_INTERFACE _oonf_os_interface_subsystem.logging
similarity index 99%
rename from src/subsystems/os_linux/os_routing_linux.c
rename to src/base/os_linux/os_routing_linux.c
index 234e816..10dbe35 100644 (file)
 #include <oonf/libcommon/avl_comp.h>
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/os_system.h>
+#include <oonf/base/os_system.h>
 
-#include <oonf/subsystems/os_linux/os_routing_linux.h>
-#include <oonf/subsystems/os_routing.h>
+#include <oonf/base/os_linux/os_routing_linux.h>
+#include <oonf/base/os_routing.h>
 
 /* Definitions */
 #define LOG_OS_ROUTING _oonf_os_routing_subsystem.logging
similarity index 99%
rename from src/subsystems/os_linux/os_system_linux.c
rename to src/base/os_linux/os_system_linux.c
index bb3f77b..693b2d2 100644 (file)
 #include <oonf/oonf.h>
 #include <oonf/libcommon/string.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_socket.h>
+#include <oonf/base/oonf_socket.h>
 
-#include <oonf/subsystems/os_linux/os_system_linux.h>
-#include <oonf/subsystems/os_system.h>
+#include <oonf/base/os_linux/os_system_linux.h>
+#include <oonf/base/os_system.h>
 
 #include <stdio.h>
 
similarity index 99%
rename from src/subsystems/os_linux/os_tunnel_linux.c
rename to src/base/os_linux/os_tunnel_linux.c
index fbb2957..d400741 100644 (file)
@@ -62,8 +62,8 @@
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/os_system.h>
-#include <oonf/subsystems/os_tunnel.h>
+#include <oonf/base/os_system.h>
+#include <oonf/base/os_tunnel.h>
 
 /* Definitions */
 #define LOG_OS_TUNNEL _oonf_os_tunnel_subsystem.logging
similarity index 99%
rename from src/subsystems/os_linux/os_vif_linux.c
rename to src/base/os_linux/os_vif_linux.c
index 8d8387c..d34713f 100644 (file)
@@ -55,7 +55,7 @@
 #include <oonf/libcommon/avl_comp.h>
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/os_vif.h>
+#include <oonf/base/os_vif.h>
 
 /* Definitions */
 #define LOG_OS_VIF _oonf_os_vif_subsystem.logging
index f7968ba..93de499 100644 (file)
@@ -48,8 +48,8 @@
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_subsystem.h>
 #include <oonf/crypto/rfc7182_provider/rfc7182_provider.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
 #include <oonf/librfc5444/rfc5444_reader.h>
 #include <oonf/librfc5444/rfc5444_writer.h>
 
index 3a26675..ce67f16 100644 (file)
@@ -47,7 +47,7 @@
 #include <oonf/libcommon/avl_comp.h>
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
+#include <oonf/base/oonf_class.h>
 #include <oonf/librfc5444/rfc5444_iana.h>
 
 #include <oonf/crypto/rfc7182_provider/rfc7182_provider.h>
index 18232c4..e21823c 100644 (file)
@@ -50,8 +50,8 @@
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_subsystem.h>
 #include <oonf/crypto/rfc5444_signature/rfc5444_signature.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
 #include <oonf/librfc5444/rfc5444_iana.h>
 
 #include <oonf/crypto/sharedkey_sig/sharedkey_sig.h>
index ceed0b6..fe9a398 100644 (file)
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_subsystem.h>
 #include <oonf/crypto/rfc5444_signature/rfc5444_signature.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/crypto/simple_security/simple_security.h>
 
index d7e4df0..3dde639 100644 (file)
@@ -49,7 +49,7 @@
 #include <oonf/libcommon/avl_comp.h>
 #include <oonf/oonf.h>
 
-#include <oonf/subsystems/oonf_layer2.h>
+#include <oonf/base/oonf_layer2.h>
 
 #include <oonf/generic/dlep/dlep_extension.h>
 #include <oonf/generic/dlep/dlep_reader.h>
index f83e439..ac27eac 100644 (file)
@@ -46,7 +46,7 @@
 #include <oonf/libcommon/avl.h>
 #include <oonf/libcommon/avl_comp.h>
 #include <oonf/oonf.h>
-#include <oonf/subsystems/oonf_packet_socket.h>
+#include <oonf/base/oonf_packet_socket.h>
 
 #include <oonf/generic/dlep/dlep_extension.h>
 #include <oonf/generic/dlep/dlep_iana.h>
index 983abfd..fa1adff 100644 (file)
@@ -47,9 +47,9 @@
 #include <oonf/libcommon/avl_comp.h>
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_stream_socket.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/dlep/dlep_extension.h>
 #include <oonf/generic/dlep/dlep_session.h>
index 2613f7e..f3ea6ff 100644 (file)
@@ -46,8 +46,8 @@
 #include <oonf/libcommon/autobuf.h>
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/dlep/dlep_extension.h>
 #include <oonf/generic/dlep/dlep_iana.h>
index 9b787e1..9c3a335 100644 (file)
@@ -46,7 +46,7 @@
 #include <oonf/libcommon/autobuf.h>
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/dlep/dlep_extension.h>
 #include <oonf/generic/dlep/dlep_iana.h>
index ee1bdb6..408b182 100644 (file)
@@ -46,7 +46,7 @@
 #include <oonf/libcommon/autobuf.h>
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/dlep/dlep_extension.h>
 #include <oonf/generic/dlep/dlep_iana.h>
index 4f6f09d..6a83a1d 100644 (file)
@@ -48,8 +48,8 @@
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_logging.h>
 
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_layer2.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_layer2.h>
 
 #include <oonf/generic/dlep/dlep_extension.h>
 #include <oonf/generic/dlep/dlep_iana.h>
index 1555431..dcc82dc 100644 (file)
@@ -46,7 +46,7 @@
 #include <oonf/libcommon/autobuf.h>
 #include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/dlep/dlep_extension.h>
 #include <oonf/generic/dlep/dlep_iana.h>
index 76b13a7..346b1f7 100644 (file)
 
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_packet_socket.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_packet_socket.h>
+#include <oonf/base/oonf_stream_socket.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/dlep/dlep_iana.h>
 #include <oonf/generic/dlep/dlep_writer.h>
index 23ed127..490cb0a 100644 (file)
 #include <oonf/libcommon/avl_comp.h>
 #include <oonf/libcommon/netaddr.h>
 
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_packet_socket.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_packet_socket.h>
+#include <oonf/base/oonf_stream_socket.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/dlep/dlep_extension.h>
 #include <oonf/generic/dlep/dlep_iana.h>
index 07f6441..5199b03 100644 (file)
 #include <oonf/libcommon/avl_comp.h>
 #include <oonf/libcommon/netaddr.h>
 
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_packet_socket.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_packet_socket.h>
+#include <oonf/base/oonf_stream_socket.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/dlep/dlep_iana.h>
 #include <oonf/generic/dlep/dlep_session.h>
index a751fd1..e6c854e 100644 (file)
 
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_packet_socket.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_packet_socket.h>
+#include <oonf/base/oonf_stream_socket.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/dlep/dlep_iana.h>
 #include <oonf/generic/dlep/dlep_session.h>
index 301152d..7f62fd4 100644 (file)
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
 
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_packet_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_packet_socket.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/generic/dlep/dlep_extension.h>
 #include <oonf/generic/dlep/dlep_iana.h>
index 51a60c7..e51a2c5 100644 (file)
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
 
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_stream_socket.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_stream_socket.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/dlep/dlep_iana.h>
 #include <oonf/generic/dlep/dlep_session.h>
index ecc92e1..6348960 100644 (file)
 #include <oonf/oonf.h>
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_clock.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_clock.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/generic/eth_listener/eth_listener.h>
 #include <oonf/generic/eth_listener/ethtool-copy.h>
index b436605..a4e2d2f 100644 (file)
@@ -46,7 +46,7 @@
 #include <oonf/oonf.h>
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/example/example.h>
 
index 8ec8a8e..46b3fa0 100644 (file)
@@ -51,9 +51,9 @@
 #include <oonf/libconfig/cfg_validate.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/layer2_config/layer2_config.h>
 
index 4c249a5..9897866 100644 (file)
@@ -54,9 +54,9 @@
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_clock.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_clock.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/generic/layer2_generator/layer2_generator.h>
 
index 44ffcca..19e7f17 100644 (file)
 
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_clock.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_telnet.h>
-#include <oonf/subsystems/oonf_viewer.h>
+#include <oonf/base/oonf_clock.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_telnet.h>
+#include <oonf/base/oonf_viewer.h>
 
 #include <oonf/generic/layer2info/layer2info.h>
 
index da77ba7..068bf38 100644 (file)
 #include <oonf/libconfig/cfg_validate.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/generic/link_config/link_config.h>
 
index 0d2891a..dba1bdc 100644 (file)
@@ -79,7 +79,7 @@
 #include <netlink/msg.h>
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_system.h>
+#include <oonf/base/os_system.h>
 
 #include <oonf/generic/nl80211_listener/nl80211.h>
 #include <oonf/generic/nl80211_listener/genl_get_family.h>
index 0f2b1a3..b3c1c82 100644 (file)
@@ -79,7 +79,7 @@
 #include <netlink/msg.h>
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_system.h>
+#include <oonf/base/os_system.h>
 
 #include <oonf/generic/nl80211_listener/nl80211.h>
 #include <oonf/generic/nl80211_listener/nl80211_get_interface.h>
index 341862b..f828d67 100644 (file)
@@ -79,7 +79,7 @@
 #include <netlink/msg.h>
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_system.h>
+#include <oonf/base/os_system.h>
 
 #include <oonf/generic/nl80211_listener/nl80211.h>
 #include <oonf/generic/nl80211_listener/nl80211_get_mpp.h>
index ddccfeb..16b62f4 100644 (file)
@@ -79,8 +79,8 @@
 #include <netlink/msg.h>
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/oonf_clock.h>
-#include <oonf/subsystems/os_system.h>
+#include <oonf/base/oonf_clock.h>
+#include <oonf/base/os_system.h>
 
 #include <oonf/generic/nl80211_listener/nl80211.h>
 #include <oonf/generic/nl80211_listener/nl80211_get_station_dump.h>
index bcf48a0..6b4369a 100644 (file)
@@ -79,7 +79,7 @@
 #include <netlink/msg.h>
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_system.h>
+#include <oonf/base/os_system.h>
 
 #include <oonf/generic/nl80211_listener/nl80211.h>
 #include <oonf/generic/nl80211_listener/nl80211_get_survey.h>
index 32d6437..3b64b6d 100644 (file)
@@ -79,7 +79,7 @@
 #include <netlink/msg.h>
 
 #include <oonf/oonf.h>
-#include <oonf/subsystems/os_system.h>
+#include <oonf/base/os_system.h>
 
 #include <oonf/generic/nl80211_listener/nl80211.h>
 #include <oonf/generic/nl80211_listener/nl80211_get_wiphy.h>
index f4217ed..bc62de2 100644 (file)
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
-#include <oonf/subsystems/os_system.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
+#include <oonf/base/os_system.h>
 
 #include <oonf/generic/nl80211_listener/genl_get_family.h>
 #include <oonf/generic/nl80211_listener/nl80211_get_interface.h>
index 03d87a3..6fa1f27 100644 (file)
@@ -51,7 +51,7 @@
 #include <oonf/libcore/oonf_cfg.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_telnet.h>
+#include <oonf/base/oonf_telnet.h>
 
 #include <oonf/generic/plugin_controller/plugin_controller.h>
 
index edfc272..eb64437 100644 (file)
 #include <oonf/libcore/oonf_cfg.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_telnet.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_routing.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_telnet.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_routing.h>
 
 #include <oonf/generic/remotecontrol/remotecontrol.h>
 
index e83337d..e8076c8 100644 (file)
 
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_clock.h>
-#include <oonf/subsystems/oonf_telnet.h>
-#include <oonf/subsystems/oonf_viewer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_clock.h>
+#include <oonf/base/oonf_telnet.h>
+#include <oonf/base/oonf_viewer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/generic/systeminfo/systeminfo.h>
 
index 398588b..75995c6 100644 (file)
@@ -54,9 +54,9 @@
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
 #include <oonf/libcore/os_core.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/nhdp/nhdp/nhdp_domain.h>
index 70afb74..eb1f3c5 100644 (file)
 #include <oonf/libcore/oonf_cfg.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/nhdp/nhdp/nhdp_domain.h>
index 2f8ce55..84e1657 100644 (file)
 #include <oonf/libcore/oonf_cfg.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_rfc5444.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/nhdp/nhdp/nhdp_domain.h>
index 52bd628..013dd8c 100644 (file)
@@ -50,9 +50,9 @@
 #include <oonf/libcore/oonf_cfg.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/nhdp/nhdp/nhdp_hysteresis.h>
 #include <oonf/nhdp/nhdp/nhdp_interfaces.h>
index 792ea0e..4546aca 100644 (file)
@@ -54,8 +54,8 @@
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/nhdp/nhdp/nhdp_db.h>
index 96fd41b..8cd6563 100644 (file)
@@ -55,8 +55,8 @@
 #include <oonf/libcommon/container_of.h>
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/mpr/mpr.h>
 #include <oonf/nhdp/mpr/mpr_internal.h>
index 9a9d584..3e63276 100644 (file)
@@ -55,8 +55,8 @@
 #include <oonf/libcommon/container_of.h>
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/mpr/mpr.h>
 #include <oonf/nhdp/mpr/mpr_internal.h>
index c72fa18..c4b6169 100644 (file)
@@ -57,8 +57,8 @@
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_cfg.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/mpr/mpr.h>
 #include <oonf/nhdp/mpr/mpr_internal.h>
index cc1e4b3..dedf4eb 100644 (file)
@@ -55,8 +55,8 @@
 #include <oonf/libcommon/container_of.h>
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/mpr/mpr.h>
 #include <oonf/nhdp/mpr/mpr_internal.h>
index 4821a32..a43d812 100644 (file)
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_clock.h>
-#include <oonf/subsystems/oonf_layer2.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_clock.h>
+#include <oonf/base/oonf_layer2.h>
+#include <oonf/base/oonf_rfc5444.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/nhdp/nhdp/nhdp_db.h>
 #include <oonf/nhdp/nhdp/nhdp_interfaces.h>
index ee14dfd..4f13ab5 100644 (file)
@@ -53,9 +53,9 @@
 #include <oonf/nhdp/nhdp/nhdp_interfaces.h>
 #include <oonf/nhdp/nhdp/nhdp_reader.h>
 #include <oonf/nhdp/nhdp/nhdp_writer.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
+#include <oonf/base/os_interface.h>
 
 /* definitions */
 
index 741eae5..d0343dd 100644 (file)
@@ -50,8 +50,8 @@
 #include <oonf/libcommon/netaddr.h>
 
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/nhdp/nhdp/nhdp_db.h>
 #include <oonf/nhdp/nhdp/nhdp_domain.h>
index 688970d..3cc3e12 100644 (file)
@@ -52,8 +52,8 @@
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcore/oonf_cfg.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/nhdp/nhdp/nhdp_db.h>
index d824f3c..80699cc 100644 (file)
@@ -45,7 +45,7 @@
 
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/nhdp/nhdp_db.h>
 #include <oonf/nhdp/nhdp/nhdp_hysteresis.h>
index 1eba703..cb59fcc 100644 (file)
 #include <oonf/libcommon/netaddr_acl.h>
 #include <oonf/libcore/oonf_cfg.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/nhdp/nhdp/nhdp_db.h>
index 6451702..ad91803 100644 (file)
@@ -47,7 +47,7 @@
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/nhdp/nhdp/nhdp_db.h>
index 7141dfd..a72bf4e 100644 (file)
@@ -47,7 +47,7 @@
 #include <oonf/libcommon/avl_comp.h>
 #include <oonf/oonf.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/nhdp/nhdp/nhdp_domain.h>
index 198404b..fc04288 100644 (file)
@@ -48,7 +48,7 @@
 
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/nhdp/nhdp_interfaces.h>
 
index 15892cc..b2aff36 100644 (file)
@@ -49,9 +49,9 @@
 
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_clock.h>
-#include <oonf/subsystems/oonf_telnet.h>
-#include <oonf/subsystems/oonf_viewer.h>
+#include <oonf/base/oonf_clock.h>
+#include <oonf/base/oonf_telnet.h>
+#include <oonf/base/oonf_viewer.h>
 
 #include <oonf/nhdp/nhdp/nhdp_db.h>
 #include <oonf/nhdp/nhdp/nhdp_domain.h>
index d0e05d7..3cba5c7 100644 (file)
@@ -53,9 +53,9 @@
 
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_clock.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_clock.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/olsrv2/olsrv2/olsrv2.h>
 #include <oonf/olsrv2/olsrv2/olsrv2_lan.h>
index 38987e1..5b8a4f5 100644 (file)
@@ -49,8 +49,8 @@
 
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_clock.h>
-#include <oonf/subsystems/oonf_telnet.h>
+#include <oonf/base/oonf_clock.h>
+#include <oonf/base/oonf_telnet.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/nhdp/nhdp/nhdp_db.h>
index 6abe479..c041d0f 100644 (file)
 #include <oonf/libconfig/cfg_schema.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
-#include <oonf/subsystems/oonf_telnet.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_rfc5444.h>
+#include <oonf/base/oonf_telnet.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/nhdp/nhdp/nhdp_interfaces.h>
 
index 43cd32d..b810187 100644 (file)
@@ -49,8 +49,8 @@
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/olsrv2/olsrv2/olsrv2.h>
index 7570a12..9c3dfff 100644 (file)
@@ -49,9 +49,9 @@
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcommon/netaddr_acl.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_interface.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_interface.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 
index 2f3791b..73498e2 100644 (file)
@@ -48,8 +48,8 @@
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_duplicate_set.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_duplicate_set.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/nhdp/nhdp_domain.h>
 
index f9fa313..adecc17 100644 (file)
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/os_core.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
-#include <oonf/subsystems/oonf_timer.h>
-#include <oonf/subsystems/os_routing.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
+#include <oonf/base/oonf_timer.h>
+#include <oonf/base/os_routing.h>
 
 #include <oonf/nhdp/nhdp/nhdp_db.h>
 #include <oonf/nhdp/nhdp/nhdp_domain.h>
index 656cbbd..efa548a 100644 (file)
@@ -47,9 +47,9 @@
 #include <oonf/libcommon/avl_comp.h>
 #include <oonf/oonf.h>
 #include <oonf/libcommon/netaddr.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
-#include <oonf/subsystems/oonf_timer.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
+#include <oonf/base/oonf_timer.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/nhdp/nhdp/nhdp_domain.h>
index f0dd64e..76d42f7 100644 (file)
@@ -48,8 +48,8 @@
 #include <oonf/libcommon/list.h>
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcore/oonf_logging.h>
-#include <oonf/subsystems/oonf_class.h>
-#include <oonf/subsystems/oonf_rfc5444.h>
+#include <oonf/base/oonf_class.h>
+#include <oonf/base/oonf_rfc5444.h>
 
 #include <oonf/nhdp/nhdp/nhdp_db.h>
 #include <oonf/nhdp/nhdp/nhdp_domain.h>
index 0dc08a9..50801ca 100644 (file)
@@ -49,9 +49,9 @@
 
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_clock.h>
-#include <oonf/subsystems/oonf_telnet.h>
-#include <oonf/subsystems/oonf_viewer.h>
+#include <oonf/base/oonf_clock.h>
+#include <oonf/base/oonf_telnet.h>
+#include <oonf/base/oonf_viewer.h>
 
 #include <oonf/nhdp/nhdp/nhdp.h>
 #include <oonf/nhdp/nhdp/nhdp_domain.h>
index a0ed7df..bcac1f8 100644 (file)
@@ -53,7 +53,7 @@
 
 #include <oonf/libcore/oonf_logging.h>
 #include <oonf/libcore/oonf_subsystem.h>
-#include <oonf/subsystems/oonf_class.h>
+#include <oonf/base/oonf_class.h>
 
 #include <oonf/olsrv2/olsrv2/olsrv2.h>
 #include <oonf/olsrv2/olsrv2/olsrv2_routing.h>