Cleanup and simplify OONF directory strucure
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 9 May 2018 12:16:34 +0000 (14:16 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 9 May 2018 12:16:34 +0000 (14:16 +0200)
Centralize global variables and include directories
Move app description to apps directory
Move includes into a new subdirectory
Move common_types.h into base include directory and rename it to oonf.h
Unify source into /src and rename src-api subdirectories into lib{common|config|core}
Clean up includes of OONF codebase and move testing code to src
Remove unnecessary include directories
Move RFC5444 parser/generator into base-library
Adapt generation of debian files to new directory structure

458 files changed:
CMakeLists.txt
CMakeListsGlobal.cmake [new file with mode: 0644]
apps/CMakeLists.txt [new file with mode: 0644]
apps/dlep-radio/CMakeLists.txt [moved from src/dlep-radio/CMakeLists.txt with 100% similarity]
apps/dlep-router/CMakeLists.txt [moved from src/dlep-router/CMakeLists.txt with 100% similarity]
apps/olsrd2-dlep/CMakeLists.txt [moved from src/olsrd2-dlep/CMakeLists.txt with 100% similarity]
apps/olsrd2/CMakeLists.txt [moved from src/olsrd2/CMakeLists.txt with 100% similarity]
apps/olsrd2/debian/changelog [moved from src/olsrd2/debian/changelog with 100% similarity]
apps/olsrd2/debian/compat [moved from src/olsrd2/debian/compat with 100% similarity]
apps/olsrd2/debian/control [moved from src/olsrd2/debian/control with 100% similarity]
apps/olsrd2/debian/docs/olsrd2_static.1 [moved from src/olsrd2/debian/docs/olsrd2_static.1 with 100% similarity]
apps/olsrd2/debian/olsrd2.conf [moved from src/olsrd2/debian/olsrd2.conf with 100% similarity]
apps/olsrd2/debian/olsrd2.dirs [moved from src/olsrd2/debian/olsrd2.dirs with 100% similarity]
apps/olsrd2/debian/olsrd2.init [moved from src/olsrd2/debian/olsrd2.init with 100% similarity]
apps/olsrd2/debian/olsrd2.manpages [moved from src/olsrd2/debian/olsrd2.manpages with 100% similarity]
apps/olsrd2/debian/olsrd2.service [moved from src/olsrd2/debian/olsrd2.service with 100% similarity]
apps/olsrd2/debian/rules [moved from src/olsrd2/debian/rules with 100% similarity]
apps/olsrd2/debian/source/format [moved from src/olsrd2/debian/source/format with 100% similarity]
apps/oonf/CMakeLists.txt [moved from src/oonf/CMakeLists.txt with 100% similarity]
apps/oonf/OONF_APP_README [moved from src/oonf/OONF_APP_README with 100% similarity]
cmake/declare_library.cmake
cmake/link_app.cmake
files/create_debian_package.sh
include/oonf/crypto/hash_polarssl/hash_polarssl.h [moved from src-plugins/crypto/hash_polarssl/hash_polarssl.h with 98% similarity]
include/oonf/crypto/hash_tomcrypt/hash_tomcrypt.h [moved from src-plugins/crypto/hash_tomcrypt/hash_tomcrypt.h with 98% similarity]
include/oonf/crypto/rfc5444_signature/rfc5444_signature.h [moved from src-plugins/crypto/rfc5444_signature/rfc5444_signature.h with 96% similarity]
include/oonf/crypto/rfc7182_provider/rfc7182_provider.h [moved from src-plugins/crypto/rfc7182_provider/rfc7182_provider.h with 99% similarity]
include/oonf/crypto/sharedkey_sig/sharedkey_sig.h [moved from src-plugins/crypto/sharedkey_sig/sharedkey_sig.h with 100% similarity]
include/oonf/crypto/simple_security/simple_security.h [moved from src-plugins/crypto/simple_security/simple_security.h with 100% similarity]
include/oonf/cunit/cunit.h [moved from tests/cunit/cunit.h with 98% similarity]
include/oonf/generic/cfg_compact/cfg_compact.h [moved from src-plugins/generic/cfg_compact/cfg_compact.h with 100% similarity]
include/oonf/generic/cfg_uciloader/cfg_uciloader.h [moved from src-plugins/generic/cfg_uciloader/cfg_uciloader.h with 100% similarity]
include/oonf/generic/dlep/dlep_extension.h [moved from src-plugins/generic/dlep/dlep_extension.h with 98% similarity]
include/oonf/generic/dlep/dlep_iana.h [moved from src-plugins/generic/dlep/dlep_iana.h with 100% similarity]
include/oonf/generic/dlep/dlep_interface.h [moved from src-plugins/generic/dlep/dlep_interface.h with 96% similarity]
include/oonf/generic/dlep/dlep_reader.h [moved from src-plugins/generic/dlep/dlep_reader.h with 96% similarity]
include/oonf/generic/dlep/dlep_session.h [moved from src-plugins/generic/dlep/dlep_session.h with 97% similarity]
include/oonf/generic/dlep/dlep_writer.h [moved from src-plugins/generic/dlep/dlep_writer.h with 95% similarity]
include/oonf/generic/dlep/ext_base_ip/ip.h [moved from src-plugins/generic/dlep/ext_base_ip/ip.h with 93% similarity]
include/oonf/generic/dlep/ext_base_metric/metric.h [moved from src-plugins/generic/dlep/ext_base_metric/metric.h with 93% similarity]
include/oonf/generic/dlep/ext_base_proto/proto.h [moved from src-plugins/generic/dlep/ext_base_proto/proto.h with 93% similarity]
include/oonf/generic/dlep/ext_base_proto/proto_radio.h [moved from src-plugins/generic/dlep/ext_base_proto/proto_radio.h with 100% similarity]
include/oonf/generic/dlep/ext_base_proto/proto_router.h [moved from src-plugins/generic/dlep/ext_base_proto/proto_router.h with 98% similarity]
include/oonf/generic/dlep/ext_l1_statistics/l1_statistics.h [moved from src-plugins/generic/dlep/ext_l1_statistics/l1_statistics.h with 96% similarity]
include/oonf/generic/dlep/ext_l2_statistics/l2_statistics.h [moved from src-plugins/generic/dlep/ext_l2_statistics/l2_statistics.h with 96% similarity]
include/oonf/generic/dlep/ext_lid/lid.h [moved from src-plugins/generic/dlep/ext_lid/lid.h with 96% similarity]
include/oonf/generic/dlep/ext_radio_attributes/radio_attributes.h [moved from src-plugins/generic/dlep/ext_radio_attributes/radio_attributes.h with 96% similarity]
include/oonf/generic/dlep/radio/dlep_radio.h [moved from src-plugins/generic/dlep/radio/dlep_radio.h with 100% similarity]
include/oonf/generic/dlep/radio/dlep_radio_interface.h [moved from src-plugins/generic/dlep/radio/dlep_radio_interface.h with 92% similarity]
include/oonf/generic/dlep/radio/dlep_radio_internal.h [moved from src-plugins/generic/dlep/radio/dlep_radio_internal.h with 98% similarity]
include/oonf/generic/dlep/radio/dlep_radio_session.h [moved from src-plugins/generic/dlep/radio/dlep_radio_session.h with 88% similarity]
include/oonf/generic/dlep/router/dlep_router.h [moved from src-plugins/generic/dlep/router/dlep_router.h with 100% similarity]
include/oonf/generic/dlep/router/dlep_router_interface.h [moved from src-plugins/generic/dlep/router/dlep_router_interface.h with 94% similarity]
include/oonf/generic/dlep/router/dlep_router_internal.h [moved from src-plugins/generic/dlep/router/dlep_router_internal.h with 98% similarity]
include/oonf/generic/dlep/router/dlep_router_session.h [moved from src-plugins/generic/dlep/router/dlep_router_session.h with 91% similarity]
include/oonf/generic/eth_listener/eth_listener.h [moved from src-plugins/generic/eth_listener/eth_listener.h with 100% similarity]
include/oonf/generic/eth_listener/ethtool-copy.h [moved from src-plugins/generic/eth_listener/ethtool-copy.h with 100% similarity]
include/oonf/generic/example/example.h [moved from src-plugins/generic/example/example.h with 100% similarity]
include/oonf/generic/layer2_config/layer2_config.h [moved from src-plugins/generic/layer2_config/layer2_config.h with 100% similarity]
include/oonf/generic/layer2_generator/layer2_generator.h [moved from src-plugins/generic/layer2_generator/layer2_generator.h with 100% similarity]
include/oonf/generic/layer2info/layer2info.h [moved from src-plugins/generic/layer2info/layer2info.h with 100% similarity]
include/oonf/generic/link_config/link_config.h [moved from src-plugins/generic/link_config/link_config.h with 100% similarity]
include/oonf/generic/nl80211_listener/genl_get_family.h [moved from src-plugins/generic/nl80211_listener/genl_get_family.h with 97% similarity]
include/oonf/generic/nl80211_listener/nl80211.h [moved from src-plugins/generic/nl80211_listener/nl80211.h with 100% similarity]
include/oonf/generic/nl80211_listener/nl80211_get_interface.h [moved from src-plugins/generic/nl80211_listener/nl80211_get_interface.h with 97% similarity]
include/oonf/generic/nl80211_listener/nl80211_get_mpp.h [moved from src-plugins/generic/nl80211_listener/nl80211_get_mpp.h with 97% similarity]
include/oonf/generic/nl80211_listener/nl80211_get_station_dump.h [moved from src-plugins/generic/nl80211_listener/nl80211_get_station_dump.h with 97% similarity]
include/oonf/generic/nl80211_listener/nl80211_get_survey.h [moved from src-plugins/generic/nl80211_listener/nl80211_get_survey.h with 97% similarity]
include/oonf/generic/nl80211_listener/nl80211_get_wiphy.h [moved from src-plugins/generic/nl80211_listener/nl80211_get_wiphy.h with 97% similarity]
include/oonf/generic/nl80211_listener/nl80211_internal.h [moved from src-plugins/generic/nl80211_listener/nl80211_internal.h with 98% similarity]
include/oonf/generic/nl80211_listener/nl80211_listener.h [moved from src-plugins/generic/nl80211_listener/nl80211_listener.h with 96% similarity]
include/oonf/generic/plugin_controller/plugin_controller.h [moved from src-plugins/generic/plugin_controller/plugin_controller.h with 100% similarity]
include/oonf/generic/remotecontrol/remotecontrol.h [moved from src-plugins/generic/remotecontrol/remotecontrol.h with 100% similarity]
include/oonf/generic/systeminfo/systeminfo.h [moved from src-plugins/generic/systeminfo/systeminfo.h with 100% similarity]
include/oonf/libcommon/autobuf.h [moved from src-api/common/autobuf.h with 99% similarity]
include/oonf/libcommon/avl.h [moved from src-api/common/avl.h with 99% similarity]
include/oonf/libcommon/avl_comp.h [moved from src-api/common/avl_comp.h with 97% similarity]
include/oonf/libcommon/bitmap256.h [moved from src-api/common/bitmap256.h with 98% similarity]
include/oonf/libcommon/bitstream.h [moved from src-api/common/bitstream.h with 97% similarity]
include/oonf/libcommon/container_of.h [moved from src-api/common/container_of.h with 99% similarity]
include/oonf/libcommon/isonumber.h [moved from src-api/common/isonumber.h with 98% similarity]
include/oonf/libcommon/json.h [moved from src-api/common/json.h with 96% similarity]
include/oonf/libcommon/list.h [moved from src-api/common/list.h with 99% similarity]
include/oonf/libcommon/netaddr.h [moved from src-api/common/netaddr.h with 99% similarity]
include/oonf/libcommon/netaddr_acl.h [moved from src-api/common/netaddr_acl.h with 97% similarity]
include/oonf/libcommon/string.h [moved from src-api/common/string.h with 99% similarity]
include/oonf/libcommon/template.h [moved from src-api/common/template.h with 98% similarity]
include/oonf/libconfig/cfg.h [moved from src-api/config/cfg.h with 95% similarity]
include/oonf/libconfig/cfg_cmd.h [moved from src-api/config/cfg_cmd.h with 95% similarity]
include/oonf/libconfig/cfg_db.h [moved from src-api/config/cfg_db.h with 99% similarity]
include/oonf/libconfig/cfg_help.h [moved from src-api/config/cfg_help.h with 96% similarity]
include/oonf/libconfig/cfg_io.h [moved from src-api/config/cfg_io.h with 96% similarity]
include/oonf/libconfig/cfg_schema.h [moved from src-api/config/cfg_schema.h with 99% similarity]
include/oonf/libconfig/cfg_tobin.h [moved from src-api/config/cfg_tobin.h with 95% similarity]
include/oonf/libconfig/cfg_validate.h [moved from src-api/config/cfg_validate.h with 97% similarity]
include/oonf/libcore/app_data.h [moved from src-api/core/app_data.h with 98% similarity]
include/oonf/libcore/oonf_appdata.h [moved from src-api/core/oonf_appdata.h with 98% similarity]
include/oonf/libcore/oonf_cfg.h [moved from src-api/core/oonf_cfg.h with 94% similarity]
include/oonf/libcore/oonf_libdata.h [moved from src-api/core/oonf_libdata.h with 98% similarity]
include/oonf/libcore/oonf_logging.h [moved from src-api/core/oonf_logging.h with 98% similarity]
include/oonf/libcore/oonf_logging_cfg.h [moved from src-api/core/oonf_logging_cfg.h with 95% similarity]
include/oonf/libcore/oonf_main.h [moved from src-api/core/oonf_main.h with 97% similarity]
include/oonf/libcore/oonf_subsystem.h [moved from src-api/core/oonf_subsystem.h with 97% similarity]
include/oonf/libcore/os_core.h [moved from src-api/core/os_core.h with 95% similarity]
include/oonf/libcore/os_generic/os_core_generic_syslog.h [moved from src-api/core/os_generic/os_core_generic_syslog.h with 98% similarity]
include/oonf/libcore/os_linux/os_core_linux.h [moved from src-api/core/os_linux/os_core_linux.h with 97% similarity]
include/oonf/librfc5444/rfc5444.h [moved from src-plugins/subsystems/rfc5444/rfc5444.h with 98% similarity]
include/oonf/librfc5444/rfc5444_api_config.h [moved from src-plugins/subsystems/rfc5444/rfc5444_api_config.h with 100% similarity]
include/oonf/librfc5444/rfc5444_context.h [moved from src-plugins/subsystems/rfc5444/rfc5444_context.h with 98% similarity]
include/oonf/librfc5444/rfc5444_iana.h [moved from src-plugins/subsystems/rfc5444/rfc5444_iana.h with 99% similarity]
include/oonf/librfc5444/rfc5444_print.h [moved from src-plugins/subsystems/rfc5444/rfc5444_print.h with 96% similarity]
include/oonf/librfc5444/rfc5444_reader.h [moved from src-plugins/subsystems/rfc5444/rfc5444_reader.h with 98% similarity]
include/oonf/librfc5444/rfc5444_tlv_writer.h [moved from src-plugins/subsystems/rfc5444/rfc5444_tlv_writer.h with 98% similarity]
include/oonf/librfc5444/rfc5444_writer.h [moved from src-plugins/subsystems/rfc5444/rfc5444_writer.h with 98% similarity]
include/oonf/nhdp/auto_ll4/auto_ll4.h [moved from src-plugins/nhdp/auto_ll4/auto_ll4.h with 100% similarity]
include/oonf/nhdp/constant_metric/constant_metric.h [moved from src-plugins/nhdp/constant_metric/constant_metric.h with 100% similarity]
include/oonf/nhdp/ff_dat_metric/ff_dat_metric.h [moved from src-plugins/nhdp/ff_dat_metric/ff_dat_metric.h with 100% similarity]
include/oonf/nhdp/hysteresis_olsrv1/hysteresis_olsrv1.h [moved from src-plugins/nhdp/hysteresis_olsrv1/hysteresis_olsrv1.h with 100% similarity]
include/oonf/nhdp/mpr/mpr.h [moved from src-plugins/nhdp/mpr/mpr.h with 100% similarity]
include/oonf/nhdp/mpr/mpr_internal.h [moved from src-plugins/nhdp/mpr/mpr_internal.h with 98% similarity]
include/oonf/nhdp/mpr/neighbor-graph-flooding.h [moved from src-plugins/nhdp/mpr/neighbor-graph-flooding.h with 94% similarity]
include/oonf/nhdp/mpr/neighbor-graph-routing.h [moved from src-plugins/nhdp/mpr/neighbor-graph-routing.h with 96% similarity]
include/oonf/nhdp/mpr/neighbor-graph.h [moved from src-plugins/nhdp/mpr/neighbor-graph.h with 96% similarity]
include/oonf/nhdp/mpr/selection-rfc7181.h [moved from src-plugins/nhdp/mpr/selection-rfc7181.h with 96% similarity]
include/oonf/nhdp/neighbor_probing/neighbor_probing.h [moved from src-plugins/nhdp/neighbor_probing/neighbor_probing.h with 100% similarity]
include/oonf/nhdp/nhdp/nhdp.h [moved from src-plugins/nhdp/nhdp/nhdp.h with 94% similarity]
include/oonf/nhdp/nhdp/nhdp_db.h [moved from src-plugins/nhdp/nhdp/nhdp_db.h with 98% similarity]
include/oonf/nhdp/nhdp/nhdp_domain.h [moved from src-plugins/nhdp/nhdp/nhdp_domain.h with 98% similarity]
include/oonf/nhdp/nhdp/nhdp_hysteresis.h [moved from src-plugins/nhdp/nhdp/nhdp_hysteresis.h with 97% similarity]
include/oonf/nhdp/nhdp/nhdp_interfaces.h [moved from src-plugins/nhdp/nhdp/nhdp_interfaces.h with 96% similarity]
include/oonf/nhdp/nhdp/nhdp_internal.h [moved from src-plugins/nhdp/nhdp/nhdp_internal.h with 98% similarity]
include/oonf/nhdp/nhdp/nhdp_reader.h [moved from src-plugins/nhdp/nhdp/nhdp_reader.h with 96% similarity]
include/oonf/nhdp/nhdp/nhdp_writer.h [moved from src-plugins/nhdp/nhdp/nhdp_writer.h with 96% similarity]
include/oonf/nhdp/nhdpcheck/nhdpcheck.h [moved from src-plugins/nhdp/nhdpcheck/nhdpcheck.h with 100% similarity]
include/oonf/nhdp/nhdpinfo/nhdpinfo.h [moved from src-plugins/nhdp/nhdpinfo/nhdpinfo.h with 100% similarity]
include/oonf/olsrv2/lan_import/lan_import.h [moved from src-plugins/olsrv2/lan_import/lan_import.h with 100% similarity]
include/oonf/olsrv2/netjsoninfo/netjsoninfo.h [moved from src-plugins/olsrv2/netjsoninfo/netjsoninfo.h with 100% similarity]
include/oonf/olsrv2/olsrv2/olsrv2.h [moved from src-plugins/olsrv2/olsrv2/olsrv2.h with 94% similarity]
include/oonf/olsrv2/olsrv2/olsrv2_internal.h [moved from src-plugins/olsrv2/olsrv2/olsrv2_internal.h with 97% similarity]
include/oonf/olsrv2/olsrv2/olsrv2_lan.h [moved from src-plugins/olsrv2/olsrv2/olsrv2_lan.h with 94% similarity]
include/oonf/olsrv2/olsrv2/olsrv2_originator.h [moved from src-plugins/olsrv2/olsrv2/olsrv2_originator.h with 95% similarity]
include/oonf/olsrv2/olsrv2/olsrv2_reader.h [moved from src-plugins/olsrv2/olsrv2/olsrv2_reader.h with 96% similarity]
include/oonf/olsrv2/olsrv2/olsrv2_routing.h [moved from src-plugins/olsrv2/olsrv2/olsrv2_routing.h with 95% similarity]
include/oonf/olsrv2/olsrv2/olsrv2_tc.h [moved from src-plugins/olsrv2/olsrv2/olsrv2_tc.h with 96% similarity]
include/oonf/olsrv2/olsrv2/olsrv2_writer.h [moved from src-plugins/olsrv2/olsrv2/olsrv2_writer.h with 97% similarity]
include/oonf/olsrv2/olsrv2_lan/olsrv2_lan.h [moved from src-plugins/olsrv2/olsrv2_lan/olsrv2_lan.h with 100% similarity]
include/oonf/olsrv2/olsrv2_old_lan/old_lan.h [moved from src-plugins/olsrv2/olsrv2_old_lan/old_lan.h with 95% similarity]
include/oonf/olsrv2/olsrv2info/olsrv2info.h [moved from src-plugins/olsrv2/olsrv2info/olsrv2info.h with 100% similarity]
include/oonf/olsrv2/route_modifier/route_modifier.h [moved from src-plugins/olsrv2/route_modifier/route_modifier.h with 100% similarity]
include/oonf/oonf.h [moved from src-api/common/common_types.h with 97% similarity]
include/oonf/subsystems/oonf_class.h [moved from src-plugins/subsystems/oonf_class.h with 98% similarity]
include/oonf/subsystems/oonf_clock.h [moved from src-plugins/subsystems/oonf_clock.h with 98% similarity]
include/oonf/subsystems/oonf_duplicate_set.h [moved from src-plugins/subsystems/oonf_duplicate_set.h with 97% similarity]
include/oonf/subsystems/oonf_http.h [moved from src-plugins/subsystems/oonf_http.h with 96% similarity]
include/oonf/subsystems/oonf_layer2.h [moved from src-plugins/subsystems/oonf_layer2.h with 99% similarity]
include/oonf/subsystems/oonf_packet_socket.h [moved from src-plugins/subsystems/oonf_packet_socket.h with 96% similarity]
include/oonf/subsystems/oonf_rfc5444.h [moved from src-plugins/subsystems/oonf_rfc5444.h with 96% similarity]
include/oonf/subsystems/oonf_socket.h [moved from src-plugins/subsystems/oonf_socket.h with 96% similarity]
include/oonf/subsystems/oonf_stream_socket.h [moved from src-plugins/subsystems/oonf_stream_socket.h with 96% similarity]
include/oonf/subsystems/oonf_telnet.h [moved from src-plugins/subsystems/oonf_telnet.h with 97% similarity]
include/oonf/subsystems/oonf_timer.h [moved from src-plugins/subsystems/oonf_timer.h with 98% similarity]
include/oonf/subsystems/oonf_viewer.h [moved from src-plugins/subsystems/oonf_viewer.h with 95% similarity]
include/oonf/subsystems/os_clock.h [moved from src-plugins/subsystems/os_clock.h with 91% similarity]
include/oonf/subsystems/os_fd.h [moved from src-plugins/subsystems/os_fd.h with 93% similarity]
include/oonf/subsystems/os_generic/os_fd_generic_configsocket.h [moved from src-plugins/subsystems/os_generic/os_fd_generic_configsocket.h with 74% similarity]
include/oonf/subsystems/os_generic/os_fd_generic_getrawsocket.h [moved from src-plugins/subsystems/os_generic/os_fd_generic_getrawsocket.h with 86% similarity]
include/oonf/subsystems/os_generic/os_fd_generic_getsocket.h [moved from src-plugins/subsystems/os_generic/os_fd_generic_getsocket.h with 86% similarity]
include/oonf/subsystems/os_generic/os_fd_generic_join_mcast.h [moved from src-plugins/subsystems/os_generic/os_fd_generic_join_mcast.h with 89% similarity]
include/oonf/subsystems/os_generic/os_fd_generic_set_dscp.h [moved from src-plugins/subsystems/os_generic/os_fd_generic_set_dscp.h with 81% similarity]
include/oonf/subsystems/os_generic/os_fd_generic_set_nonblocking.h [moved from src-plugins/subsystems/os_generic/os_fd_generic_set_nonblocking.h with 82% similarity]
include/oonf/subsystems/os_generic/os_interface_generic.h [moved from src-plugins/subsystems/os_generic/os_interface_generic.h with 86% similarity]
include/oonf/subsystems/os_generic/os_routing_generic_init_half_route_key.h [moved from src-plugins/subsystems/os_generic/os_routing_generic_init_half_route_key.h with 85% similarity]
include/oonf/subsystems/os_generic/os_routing_generic_rt_to_string.h [moved from src-plugins/subsystems/os_generic/os_routing_generic_rt_to_string.h with 85% similarity]
include/oonf/subsystems/os_interface.h [moved from src-plugins/subsystems/os_interface.h with 96% similarity]
include/oonf/subsystems/os_linux/os_clock_linux.h [moved from src-plugins/subsystems/os_linux/os_clock_linux.h with 98% similarity]
include/oonf/subsystems/os_linux/os_fd_linux.h [moved from src-plugins/subsystems/os_linux/os_fd_linux.h with 97% similarity]
include/oonf/subsystems/os_linux/os_interface_linux.h [moved from src-plugins/subsystems/os_linux/os_interface_linux.h with 97% similarity]
include/oonf/subsystems/os_linux/os_interface_linux_internal.h [moved from src-plugins/subsystems/os_linux/os_interface_linux_internal.h with 97% similarity]
include/oonf/subsystems/os_linux/os_routing_linux.h [moved from src-plugins/subsystems/os_linux/os_routing_linux.h with 96% similarity]
include/oonf/subsystems/os_linux/os_system_linux.h [moved from src-plugins/subsystems/os_linux/os_system_linux.h with 97% similarity]
include/oonf/subsystems/os_linux/os_tunnel_linux.h [moved from src-plugins/subsystems/os_linux/os_tunnel_linux.h with 97% similarity]
include/oonf/subsystems/os_linux/os_vif_linux.h [moved from src-plugins/subsystems/os_linux/os_vif_linux.h with 97% similarity]
include/oonf/subsystems/os_routing.h [moved from src-plugins/subsystems/os_routing.h with 96% similarity]
include/oonf/subsystems/os_system.h [moved from src-plugins/subsystems/os_system.h with 92% similarity]
include/oonf/subsystems/os_tunnel.h [moved from src-plugins/subsystems/os_tunnel.h with 95% similarity]
include/oonf/subsystems/os_vif.h [moved from src-plugins/subsystems/os_vif.h with 95% similarity]
src-api/CMakeLists.txt [deleted file]
src-plugins/CMakeLists.txt [deleted file]
src-plugins/subsystems/rfc5444/CMakeLists.txt [deleted file]
src/CMakeLists.txt
src/crypto/CMakeLists.txt [moved from src-plugins/crypto/CMakeLists.txt with 100% similarity]
src/crypto/hash_polarssl/CMakeLists.txt [moved from src-plugins/crypto/hash_polarssl/CMakeLists.txt with 100% similarity]
src/crypto/hash_polarssl/hash_polarssl.c [moved from src-plugins/crypto/hash_polarssl/hash_polarssl.c with 97% similarity]
src/crypto/hash_tomcrypt/CMakeLists.txt [moved from src-plugins/crypto/hash_tomcrypt/CMakeLists.txt with 100% similarity]
src/crypto/hash_tomcrypt/hash_tomcrypt.c [moved from src-plugins/crypto/hash_tomcrypt/hash_tomcrypt.c with 97% similarity]
src/crypto/rfc5444_signature/CMakeLists.txt [moved from src-plugins/crypto/rfc5444_signature/CMakeLists.txt with 100% similarity]
src/crypto/rfc5444_signature/rfc5444_signature.c [moved from src-plugins/crypto/rfc5444_signature/rfc5444_signature.c with 98% similarity]
src/crypto/rfc7182_provider/CMakeLists.txt [moved from src-plugins/crypto/rfc7182_provider/CMakeLists.txt with 100% similarity]
src/crypto/rfc7182_provider/rfc7182_provider.c [moved from src-plugins/crypto/rfc7182_provider/rfc7182_provider.c with 97% similarity]
src/crypto/sharedkey_sig/CMakeLists.txt [moved from src-plugins/crypto/sharedkey_sig/CMakeLists.txt with 100% similarity]
src/crypto/sharedkey_sig/sharedkey_sig.c [moved from src-plugins/crypto/sharedkey_sig/sharedkey_sig.c with 96% similarity]
src/crypto/simple_security/CMakeLists.txt [moved from src-plugins/crypto/simple_security/CMakeLists.txt with 100% similarity]
src/crypto/simple_security/simple_security.c [moved from src-plugins/crypto/simple_security/simple_security.c with 97% similarity]
src/generic/CMakeLists.txt [moved from src-plugins/generic/CMakeLists.txt with 100% similarity]
src/generic/cfg_compact/CMakeLists.txt [moved from src-plugins/generic/cfg_compact/CMakeLists.txt with 100% similarity]
src/generic/cfg_compact/README_CFG_COMPACT [moved from src-plugins/generic/cfg_compact/README_CFG_COMPACT with 100% similarity]
src/generic/cfg_compact/cfg_compact.c [moved from src-plugins/generic/cfg_compact/cfg_compact.c with 98% similarity]
src/generic/cfg_uciloader/CMakeLists.txt [moved from src-plugins/generic/cfg_uciloader/CMakeLists.txt with 100% similarity]
src/generic/cfg_uciloader/cfg_uciloader.c [moved from src-plugins/generic/cfg_uciloader/cfg_uciloader.c with 96% similarity]
src/generic/dlep/CMakeLists.txt [moved from src-plugins/generic/dlep/CMakeLists.txt with 100% similarity]
src/generic/dlep/README_DLEP_RADIO [moved from src-plugins/generic/dlep/README_DLEP_RADIO with 100% similarity]
src/generic/dlep/README_DLEP_ROUTER [moved from src-plugins/generic/dlep/README_DLEP_ROUTER with 100% similarity]
src/generic/dlep/dlep_extension.c [moved from src-plugins/generic/dlep/dlep_extension.c with 97% similarity]
src/generic/dlep/dlep_interface.c [moved from src-plugins/generic/dlep/dlep_interface.c with 96% similarity]
src/generic/dlep/dlep_reader.c [moved from src-plugins/generic/dlep/dlep_reader.c with 98% similarity]
src/generic/dlep/dlep_session.c [moved from src-plugins/generic/dlep/dlep_session.c with 98% similarity]
src/generic/dlep/dlep_writer.c [moved from src-plugins/generic/dlep/dlep_writer.c with 98% similarity]
src/generic/dlep/ext_base_ip/ip.c [moved from src-plugins/generic/dlep/ext_base_ip/ip.c with 96% similarity]
src/generic/dlep/ext_base_metric/metric.c [moved from src-plugins/generic/dlep/ext_base_metric/metric.c with 95% similarity]
src/generic/dlep/ext_base_proto/proto.c [moved from src-plugins/generic/dlep/ext_base_proto/proto.c with 97% similarity]
src/generic/dlep/ext_base_proto/proto_radio.c [moved from src-plugins/generic/dlep/ext_base_proto/proto_radio.c with 97% similarity]
src/generic/dlep/ext_base_proto/proto_router.c [moved from src-plugins/generic/dlep/ext_base_proto/proto_router.c with 97% similarity]
src/generic/dlep/ext_l1_statistics/l1_statistics.c [moved from src-plugins/generic/dlep/ext_l1_statistics/l1_statistics.c with 97% similarity]
src/generic/dlep/ext_l2_statistics/l2_statistics.c [moved from src-plugins/generic/dlep/ext_l2_statistics/l2_statistics.c with 95% similarity]
src/generic/dlep/ext_lid/lid.c [moved from src-plugins/generic/dlep/ext_lid/lid.c with 96% similarity]
src/generic/dlep/ext_radio_attributes/radio_attributes.c [moved from src-plugins/generic/dlep/ext_radio_attributes/radio_attributes.c with 93% similarity]
src/generic/dlep/radio/dlep_radio.c [moved from src-plugins/generic/dlep/radio/dlep_radio.c with 91% similarity]
src/generic/dlep/radio/dlep_radio_interface.c [moved from src-plugins/generic/dlep/radio/dlep_radio_interface.c with 87% similarity]
src/generic/dlep/radio/dlep_radio_session.c [moved from src-plugins/generic/dlep/radio/dlep_radio_session.c with 91% similarity]
src/generic/dlep/router/dlep_router.c [moved from src-plugins/generic/dlep/router/dlep_router.c with 92% similarity]
src/generic/dlep/router/dlep_router_interface.c [moved from src-plugins/generic/dlep/router/dlep_router_interface.c with 89% similarity]
src/generic/dlep/router/dlep_router_session.c [moved from src-plugins/generic/dlep/router/dlep_router_session.c with 93% similarity]
src/generic/eth_listener/CMakeLists.txt [moved from src-plugins/generic/eth_listener/CMakeLists.txt with 100% similarity]
src/generic/eth_listener/eth_listener.c [moved from src-plugins/generic/eth_listener/eth_listener.c with 94% similarity]
src/generic/example/CMakeLists.txt [moved from src-plugins/generic/example/CMakeLists.txt with 100% similarity]
src/generic/example/example.c [moved from src-plugins/generic/example/example.c with 95% similarity]
src/generic/layer2_config/CMakeLists.txt [moved from src-plugins/generic/layer2_config/CMakeLists.txt with 100% similarity]
src/generic/layer2_config/layer2_config.c [moved from src-plugins/generic/layer2_config/layer2_config.c with 97% similarity]
src/generic/layer2_generator/CMakeLists.txt [moved from src-plugins/generic/layer2_generator/CMakeLists.txt with 100% similarity]
src/generic/layer2_generator/layer2_generator.c [moved from src-plugins/generic/layer2_generator/layer2_generator.c with 94% similarity]
src/generic/layer2info/CMakeLists.txt [moved from src-plugins/generic/layer2info/CMakeLists.txt with 100% similarity]
src/generic/layer2info/layer2info.c [moved from src-plugins/generic/layer2info/layer2info.c with 97% similarity]
src/generic/link_config/CMakeLists.txt [moved from src-plugins/generic/link_config/CMakeLists.txt with 100% similarity]
src/generic/link_config/link_config.c [moved from src-plugins/generic/link_config/link_config.c with 96% similarity]
src/generic/nl80211_listener/CMakeLists.txt [moved from src-plugins/generic/nl80211_listener/CMakeLists.txt with 100% similarity]
src/generic/nl80211_listener/genl_get_family.c [moved from src-plugins/generic/nl80211_listener/genl_get_family.c with 95% similarity]
src/generic/nl80211_listener/nl80211_get_interface.c [moved from src-plugins/generic/nl80211_listener/nl80211_get_interface.c with 96% similarity]
src/generic/nl80211_listener/nl80211_get_mpp.c [moved from src-plugins/generic/nl80211_listener/nl80211_get_mpp.c with 94% similarity]
src/generic/nl80211_listener/nl80211_get_station_dump.c [moved from src-plugins/generic/nl80211_listener/nl80211_get_station_dump.c with 96% similarity]
src/generic/nl80211_listener/nl80211_get_survey.c [moved from src-plugins/generic/nl80211_listener/nl80211_get_survey.c with 96% similarity]
src/generic/nl80211_listener/nl80211_get_wiphy.c [moved from src-plugins/generic/nl80211_listener/nl80211_get_wiphy.c with 97% similarity]
src/generic/nl80211_listener/nl80211_listener.c [moved from src-plugins/generic/nl80211_listener/nl80211_listener.c with 95% similarity]
src/generic/nl80211_listener/scan_strategy.txt [moved from src-plugins/generic/nl80211_listener/scan_strategy.txt with 100% similarity]
src/generic/plugin_controller/CMakeLists.txt [moved from src-plugins/generic/plugin_controller/CMakeLists.txt with 100% similarity]
src/generic/plugin_controller/plugin_controller.c [moved from src-plugins/generic/plugin_controller/plugin_controller.c with 94% similarity]
src/generic/remotecontrol/CMakeLists.txt [moved from src-plugins/generic/remotecontrol/CMakeLists.txt with 100% similarity]
src/generic/remotecontrol/README_REMOTECONTROL [moved from src-plugins/generic/remotecontrol/README_REMOTECONTROL with 100% similarity]
src/generic/remotecontrol/remotecontrol.c [moved from src-plugins/generic/remotecontrol/remotecontrol.c with 97% similarity]
src/generic/systeminfo/CMakeLists.txt [moved from src-plugins/generic/systeminfo/CMakeLists.txt with 100% similarity]
src/generic/systeminfo/systeminfo.c [moved from src-plugins/generic/systeminfo/systeminfo.c with 98% similarity]
src/libcommon/CMakeLists.txt [moved from src-api/common/CMakeLists.txt with 90% similarity]
src/libcommon/autobuf.c [moved from src-api/common/autobuf.c with 99% similarity]
src/libcommon/avl.c [moved from src-api/common/avl.c with 99% similarity]
src/libcommon/avl_comp.c [moved from src-api/common/avl_comp.c with 98% similarity]
src/libcommon/bitmap256.c [moved from src-api/common/bitmap256.c with 97% similarity]
src/libcommon/bitstream.c [moved from src-api/common/bitstream.c with 98% similarity]
src/libcommon/isonumber.c [moved from src-api/common/isonumber.c with 99% similarity]
src/libcommon/json.c [moved from src-api/common/json.c with 97% similarity]
src/libcommon/netaddr.c [moved from src-api/common/netaddr.c with 99% similarity]
src/libcommon/netaddr_acl.c [moved from src-api/common/netaddr_acl.c with 98% similarity]
src/libcommon/string.c [moved from src-api/common/string.c with 99% similarity]
src/libcommon/template.c [moved from src-api/common/template.c with 97% similarity]
src/libconfig/CMakeLists.txt [moved from src-api/config/CMakeLists.txt with 84% similarity]
src/libconfig/cfg.c [moved from src-api/config/cfg.c with 97% similarity]
src/libconfig/cfg_cmd.c [moved from src-api/config/cfg_cmd.c with 98% similarity]
src/libconfig/cfg_db.c [moved from src-api/config/cfg_db.c with 98% similarity]
src/libconfig/cfg_help.c [moved from src-api/config/cfg_help.c with 97% similarity]
src/libconfig/cfg_io.c [moved from src-api/config/cfg_io.c with 96% similarity]
src/libconfig/cfg_schema.c [moved from src-api/config/cfg_schema.c with 98% similarity]
src/libconfig/cfg_tobin.c [moved from src-api/config/cfg_tobin.c with 96% similarity]
src/libconfig/cfg_validate.c [moved from src-api/config/cfg_validate.c with 97% similarity]
src/libcore/CMakeLists.txt [moved from src-api/core/CMakeLists.txt with 88% similarity]
src/libcore/oonf_cfg.c [moved from src-api/core/oonf_cfg.c with 98% similarity]
src/libcore/oonf_libdata.c.in [moved from src-api/core/oonf_libdata.c.in with 98% similarity]
src/libcore/oonf_logging.c [moved from src-api/core/oonf_logging.c with 98% similarity]
src/libcore/oonf_logging_cfg.c [moved from src-api/core/oonf_logging_cfg.c with 97% similarity]
src/libcore/oonf_main.c [moved from src-api/core/oonf_main.c with 98% similarity]
src/libcore/oonf_subsystem.c [moved from src-api/core/oonf_subsystem.c with 97% similarity]
src/libcore/os_generic/os_core_generic_syslog.c [moved from src-api/core/os_generic/os_core_generic_syslog.c with 96% similarity]
src/libcore/os_linux/os_core_linux.c [moved from src-api/core/os_linux/os_core_linux.c with 98% similarity]
src/librfc5444/CMakeLists.txt [new file with mode: 0644]
src/librfc5444/rfc5444.c [moved from src-plugins/subsystems/rfc5444/rfc5444.c with 99% similarity]
src/librfc5444/rfc5444_context.c [moved from src-plugins/subsystems/rfc5444/rfc5444_context.c with 98% similarity]
src/librfc5444/rfc5444_iana.c [moved from src-plugins/subsystems/rfc5444/rfc5444_iana.c with 97% similarity]
src/librfc5444/rfc5444_msg_generator.c [moved from src-plugins/subsystems/rfc5444/rfc5444_msg_generator.c with 99% similarity]
src/librfc5444/rfc5444_pkt_generator.c [moved from src-plugins/subsystems/rfc5444/rfc5444_pkt_generator.c with 98% similarity]
src/librfc5444/rfc5444_print.c [moved from src-plugins/subsystems/rfc5444/rfc5444_print.c with 99% similarity]
src/librfc5444/rfc5444_reader.c [moved from src-plugins/subsystems/rfc5444/rfc5444_reader.c with 99% similarity]
src/librfc5444/rfc5444_tlv_writer.c [moved from src-plugins/subsystems/rfc5444/rfc5444_tlv_writer.c with 97% similarity]
src/librfc5444/rfc5444_writer.c [moved from src-plugins/subsystems/rfc5444/rfc5444_writer.c with 98% similarity]
src/main/app_data.c.in [moved from src/app_data.c.in with 95% similarity]
src/main/main.c [moved from src/main.c with 95% similarity]
src/nhdp/CMakeLists.txt [moved from src-plugins/nhdp/CMakeLists.txt with 100% similarity]
src/nhdp/auto_ll4/CMakeLists.txt [moved from src-plugins/nhdp/auto_ll4/CMakeLists.txt with 100% similarity]
src/nhdp/auto_ll4/auto_ll4.c [moved from src-plugins/nhdp/auto_ll4/auto_ll4.c with 97% similarity]
src/nhdp/constant_metric/CMakeLists.txt [moved from src-plugins/nhdp/constant_metric/CMakeLists.txt with 100% similarity]
src/nhdp/constant_metric/constant_metric.c [moved from src-plugins/nhdp/constant_metric/constant_metric.c with 93% similarity]
src/nhdp/ff_dat_metric/CMakeLists.txt [moved from src-plugins/nhdp/ff_dat_metric/CMakeLists.txt with 100% similarity]
src/nhdp/ff_dat_metric/README_FF_DAT_METRIC [moved from src-plugins/nhdp/ff_dat_metric/README_FF_DAT_METRIC with 100% similarity]
src/nhdp/ff_dat_metric/ff_dat_metric.c [moved from src-plugins/nhdp/ff_dat_metric/ff_dat_metric.c with 98% similarity]
src/nhdp/hysteresis_olsrv1/CMakeLists.txt [moved from src-plugins/nhdp/hysteresis_olsrv1/CMakeLists.txt with 100% similarity]
src/nhdp/hysteresis_olsrv1/README_HYSTERESIS_OLSRV1 [moved from src-plugins/nhdp/hysteresis_olsrv1/README_HYSTERESIS_OLSRV1 with 100% similarity]
src/nhdp/hysteresis_olsrv1/hysteresis_olsrv1.c [moved from src-plugins/nhdp/hysteresis_olsrv1/hysteresis_olsrv1.c with 96% similarity]
src/nhdp/mpr/CMakeLists.txt [moved from src-plugins/nhdp/mpr/CMakeLists.txt with 100% similarity]
src/nhdp/mpr/mpr.c [moved from src-plugins/nhdp/mpr/mpr.c with 92% similarity]
src/nhdp/mpr/neighbor-graph-flooding.c [moved from src-plugins/nhdp/mpr/neighbor-graph-flooding.c with 93% similarity]
src/nhdp/mpr/neighbor-graph-routing.c [moved from src-plugins/nhdp/mpr/neighbor-graph-routing.c with 94% similarity]
src/nhdp/mpr/neighbor-graph.c [moved from src-plugins/nhdp/mpr/neighbor-graph.c with 92% similarity]
src/nhdp/mpr/selection-rfc7181.c [moved from src-plugins/nhdp/mpr/selection-rfc7181.c with 95% similarity]
src/nhdp/neighbor_probing/CMakeLists.txt [moved from src-plugins/nhdp/neighbor_probing/CMakeLists.txt with 100% similarity]
src/nhdp/neighbor_probing/README_NEIGHBOR_PROBING [moved from src-plugins/nhdp/neighbor_probing/README_NEIGHBOR_PROBING with 100% similarity]
src/nhdp/neighbor_probing/neighbor_probing.c [moved from src-plugins/nhdp/neighbor_probing/neighbor_probing.c with 95% similarity]
src/nhdp/nhdp/CMakeLists.txt [moved from src-plugins/nhdp/nhdp/CMakeLists.txt with 100% similarity]
src/nhdp/nhdp/nhdp.c [moved from src-plugins/nhdp/nhdp/nhdp.c with 96% similarity]
src/nhdp/nhdp/nhdp_db.c [moved from src-plugins/nhdp/nhdp/nhdp_db.c with 98% similarity]
src/nhdp/nhdp/nhdp_domain.c [moved from src-plugins/nhdp/nhdp/nhdp_domain.c with 98% similarity]
src/nhdp/nhdp/nhdp_hysteresis.c [moved from src-plugins/nhdp/nhdp/nhdp_hysteresis.c with 95% similarity]
src/nhdp/nhdp/nhdp_interfaces.c [moved from src-plugins/nhdp/nhdp/nhdp_interfaces.c with 96% similarity]
src/nhdp/nhdp/nhdp_reader.c [moved from src-plugins/nhdp/nhdp/nhdp_reader.c with 98% similarity]
src/nhdp/nhdp/nhdp_writer.c [moved from src-plugins/nhdp/nhdp/nhdp_writer.c with 98% similarity]
src/nhdp/nhdpcheck/CMakeLists.txt [moved from src-plugins/nhdp/nhdpcheck/CMakeLists.txt with 100% similarity]
src/nhdp/nhdpcheck/README_NHDPCHECK [moved from src-plugins/nhdp/nhdpcheck/README_NHDPCHECK with 100% similarity]
src/nhdp/nhdpcheck/nhdpcheck.c [moved from src-plugins/nhdp/nhdpcheck/nhdpcheck.c with 97% similarity]
src/nhdp/nhdpinfo/CMakeLists.txt [moved from src-plugins/nhdp/nhdpinfo/CMakeLists.txt with 100% similarity]
src/nhdp/nhdpinfo/nhdpinfo.c [moved from src-plugins/nhdp/nhdpinfo/nhdpinfo.c with 98% similarity]
src/olsrv2/CMakeLists.txt [moved from src-plugins/olsrv2/CMakeLists.txt with 100% similarity]
src/olsrv2/lan_import/CMakeLists.txt [moved from src-plugins/olsrv2/lan_import/CMakeLists.txt with 100% similarity]
src/olsrv2/lan_import/lan_import.c [moved from src-plugins/olsrv2/lan_import/lan_import.c with 96% similarity]
src/olsrv2/netjsoninfo/CMakeLists.txt [moved from src-plugins/olsrv2/netjsoninfo/CMakeLists.txt with 100% similarity]
src/olsrv2/netjsoninfo/netjsoninfo.c [moved from src-plugins/olsrv2/netjsoninfo/netjsoninfo.c with 97% similarity]
src/olsrv2/olsrv2/CMakeLists.txt [moved from src-plugins/olsrv2/olsrv2/CMakeLists.txt with 100% similarity]
src/olsrv2/olsrv2/olsrv2.c [moved from src-plugins/olsrv2/olsrv2/olsrv2.c with 96% similarity]
src/olsrv2/olsrv2/olsrv2_lan.c [moved from src-plugins/olsrv2/olsrv2/olsrv2_lan.c with 92% similarity]
src/olsrv2/olsrv2/olsrv2_originator.c [moved from src-plugins/olsrv2/olsrv2/olsrv2_originator.c with 94% similarity]
src/olsrv2/olsrv2/olsrv2_reader.c [moved from src-plugins/olsrv2/olsrv2/olsrv2_reader.c with 97% similarity]
src/olsrv2/olsrv2/olsrv2_routing.c [moved from src-plugins/olsrv2/olsrv2/olsrv2_routing.c with 97% similarity]
src/olsrv2/olsrv2/olsrv2_tc.c [moved from src-plugins/olsrv2/olsrv2/olsrv2_tc.c with 97% similarity]
src/olsrv2/olsrv2/olsrv2_writer.c [moved from src-plugins/olsrv2/olsrv2/olsrv2_writer.c with 96% similarity]
src/olsrv2/olsrv2_lan/CMakeLists.txt [moved from src-plugins/olsrv2/olsrv2_lan/CMakeLists.txt with 100% similarity]
src/olsrv2/olsrv2_lan/olsrv2_lan.c [moved from src-plugins/olsrv2/olsrv2_lan/olsrv2_lan.c with 94% similarity]
src/olsrv2/olsrv2_old_lan/CMakeLists.txt [moved from src-plugins/olsrv2/olsrv2_old_lan/CMakeLists.txt with 100% similarity]
src/olsrv2/olsrv2_old_lan/old_lan.c [moved from src-plugins/olsrv2/olsrv2_old_lan/old_lan.c with 96% similarity]
src/olsrv2/olsrv2info/CMakeLists.txt [moved from src-plugins/olsrv2/olsrv2info/CMakeLists.txt with 100% similarity]
src/olsrv2/olsrv2info/olsrv2info.c [moved from src-plugins/olsrv2/olsrv2info/olsrv2info.c with 97% similarity]
src/olsrv2/route_modifier/CMakeLists.txt [moved from src-plugins/olsrv2/route_modifier/CMakeLists.txt with 100% similarity]
src/olsrv2/route_modifier/README_ROUTE_MODIFIER [moved from src-plugins/olsrv2/route_modifier/README_ROUTE_MODIFIER with 100% similarity]
src/olsrv2/route_modifier/route_modifier.c [moved from src-plugins/olsrv2/route_modifier/route_modifier.c with 94% similarity]
src/subsystems/CMakeLists.txt [moved from src-plugins/subsystems/CMakeLists.txt with 80% similarity]
src/subsystems/oonf_class.c [moved from src-plugins/subsystems/oonf_class.c with 98% similarity]
src/subsystems/oonf_clock.c [moved from src-plugins/subsystems/oonf_clock.c with 93% similarity]
src/subsystems/oonf_duplicate_set.c [moved from src-plugins/subsystems/oonf_duplicate_set.c with 97% similarity]
src/subsystems/oonf_http.c [moved from src-plugins/subsystems/oonf_http.c with 98% similarity]
src/subsystems/oonf_layer2.c [moved from src-plugins/subsystems/oonf_layer2.c with 99% similarity]
src/subsystems/oonf_packet_socket.c [moved from src-plugins/subsystems/oonf_packet_socket.c with 98% similarity]
src/subsystems/oonf_rfc5444.c [moved from src-plugins/subsystems/oonf_rfc5444.c with 98% similarity]
src/subsystems/oonf_socket.c [moved from src-plugins/subsystems/oonf_socket.c with 95% similarity]
src/subsystems/oonf_stream_socket.c [moved from src-plugins/subsystems/oonf_stream_socket.c with 98% similarity]
src/subsystems/oonf_telnet.c [moved from src-plugins/subsystems/oonf_telnet.c with 98% similarity]
src/subsystems/oonf_timer.c [moved from src-plugins/subsystems/oonf_timer.c with 97% similarity]
src/subsystems/oonf_viewer.c [moved from src-plugins/subsystems/oonf_viewer.c with 97% similarity]
src/subsystems/os_generic/os_fd_generic_configsocket.c [moved from src-plugins/subsystems/os_generic/os_fd_generic_configsocket.c with 94% similarity]
src/subsystems/os_generic/os_fd_generic_getrawsocket.c [moved from src-plugins/subsystems/os_generic/os_fd_generic_getrawsocket.c with 93% similarity]
src/subsystems/os_generic/os_fd_generic_getsocket.c [moved from src-plugins/subsystems/os_generic/os_fd_generic_getsocket.c with 93% similarity]
src/subsystems/os_generic/os_fd_generic_join_mcast.c [moved from src-plugins/subsystems/os_generic/os_fd_generic_join_mcast.c with 97% similarity]
src/subsystems/os_generic/os_fd_generic_set_dscp.c [moved from src-plugins/subsystems/os_generic/os_fd_generic_set_dscp.c with 95% similarity]
src/subsystems/os_generic/os_fd_generic_set_nonblocking.c [moved from src-plugins/subsystems/os_generic/os_fd_generic_set_nonblocking.c with 94% similarity]
src/subsystems/os_generic/os_interface_generic.c [moved from src-plugins/subsystems/os_generic/os_interface_generic.c with 98% similarity]
src/subsystems/os_generic/os_routing_generic_init_half_route_key.c [moved from src-plugins/subsystems/os_generic/os_routing_generic_init_half_route_key.c with 96% similarity]
src/subsystems/os_generic/os_routing_generic_rt_to_string.c [moved from src-plugins/subsystems/os_generic/os_routing_generic_rt_to_string.c with 97% similarity]
src/subsystems/os_generic/os_routing_generic_rtkey_avlcomp.c [moved from src-plugins/subsystems/os_generic/os_routing_generic_rtkey_avlcomp.c with 97% similarity]
src/subsystems/os_linux/os_clock_linux.c [moved from src-plugins/subsystems/os_linux/os_clock_linux.c with 97% similarity]
src/subsystems/os_linux/os_fd_linux.c [moved from src-plugins/subsystems/os_linux/os_fd_linux.c with 96% similarity]
src/subsystems/os_linux/os_interface_linux.c [moved from src-plugins/subsystems/os_linux/os_interface_linux.c with 99% similarity]
src/subsystems/os_linux/os_routing_linux.c [moved from src-plugins/subsystems/os_linux/os_routing_linux.c with 98% similarity]
src/subsystems/os_linux/os_system_linux.c [moved from src-plugins/subsystems/os_linux/os_system_linux.c with 98% similarity]
src/subsystems/os_linux/os_tunnel_linux.c [moved from src-plugins/subsystems/os_linux/os_tunnel_linux.c with 97% similarity]
src/subsystems/os_linux/os_vif_linux.c [moved from src-plugins/subsystems/os_linux/os_vif_linux.c with 96% similarity]
src/tests/CMakeLists.txt [moved from tests/CMakeLists.txt with 86% similarity]
src/tests/common/CMakeLists.txt [moved from tests/common/CMakeLists.txt with 78% similarity]
src/tests/common/test_common_avl.c [moved from tests/common/test_common_avl.c with 99% similarity]
src/tests/common/test_common_bitstream.c [moved from tests/common/test_common_bitstream.c with 98% similarity]
src/tests/common/test_common_isonumber.c [moved from tests/common/test_common_isonumber.c with 98% similarity]
src/tests/common/test_common_list.c [moved from tests/common/test_common_list.c with 99% similarity]
src/tests/common/test_common_netaddr.c [moved from tests/common/test_common_netaddr.c with 99% similarity]
src/tests/common/test_common_regex.c [moved from tests/common/test_common_regex.c with 97% similarity]
src/tests/common/test_common_string.c [moved from tests/common/test_common_string.c with 99% similarity]
src/tests/config/CMakeLists.txt [moved from tests/config/CMakeLists.txt with 70% similarity]
src/tests/config/test_config_cmd.c [moved from tests/config/test_config_cmd.c with 97% similarity]
src/tests/config/test_config_default.c [moved from tests/config/test_config_default.c with 97% similarity]
src/tests/config/test_config_delta.c [moved from tests/config/test_config_delta.c with 98% similarity]
src/tests/config/test_config_list.c [moved from tests/config/test_config_list.c with 98% similarity]
src/tests/config/test_config_mapping.c [moved from tests/config/test_config_mapping.c with 95% similarity]
src/tests/config/test_config_validation.c [moved from tests/config/test_config_validation.c with 99% similarity]
src/tests/cunit/CMakeLists.txt [moved from tests/cunit/CMakeLists.txt with 100% similarity]
src/tests/cunit/cunit.c [moved from tests/cunit/cunit.c with 98% similarity]
src/tests/rfc5444/CMakeLists.txt [moved from tests/rfc5444/CMakeLists.txt with 63% similarity]
src/tests/rfc5444/interop2010/CMakeLists.txt [moved from tests/rfc5444/interop2010/CMakeLists.txt with 87% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop.h [moved from tests/rfc5444/interop2010/test_rfc5444_interop.h with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_01.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_01.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_02.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_02.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_03.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_03.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_04.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_04.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_05.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_05.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_06.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_06.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_07.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_07.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_08.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_08.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_09.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_09.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_10.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_10.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_11.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_11.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_12.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_12.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_13.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_13.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_14.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_14.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_15.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_15.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_16.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_16.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_17.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_17.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_18.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_18.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_19.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_19.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_20.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_20.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_21.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_21.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_22.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_22.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_23.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_23.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_24.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_24.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_25.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_25.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_26.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_26.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_27.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_27.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_28.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_28.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_29.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_29.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_30.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_30.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_31.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_31.c with 98% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_32.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_32.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_33.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_33.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_34.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_34.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_35.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_35.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_36.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_36.c with 99% similarity]
src/tests/rfc5444/interop2010/test_rfc5444_interop2010_38.c [moved from tests/rfc5444/interop2010/test_rfc5444_interop2010_38.c with 98% similarity]
src/tests/rfc5444/special/CMakeLists.txt [new file with mode: 0644]
src/tests/rfc5444/special/test_nhdp_1.c [moved from tests/rfc5444/special/test_nhdp_1.c with 97% similarity]
src/tests/rfc5444/special/test_nhdp_2.c [moved from tests/rfc5444/special/test_nhdp_2.c with 97% similarity]
src/tests/rfc5444/special/test_nhdp_3.c [moved from tests/rfc5444/special/test_nhdp_3.c with 96% similarity]
src/tests/rfc5444/special/test_olsrv2_1.c [moved from tests/rfc5444/special/test_olsrv2_1.c with 96% similarity]
src/tests/rfc5444/test_rfc5444.c [moved from tests/rfc5444/test_rfc5444.c with 99% similarity]
src/tests/rfc5444/test_rfc5444_reader_blockcb.c [moved from tests/rfc5444/test_rfc5444_reader_blockcb.c with 98% similarity]
src/tests/rfc5444/test_rfc5444_reader_dropcontext.c [moved from tests/rfc5444/test_rfc5444_reader_dropcontext.c with 99% similarity]
src/tests/rfc5444/test_rfc5444_writer_fragmentation.c [moved from tests/rfc5444/test_rfc5444_writer_fragmentation.c with 98% similarity]
src/tests/rfc5444/test_rfc5444_writer_ifspecific.c [moved from tests/rfc5444/test_rfc5444_writer_ifspecific.c with 97% similarity]
src/tests/rfc5444/test_rfc5444_writer_mandatory.c [moved from tests/rfc5444/test_rfc5444_writer_mandatory.c with 97% similarity]
tests/rfc5444/special/CMakeLists.txt [deleted file]

index 27f9d13..1e6c0fd 100644 (file)
@@ -23,6 +23,9 @@ include (./cmake/lib_config.cmake)
 # include compiler flags
 include (./cmake/cc_flags.cmake)
 
+# include global variables
+include (./CMakeListsGlobal.cmake)
+
 ########################################
 #### get repository tag and version ####
 ########################################
@@ -88,10 +91,6 @@ add_definitions(-DBASEPATH_LENGTH=${BASELENGTH})
 # include build helper
 include (cmake/declare_library.cmake)
 
-# include files
-include_directories(${PROJECT_BINARY_DIR})
-include_directories(src-api)
-
 if (NOT OONF_NO_TESTING)
     ENABLE_TESTING()
 endif (NOT OONF_NO_TESTING)
@@ -102,11 +101,5 @@ add_custom_target(dynamic)
 add_custom_target(build_tests)
 
 # start compiling core and plugins
-add_subdirectory(src-api)
-add_subdirectory(src-plugins)
-# add_subdirectory(examples)
 add_subdirectory(src)
-
-if (NOT OONF_NO_TESTING)
-    add_subdirectory(tests)
-endif (NOT OONF_NO_TESTING)
+add_subdirectory(apps)
diff --git a/CMakeListsGlobal.cmake b/CMakeListsGlobal.cmake
new file mode 100644 (file)
index 0000000..794a3b2
--- /dev/null
@@ -0,0 +1,7 @@
+# set path to source for apps
+SET(APP_DATA_C_IN ${CMAKE_CURRENT_SOURCE_DIR}/src/main/app_data.c.in)
+SET(MAIN_C ${CMAKE_CURRENT_SOURCE_DIR}/src/main/main.c)
+
+# add include directoy
+include_directories(include)
+include_directories(${PROJECT_BINARY_DIR})
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
new file mode 100644 (file)
index 0000000..28fc18d
--- /dev/null
@@ -0,0 +1,6 @@
+# build framework
+add_subdirectory(dlep-radio)
+add_subdirectory(dlep-router)
+add_subdirectory(olsrd2)
+add_subdirectory(olsrd2-dlep)
+add_subdirectory(oonf)
index ad3a864..0edebd2 100644 (file)
@@ -43,7 +43,7 @@ function (oonf_create_library libname source include link_internal linkto_extern
 endfunction (oonf_create_library)
 
 function (oonf_create_plugin libname source include linkto_external)
-    SET (linkto_internal oonf_core oonf_config oonf_common)
+    SET (linkto_internal oonf_libcore oonf_libconfig oonf_libcommon)
     
     oonf_create_library("${libname}" "${source}" "${include}" "${linkto_internal}" "${linkto_external}")
 endfunction (oonf_create_plugin)
index 1009850..652ce1a 100644 (file)
@@ -16,7 +16,7 @@ function (oonf_create_install_target name)
             ADD_DEPENDENCIES(install_${name} ${lib})
             ADD_DEPENDENCIES(install_${name} install_${lib})
         ENDIF(TARGET ${lib})
-    ENDFOREACH(lib)     
+    ENDFOREACH(lib)
 endfunction (oonf_create_install_target)
     
 function (oonf_create_app executable static_plugins optional_static_plugins)
@@ -36,7 +36,7 @@ function (oonf_create_app executable static_plugins optional_static_plugins)
     SET(STATIC_PLUGIN_LIST )
     
     # generate configuration file
-    configure_file(${CMAKE_SOURCE_DIR}/src/app_data.c.in ${PROJECT_BINARY_DIR}/${executable}_app_data.c)
+    configure_file(${APP_DATA_C_IN} ${PROJECT_BINARY_DIR}/${executable}_app_data.c)
 
     FOREACH(plugin ${optional_static_plugins})
         list(FIND static_plugins ${plugin} insanity)
@@ -78,24 +78,27 @@ function (oonf_create_app executable static_plugins optional_static_plugins)
     ENDFOREACH(plugin)
 
     # create executables
-    ADD_EXECUTABLE(${executable}_dynamic ${CMAKE_SOURCE_DIR}/src/main.c
+    ADD_EXECUTABLE(${executable}_dynamic ${MAIN_C}
                                          ${PROJECT_BINARY_DIR}/${executable}_app_data.c
                                          ${OBJECT_TARGETS})
-    ADD_EXECUTABLE(${executable}_static  ${CMAKE_SOURCE_DIR}/src/main.c
+    ADD_EXECUTABLE(${executable}_static  ${MAIN_C}
                                          ${PROJECT_BINARY_DIR}/${executable}_app_data.c
                                          ${OBJECT_TARGETS}
-                                         $<TARGET_OBJECTS:oonf_static_common>
-                                         $<TARGET_OBJECTS:oonf_static_config>
-                                         $<TARGET_OBJECTS:oonf_static_core>)
+                                         $<TARGET_OBJECTS:oonf_static_libcommon>
+                                         $<TARGET_OBJECTS:oonf_static_libconfig>
+                                         $<TARGET_OBJECTS:oonf_static_libcore>
+                                         $<TARGET_OBJECTS:oonf_static_librfc5444>
+                                        )
 
     # Add executables to static/dynamic target
     ADD_DEPENDENCIES(dynamic ${executable}_dynamic)
     ADD_DEPENDENCIES(static  ${executable}_static)
     
     # link framework libraries to dynamic executable
-    TARGET_LINK_LIBRARIES(${executable}_dynamic PUBLIC oonf_core
-                                                       oonf_config
-                                                       oonf_common)
+    TARGET_LINK_LIBRARIES(${executable}_dynamic PUBLIC oonf_librfc5444
+                                                       oonf_libcore
+                                                       oonf_libconfig
+                                                       oonf_libcommon)
 
     # link external libraries directly to executable
     TARGET_LINK_LIBRARIES(${executable}_dynamic PUBLIC ${EXTERNAL_LIBRARIES})
index 30d40db..28e5477 100755 (executable)
@@ -36,19 +36,19 @@ TARPREFIX=${TARGET}_${VERSION}
 TARBALL=${BUILDDIR}/${TARPREFIX}.orig.tar.gz
 
 # check if target is there and prepared for a debian package
-if [ ! -d ${SOURCE}/src/${TARGET} ]
+if [ ! -d ${SOURCE}/apps/${TARGET} ]
 then
     echo "Could not find target '${TARGET}'"
     exit 1
 fi
 
-if [ ! -f ${SOURCE}/src/${TARGET}/debian/changelog ]
+if [ ! -f ${SOURCE}/apps/${TARGET}/debian/changelog ]
 then
     echo "Could not find target '${TARGET}' debian changelog"
     exit 1
 fi
 
-if [ ! -f ${SOURCE}/src/${TARGET}/debian/control ]
+if [ ! -f ${SOURCE}/apps/${TARGET}/debian/control ]
 then
     echo "Could not find target '${TARGET}' debian control file"
     exit 1
@@ -81,7 +81,7 @@ tar xf ${TARBALL}
 # build debian directory from template
 cd ${TARPREFIX}
 
-cp -r ${SOURCE}/src/${TARGET}/debian ./
+cp -r ${SOURCE}/apps/${TARGET}/debian ./
 cp ${SOURCE}/files/default_licence.txt ./debian/copyright
 
 # adapt changelog template
@@ -46,7 +46,7 @@
 #ifndef HASH_POLARSSL_H_
 #define HASH_POLARSSL_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 /*! subsystem identifier */
 #define OONF_HASH_POLARSSL_SUBSYSTEM "hash_polarssl"
@@ -46,7 +46,7 @@
 #ifndef HASH_LIBTOMCRYPT_H_
 #define HASH_LIBTOMCRYPT_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 /*! subsystem identifier */
 #define OONF_HASH_TOMCRYPT_SUBSYSTEM "hash_tomcrypt"
 #ifndef RFC5444_SIGNATURE_H_
 #define RFC5444_SIGNATURE_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "rfc7182_provider/rfc7182_provider.h"
-#include "subsystems/oonf_rfc5444.h"
-#include "subsystems/rfc5444/rfc5444_writer.h"
+#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/librfc5444/rfc5444_writer.h>
 
 enum
 {
@@ -46,8 +46,8 @@
 #ifndef RFC7182_PROVIDER_H_
 #define RFC7182_PROVIDER_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
 
 /**
  * representation of a hash function for signatures
similarity index 98%
rename from tests/cunit/cunit.h
rename to include/oonf/cunit/cunit.h
index f1e89a9..d32fcd4 100644 (file)
@@ -46,7 +46,7 @@
 #ifndef CUNIT_H_
 #define CUNIT_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 EXPORT void BEGIN_TESTING(void (*clear_elements)(void));
 EXPORT int FINISH_TESTING(void);
similarity index 98%
rename from src-plugins/generic/dlep/dlep_extension.h
rename to include/oonf/generic/dlep/dlep_extension.h
index 2c2ccee..45bb082 100644 (file)
 
 struct dlep_extension;
 
-#include "common/autobuf.h"
-#include "common/avl.h"
-#include "common/common_types.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
 
-#include "subsystems/oonf_layer2.h"
+#include <oonf/subsystems/oonf_layer2.h>
 
-#include "dlep/dlep_session.h"
+#include <oonf/generic/dlep/dlep_session.h>
 
 /**
  * Extension for a specific DLEP signal
similarity index 96%
rename from src-plugins/generic/dlep/dlep_interface.h
rename to include/oonf/generic/dlep/dlep_interface.h
index f8a9b57..8ac0d20 100644 (file)
 #ifndef DLEP_INTERFACE_H_
 #define DLEP_INTERFACE_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "core/oonf_logging.h"
-#include "subsystems/oonf_packet_socket.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcore/oonf_logging.h>
+#include <oonf/subsystems/oonf_packet_socket.h>
 
 #define DLEP_IF_UDP_NONE_STR           "none"
 #define DLEP_IF_UDP_SINGLE_SESSION_STR "single_session"
similarity index 96%
rename from src-plugins/generic/dlep/dlep_reader.h
rename to include/oonf/generic/dlep/dlep_reader.h
index 5e28e8a..193b995 100644 (file)
 #ifndef _DLEP_READER_H_
 #define _DLEP_READER_H_
 
-#include "common/common_types.h"
-#include "common/netaddr.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
 
-#include "subsystems/oonf_layer2.h"
+#include <oonf/subsystems/oonf_layer2.h>
 
-#include "dlep/dlep_extension.h"
+#include <oonf/generic/dlep/dlep_extension.h>
 
 int dlep_reader_heartbeat_tlv(uint64_t *interval, struct dlep_session *session, struct dlep_parser_value *value);
 int dlep_reader_peer_type(
similarity index 97%
rename from src-plugins/generic/dlep/dlep_session.h
rename to include/oonf/generic/dlep/dlep_session.h
index 8a3dcfd..c20118b 100644 (file)
 struct dlep_session;
 struct dlep_writer;
 
-#include "common/autobuf.h"
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/netaddr.h"
-#include "subsystems/oonf_layer2.h"
-#include "subsystems/oonf_stream_socket.h"
-#include "subsystems/oonf_timer.h"
-#include "subsystems/os_interface.h"
-
-#include "dlep/dlep_extension.h"
-#include "dlep/dlep_iana.h"
+#include <oonf/libcommon/autobuf.h>
+#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/generic/dlep/dlep_extension.h>
+#include <oonf/generic/dlep/dlep_iana.h>
 
 /**
  * Return codes for DLEP parser
similarity index 95%
rename from src-plugins/generic/dlep/dlep_writer.h
rename to include/oonf/generic/dlep/dlep_writer.h
index 4eb9185..b1ec95c 100644 (file)
 #ifndef DLEP_WRITER_H_
 #define DLEP_WRITER_H_
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
-#include "common/netaddr.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
 
-#include "subsystems/oonf_layer2.h"
+#include <oonf/subsystems/oonf_layer2.h>
 
-#include "dlep/dlep_session.h"
+#include <oonf/generic/dlep/dlep_session.h>
 
 void dlep_writer_start_signal(struct dlep_writer *writer, uint16_t signal_type);
 void dlep_writer_add_tlv(struct dlep_writer *writer, uint16_t type, const void *data, uint16_t len);
similarity index 93%
rename from src-plugins/generic/dlep/ext_base_ip/ip.h
rename to include/oonf/generic/dlep/ext_base_ip/ip.h
index bab064d..ae6f9e2 100644 (file)
 #ifndef _DLEP_IP_H_
 #define _DLEP_IP_H_
 
-#include "common/common_types.h"
-#include "common/netaddr.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
 
-#include "dlep/dlep_extension.h"
-#include "dlep/dlep_session.h"
+#include <oonf/generic/dlep/dlep_extension.h>
+#include <oonf/generic/dlep/dlep_session.h>
 
 struct dlep_extension *dlep_base_ip_init(void);
 void dlep_base_ip_cleanup(void);
 #ifndef _METRIC_H_
 #define _METRIC_H_
 
-#include "common/common_types.h"
-#include "common/netaddr.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
 
-#include "dlep/dlep_extension.h"
-#include "dlep/dlep_session.h"
+#include <oonf/generic/dlep/dlep_extension.h>
+#include <oonf/generic/dlep/dlep_session.h>
 
 struct dlep_extension *dlep_base_metric_init(void);
 
 #ifndef _PROTO_H_
 #define _PROTO_H_
 
-#include "common/common_types.h"
-#include "common/netaddr.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
 
-#include "subsystems/oonf_layer2.h"
-#include "dlep/dlep_extension.h"
-#include "dlep/dlep_session.h"
+#include <oonf/subsystems/oonf_layer2.h>
+#include <oonf/generic/dlep/dlep_extension.h>
+#include <oonf/generic/dlep/dlep_session.h>
 
 struct dlep_extension *dlep_base_proto_init(void);
 void dlep_base_proto_start_local_heartbeat(struct dlep_session *session);
@@ -46,7 +46,7 @@
 #ifndef _PROTO_ROUTER_H_
 #define _PROTO_ROUTER_H_
 
-#include "core/oonf_logging.h"
+#include <oonf/libcore/oonf_logging.h>
 
 void dlep_base_proto_router_init(void);
 
@@ -46,9 +46,9 @@
 #ifndef _DLEP_L1_STATISTICS_H_
 #define _DLEP_L1_STATISTICS_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
-#include "dlep/dlep_extension.h"
+#include <oonf/generic/dlep/dlep_extension.h>
 
 struct dlep_extension *dlep_l1_statistics_init(void);
 
@@ -46,9 +46,9 @@
 #ifndef _DLEP_L2_STATISTICS_H_
 #define _DLEP_L2_STATISTICS_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
-#include "dlep/dlep_extension.h"
+#include <oonf/generic/dlep/dlep_extension.h>
 
 struct dlep_extension *dlep_l2_statistics_init(void);
 
similarity index 96%
rename from src-plugins/generic/dlep/ext_lid/lid.h
rename to include/oonf/generic/dlep/ext_lid/lid.h
index 6a75ebd..5425095 100644 (file)
@@ -46,9 +46,9 @@
 #ifndef _DLEP_LID_H_
 #define _DLEP_LID_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
-#include "dlep/dlep_extension.h"
+#include <oonf/generic/dlep/dlep_extension.h>
 
 struct dlep_extension *dlep_lid_init(void);
 
@@ -46,9 +46,9 @@
 #ifndef _DLEP_RADIO_ATTRIBUTES_H_
 #define _DLEP_RADIO_ATTRIBUTES_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
-#include "dlep/dlep_extension.h"
+#include <oonf/generic/dlep/dlep_extension.h>
 
 struct dlep_extension *dlep_radio_attributes_init(void);
 
 #ifndef DLEP_RADIO_INTERFACE_H_
 #define DLEP_RADIO_INTERFACE_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "subsystems/oonf_packet_socket.h"
-#include "subsystems/oonf_stream_socket.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/subsystems/oonf_packet_socket.h>
+#include <oonf/subsystems/oonf_stream_socket.h>
 
-#include "dlep/dlep_interface.h"
-#include "dlep/dlep_session.h"
+#include <oonf/generic/dlep/dlep_interface.h>
+#include <oonf/generic/dlep/dlep_session.h>
 
 /**
  * DLEP radio session
@@ -46,7 +46,7 @@
 #ifndef DLEP_RADIO_INTERNAL_H_
 #define DLEP_RADIO_INTERNAL_H_
 
-#include "core/oonf_logging.h"
+#include <oonf/libcore/oonf_logging.h>
 
 /* headers only for use inside the DLEP_RADIO subsystem */
 enum oonf_log_source LOG_DLEP_RADIO;
 #ifndef DLEP_RADIO_SESSION_H_
 #define DLEP_RADIO_SESSION_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "core/oonf_subsystem.h"
-#include "subsystems/oonf_packet_socket.h"
-#include "subsystems/oonf_stream_socket.h"
-#include "subsystems/oonf_timer.h"
+#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 "dlep/dlep_session.h"
-#include "dlep/radio/dlep_radio_session.h"
+#include <oonf/generic/dlep/dlep_session.h>
+#include <oonf/generic/dlep/radio/dlep_radio_session.h>
 
 /**
  * DLEP radio session state
 #ifndef DLEP_ROUTER_INTERFACE_H_
 #define DLEP_ROUTER_INTERFACE_H_
 
-#include "common/common_types.h"
-#include "common/netaddr.h"
-#include "subsystems/oonf_timer.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/subsystems/oonf_timer.h>
 
-#include "dlep/dlep_interface.h"
-#include "dlep/dlep_session.h"
+#include <oonf/generic/dlep/dlep_interface.h>
+#include <oonf/generic/dlep/dlep_session.h>
 
 /**
  * DLEP router interface
@@ -46,7 +46,7 @@
 #ifndef DLEP_ROUTER_INTERNAL_H_
 #define DLEP_ROUTER_INTERNAL_H_
 
-#include "core/oonf_logging.h"
+#include <oonf/libcore/oonf_logging.h>
 
 /* headers only for use inside the DLEP_ROUTER subsystem */
 enum oonf_log_source LOG_DLEP_ROUTER;
 #ifndef DLEP_ROUTER_SESSION_H_
 #define DLEP_ROUTER_SESSION_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/netaddr.h"
-#include "subsystems/oonf_stream_socket.h"
-#include "subsystems/oonf_timer.h"
-#include "subsystems/os_interface.h"
-
-#include "dlep/router/dlep_router_interface.h"
+#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/generic/dlep/router/dlep_router_interface.h>
 
 /**
  * session state of a router
@@ -48,7 +48,7 @@
 
 #include <linux/netlink.h>
 
-#include "nl80211_listener/nl80211_listener.h"
+#include <oonf/generic/nl80211_listener/nl80211_listener.h>
 
 void genl_send_get_family(struct nlmsghdr *nl_msg, struct genlmsghdr *hdr);
 void genl_process_get_family_result(struct nlmsghdr *hdr, uint32_t *nl80211_id, uint32_t *nl80211_mc);
@@ -48,7 +48,7 @@
 
 #include <linux/netlink.h>
 
-#include "nl80211_listener/nl80211_listener.h"
+#include <oonf/generic/nl80211_listener/nl80211_listener.h>
 
 void nl80211_send_get_interface(
   struct os_system_netlink *nl, struct nlmsghdr *nl_msg, struct genlmsghdr *hdr, struct nl80211_if *interf);
@@ -46,7 +46,7 @@
 #ifndef NL80211_GET_MPP_H_
 #define NL80211_GET_MPP_H_
 
-#include "nl80211_listener/nl80211_listener.h"
+#include <oonf/generic/nl80211_listener/nl80211_listener.h>
 
 void nl80211_send_get_mpp(
   struct os_system_netlink *nl, struct nlmsghdr *nl_msg, struct genlmsghdr *hdr, struct nl80211_if *interf);
@@ -46,7 +46,7 @@
 #ifndef NL80211_GET_STATION_DUMP_H_
 #define NL80211_GET_STATION_DUMP_H_
 
-#include "nl80211_listener/nl80211_listener.h"
+#include <oonf/generic/nl80211_listener/nl80211_listener.h>
 
 void nl80211_send_get_station_dump(
   struct os_system_netlink *nl, struct nlmsghdr *nl_msg, struct genlmsghdr *hdr, struct nl80211_if *interf);
@@ -48,7 +48,7 @@
 
 #include <linux/netlink.h>
 
-#include "nl80211_listener/nl80211_listener.h"
+#include <oonf/generic/nl80211_listener/nl80211_listener.h>
 
 void nl80211_send_get_survey(
   struct os_system_netlink *nl, struct nlmsghdr *nl_msg, struct genlmsghdr *hdr, struct nl80211_if *interf);
@@ -48,7 +48,7 @@
 
 #include <linux/netlink.h>
 
-#include "nl80211_listener/nl80211_listener.h"
+#include <oonf/generic/nl80211_listener/nl80211_listener.h>
 
 void nl80211_send_get_wiphy(
   struct os_system_netlink *nl, struct nlmsghdr *nl_msg, struct genlmsghdr *hdr, struct nl80211_if *interf);
@@ -46,7 +46,7 @@
 #ifndef NL80211_INTERNAL_H_
 #define NL80211_INTERNAL_H_
 
-#include "core/oonf_logging.h"
+#include <oonf/libcore/oonf_logging.h>
 
 /* headers only for use inside the NL80211 subsystem */
 enum oonf_log_source LOG_NL80211;
 #ifndef NL80211_LISTENER_H_
 #define NL80211_LISTENER_H_
 
-#include "common/common_types.h"
-#include "core/oonf_subsystem.h"
-#include "subsystems/oonf_layer2.h"
-#include "subsystems/os_interface.h"
+#include <oonf/oonf.h>
+#include <oonf/libcore/oonf_subsystem.h>
+#include <oonf/subsystems/oonf_layer2.h>
+#include <oonf/subsystems/os_interface.h>
 
 /*! subsystem identifier */
 #define OONF_NL80211_LISTENER_SUBSYSTEM "nl80211_listener"
similarity index 99%
rename from src-api/common/autobuf.h
rename to include/oonf/libcommon/autobuf.h
index b013df8..20e7e78 100644 (file)
@@ -50,7 +50,7 @@
 #include <string.h>
 #include <time.h>
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 /**
  * Auto-sized buffer handler, mostly used for generation of
similarity index 99%
rename from src-api/common/avl.h
rename to include/oonf/libcommon/avl.h
index 1ce72e8..c8f7f38 100644 (file)
@@ -48,9 +48,9 @@
 
 #include <stddef.h>
 
-#include "common/common_types.h"
-#include "container_of.h"
-#include "list.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/container_of.h>
+#include <oonf/libcommon/list.h>
 
 /**
  * Static initializer for AVL tree
similarity index 97%
rename from src-api/common/avl_comp.h
rename to include/oonf/libcommon/avl_comp.h
index 928f99b..50a9fee 100644 (file)
@@ -46,8 +46,8 @@
 #ifndef AVL_COMP_H_
 #define AVL_COMP_H_
 
-#include "common/common_types.h"
-#include "common/netaddr.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
 
 EXPORT int avl_comp_uint32(const void *k1, const void *k2);
 EXPORT int avl_comp_int32(const void *k1, const void *k2);
similarity index 98%
rename from src-api/common/bitmap256.h
rename to include/oonf/libcommon/bitmap256.h
index c1aab99..b07639a 100644 (file)
@@ -46,7 +46,7 @@
 #ifndef DLEP_SIGNAL_H_
 #define DLEP_SIGNAL_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 /*! keyword for setting all bits in a bitmap */
 #define BITMAP256_ALL "all"
similarity index 97%
rename from src-api/common/bitstream.h
rename to include/oonf/libcommon/bitstream.h
index d973548..c514541 100644 (file)
@@ -8,7 +8,7 @@
 #ifndef SRC_COMMON_BITSTREAM_H_
 #define SRC_COMMON_BITSTREAM_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 struct bitstream_r {
   const void *ptr;
similarity index 99%
rename from src-api/common/container_of.h
rename to include/oonf/libcommon/container_of.h
index ec9af13..8446429 100644 (file)
@@ -46,7 +46,7 @@
 #ifndef CONTAINER_OF_H_
 #define CONTAINER_OF_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 #include <stddef.h>
 
 #ifndef typeof
similarity index 98%
rename from src-api/common/isonumber.h
rename to include/oonf/libcommon/isonumber.h
index 12ca964..7ea106d 100644 (file)
@@ -46,7 +46,7 @@
 #ifndef ISONUMBER_H_
 #define ISONUMBER_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 /**
  * buffer for the string representation of a fractional
similarity index 96%
rename from src-api/common/json.h
rename to include/oonf/libcommon/json.h
index c14e869..1efc0ce 100644 (file)
@@ -46,9 +46,9 @@
 #ifndef JSON_H_
 #define JSON_H_
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
-#include "common/template.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/template.h>
 
 /**
  * contains the session variables for JSON generation
similarity index 99%
rename from src-api/common/list.h
rename to include/oonf/libcommon/list.h
index a0da020..cfb021c 100644 (file)
@@ -48,8 +48,8 @@
 
 #include <stddef.h>
 
-#include "common/common_types.h"
-#include "common/container_of.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/container_of.h>
 
 /**
  * this struct is used as list head and list elements.
similarity index 99%
rename from src-api/common/netaddr.h
rename to include/oonf/libcommon/netaddr.h
index cf0d05f..2fb598e 100644 (file)
@@ -60,8 +60,8 @@
 
 #include <string.h>
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
 
 enum
 {
similarity index 97%
rename from src-api/common/netaddr_acl.h
rename to include/oonf/libcommon/netaddr_acl.h
index ea9ce4b..cf42482 100644 (file)
@@ -46,9 +46,9 @@
 #ifndef NETADDR_ACL_H_
 #define NETADDR_ACL_H_
 
-#include "common/common_types.h"
-#include "common/netaddr.h"
-#include "common/string.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/libcommon/string.h>
 
 /*
  * Text commands within ACL lists.
similarity index 99%
rename from src-api/common/string.h
rename to include/oonf/libcommon/string.h
index 23a9118..38c54cd 100644 (file)
@@ -51,7 +51,7 @@
 #include <string.h>
 #include <strings.h>
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 enum
 {
similarity index 98%
rename from src-api/common/template.h
rename to include/oonf/libcommon/template.h
index 85856fc..ed2b9cb 100644 (file)
@@ -46,8 +46,8 @@
 #ifndef TEMPLATE_H_
 #define TEMPLATE_H_
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
 
 /*! text name for json boolean true value */
 #define TEMPLATE_JSON_TRUE "true"
similarity index 95%
rename from src-api/config/cfg.h
rename to include/oonf/libconfig/cfg.h
index eefd1af..b7ddef8 100644 (file)
@@ -51,13 +51,13 @@ struct cfg_instance;
 
 #include <ctype.h>
 
-#include "common/autobuf.h"
-#include "common/avl.h"
-#include "common/common_types.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
 
-#include "config/cfg_cmd.h"
-#include "config/cfg_io.h"
-#include "config/cfg_schema.h"
+#include <oonf/libconfig/cfg_cmd.h>
+#include <oonf/libconfig/cfg_io.h>
+#include <oonf/libconfig/cfg_schema.h>
 
 /*! Separator for configuration URL */
 #define CFG_IO_URL_SPLITTER "://"
similarity index 95%
rename from src-api/config/cfg_cmd.h
rename to include/oonf/libconfig/cfg_cmd.h
index da09b3a..d4ace0c 100644 (file)
 #ifndef CFG_CMD_H_
 #define CFG_CMD_H_
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
 
-#include "config/cfg.h"
-#include "config/cfg_db.h"
+#include <oonf/libconfig/cfg.h>
+#include <oonf/libconfig/cfg_db.h>
 
 /* state for parsing a command line */
 EXPORT int cfg_cmd_handle_set(struct cfg_instance *instance, struct cfg_db *db, const char *arg, struct autobuf *log);
similarity index 99%
rename from src-api/config/cfg_db.h
rename to include/oonf/libconfig/cfg_db.h
index 70b6720..d66c256 100644 (file)
@@ -52,11 +52,11 @@ struct cfg_section_type;
 struct cfg_named_section;
 struct cfg_entry;
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/string.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/string.h>
 
-#include "config/cfg_schema.h"
+#include <oonf/libconfig/cfg_schema.h>
 
 /**
  * Represents a single database with configuration entries
similarity index 96%
rename from src-api/config/cfg_help.h
rename to include/oonf/libconfig/cfg_help.h
index c399ad2..3a6c4d6 100644 (file)
@@ -46,9 +46,9 @@
 #ifndef CFG_HELP_H_
 #define CFG_HELP_H_
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
-#include "config/cfg_schema.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
+#include <oonf/libconfig/cfg_schema.h>
 
 /*! prefix before help text parameter explanation */
 #define CFG_HELP_INDENT_PREFIX "    "
similarity index 96%
rename from src-api/config/cfg_io.h
rename to include/oonf/libconfig/cfg_io.h
index 11f9e51..f1eac5a 100644 (file)
 /* forward declaration */
 struct cfg_io;
 
-#include "common/autobuf.h"
-#include "common/avl.h"
-#include "common/common_types.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
 
-#include "config/cfg.h"
+#include <oonf/libconfig/cfg.h>
 
 /**
  *  Represents a single IO-Handler
similarity index 99%
rename from src-api/config/cfg_schema.h
rename to include/oonf/libconfig/cfg_schema.h
index e687052..fba7856 100644 (file)
@@ -59,12 +59,12 @@ struct cfg_schema_entry;
 #include <ws2tcpip.h>
 #endif
 
-#include "common/autobuf.h"
-#include "common/avl.h"
-#include "common/netaddr.h"
-#include "common/string.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/libcommon/avl.h>
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/libcommon/string.h>
 
-#include "config/cfg_db.h"
+#include <oonf/libconfig/cfg_db.h>
 
 /* macros for creating schema entries */
 #if !defined(REMOVE_HELPTEXT)
similarity index 95%
rename from src-api/config/cfg_tobin.h
rename to include/oonf/libconfig/cfg_tobin.h
index 40b5cd0..205aa8b 100644 (file)
@@ -8,8 +8,8 @@
 #ifndef CFG_TOBIN_H_
 #define CFG_TOBIN_H_
 
-#include "common/common_types.h"
-#include "common/string.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/string.h>
 
 EXPORT int cfg_tobin_strptr(void *reference, size_t bin_size, const struct const_strarray *value);
 EXPORT int cfg_tobin_strarray(void *reference, size_t bin_size, const struct const_strarray *value, size_t array_size);
similarity index 97%
rename from src-api/config/cfg_validate.h
rename to include/oonf/libconfig/cfg_validate.h
index bf9935c..796ae9c 100644 (file)
@@ -46,9 +46,9 @@
 #ifndef CFG_VALIDATE_H_
 #define CFG_VALIDATE_H_
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
-#include "config/cfg_schema.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
+#include <oonf/libconfig/cfg_schema.h>
 
 EXPORT int cfg_validate_printable(
   struct autobuf *out, const char *section_name, const char *entry_name, const char *value, size_t len);
similarity index 98%
rename from src-api/core/app_data.h
rename to include/oonf/libcore/app_data.h
index 50895cd..0afa7ed 100644 (file)
@@ -46,7 +46,7 @@
 #ifndef OONF_APP_CONFIG_H_
 #define OONF_APP_CONFIG_H_
 
-#include "core/oonf_logging.h"
+#include <oonf/libcore/oonf_logging.h>
 
 /**
  * Automatically generated function that returns a pointer to the
similarity index 98%
rename from src-api/core/oonf_appdata.h
rename to include/oonf/libcore/oonf_appdata.h
index f6b396a..e5df99e 100644 (file)
@@ -46,7 +46,7 @@
 #ifndef OONF_APPDATA_H_
 #define OONF_APPDATA_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 /**
  * This structure contains the application data defined in the build script
similarity index 94%
rename from src-api/core/oonf_cfg.h
rename to include/oonf/libcore/oonf_cfg.h
index 4f63a67..6fbe81d 100644 (file)
 #ifndef OONF_CFG_H_
 #define OONF_CFG_H_
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
-#include "common/list.h"
-#include "common/netaddr.h"
-#include "config/cfg_schema.h"
-#include "core/oonf_subsystem.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/list.h>
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/libconfig/cfg_schema.h>
+#include <oonf/libcore/oonf_subsystem.h>
 
 /**
  * global configuration data for core API
similarity index 98%
rename from src-api/core/oonf_libdata.h
rename to include/oonf/libcore/oonf_libdata.h
index 9d132ca..df23500 100644 (file)
@@ -46,7 +46,7 @@
 #ifndef BUILDDATA_H_
 #define BUILDDATA_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 /**
  * This structure contains the library data defined in the build script
similarity index 98%
rename from src-api/core/oonf_logging.h
rename to include/oonf/libcore/oonf_logging.h
index d308d13..fc8b869 100644 (file)
@@ -51,11 +51,11 @@ struct oonf_log_handler_entry;
 #include <string.h>
 #include <stdlib.h>
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
-#include "common/list.h"
-#include "core/oonf_appdata.h"
-#include "core/oonf_libdata.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/list.h>
+#include <oonf/libcore/oonf_appdata.h>
+#include <oonf/libcore/oonf_libdata.h>
 
 /**
  * defines the severity of a logging event
similarity index 95%
rename from src-api/core/oonf_logging_cfg.h
rename to include/oonf/libcore/oonf_logging_cfg.h
index ae9bf5c..37fd3ee 100644 (file)
 #ifndef OONF_LOGGING_CFG_H_
 #define OONF_LOGGING_CFG_H_
 
-#include "common/common_types.h"
-#include "config/cfg_db.h"
-#include "config/cfg_schema.h"
+#include <oonf/oonf.h>
+#include <oonf/libconfig/cfg_db.h>
+#include <oonf/libconfig/cfg_schema.h>
 
-#include "core/oonf_logging.h"
+#include <oonf/libcore/oonf_logging.h>
 
 /**
  * Creates a cfg_schema_entry for a logging source parameter.
similarity index 97%
rename from src-api/core/oonf_main.h
rename to include/oonf/libcore/oonf_main.h
index 8dbfbb9..129c1c4 100644 (file)
@@ -46,8 +46,8 @@
 #ifndef OONF_MAIN_H_
 #define OONF_MAIN_H_
 
-#include "common/common_types.h"
-#include "core/oonf_logging.h"
+#include <oonf/oonf.h>
+#include <oonf/libcore/oonf_logging.h>
 
 EXPORT int oonf_main(int argc, char **argv, const struct oonf_appdata *);
 EXPORT int oonf_main_set_scheduler(int (*scheduler)(void));
similarity index 97%
rename from src-api/core/oonf_subsystem.h
rename to include/oonf/libcore/oonf_subsystem.h
index 5474a23..d12c8cf 100644 (file)
  * @file
  */
 
-#ifndef OONF_H_
-#define OONF_H_
+#ifndef OONF_SUBSYSTEM_H_
+#define OONF_SUBSYSTEM_H_
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "common/common_types.h"
-#include "config/cfg_schema.h"
+#include <oonf/oonf.h>
+#include <oonf/libconfig/cfg_schema.h>
 
-#include "core/oonf_logging.h"
+#include <oonf/libcore/oonf_logging.h>
 
 /*! maximum size of subsystem name */
 #define OONF_SUBSYSTEM_NAMESIZE 32
@@ -206,4 +206,4 @@ oonf_subsystem_is_dynamic(struct oonf_subsystem *subsystem) {
   return subsystem->_dlhandle != NULL;
 }
 
-#endif /* OONF_H_ */
+#endif /* OONF_SUBSYSTEM_H_ */
similarity index 95%
rename from src-api/core/os_core.h
rename to include/oonf/libcore/os_core.h
index 62ffdc4..d6d9be2 100644 (file)
@@ -48,8 +48,8 @@
 
 #include <sys/time.h>
 
-#include "common/common_types.h"
-#include "core/oonf_logging.h"
+#include <oonf/oonf.h>
+#include <oonf/libcore/oonf_logging.h>
 
 /* pre-decleare inlines */
 static INLINE int os_core_gettimeofday(struct timeval *tv);
@@ -62,7 +62,7 @@ static INLINE int os_core_create_lockfile(const char *);
 static INLINE int os_core_get_random(void *dst, size_t length);
 
 #if defined(__linux__)
-#include "os_linux/os_core_linux.h"
+#include <oonf/libcore/os_linux/os_core_linux.h>
 #else
 #error "Unknown operation system"
 #endif
@@ -46,7 +46,7 @@
 #ifndef OS_CORE_GENERIC_SYSLOG_H_
 #define OS_CORE_GENERIC_SYSLOG_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 void os_core_generic_syslog_init(const char *appname);
 void os_core_generic_syslog_cleanup(void);
similarity index 97%
rename from src-api/core/os_linux/os_core_linux.h
rename to include/oonf/libcore/os_linux/os_core_linux.h
index 80c35ee..ddf37cd 100644 (file)
@@ -49,8 +49,8 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
-#include "core/os_core.h"
-#include "core/os_generic/os_core_generic_syslog.h"
+#include <oonf/libcore/os_core.h>
+#include <oonf/libcore/os_generic/os_core_generic_syslog.h>
 
 /*! default folder for Linux lockfile */
 #define OS_CORE_LOCKFILE_FOLDER "/var/run/"
similarity index 98%
rename from src-plugins/subsystems/rfc5444/rfc5444.h
rename to include/oonf/librfc5444/rfc5444.h
index d7e7a7e..080a5fb 100644 (file)
@@ -45,8 +45,8 @@
 #ifndef RFC5444_CONVERSION_H_
 #define RFC5444_CONVERSION_H_
 
-#include "common/common_types.h"
-#include "rfc5444_iana.h"
+#include <oonf/oonf.h>
+#include <oonf/librfc5444/rfc5444_iana.h>
 
 enum
 {
similarity index 98%
rename from src-plugins/subsystems/rfc5444/rfc5444_context.h
rename to include/oonf/librfc5444/rfc5444_context.h
index b185a7b..346df5e 100644 (file)
@@ -45,8 +45,8 @@
 #ifndef RFC5444_CONTEXT_H_
 #define RFC5444_CONTEXT_H_
 
-#include "common/common_types.h"
-#include "rfc5444_api_config.h"
+#include <oonf/oonf.h>
+#include <oonf/librfc5444/rfc5444_api_config.h>
 
 /**
  * Return values for reader callbacks and API calls (and internal functions)
similarity index 99%
rename from src-plugins/subsystems/rfc5444/rfc5444_iana.h
rename to include/oonf/librfc5444/rfc5444_iana.h
index 57a281b..0b33820 100644 (file)
@@ -46,8 +46,8 @@
 #ifndef RFC5444_IANA_H_
 #define RFC5444_IANA_H_
 
-#include "common/common_types.h"
-#include "common/netaddr.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
 
 /**
  * IANA network registration for RFC5444 (RFC 5498)
similarity index 96%
rename from src-plugins/subsystems/rfc5444/rfc5444_print.h
rename to include/oonf/librfc5444/rfc5444_print.h
index 26cae9d..8257ba4 100644 (file)
@@ -45,9 +45,9 @@
 #ifndef PRINT_RFC5444_H_
 #define PRINT_RFC5444_H_
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
-#include "rfc5444_reader.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
+#include <oonf/librfc5444/rfc5444_reader.h>
 
 /**
  * RFC5444 printer session
similarity index 98%
rename from src-plugins/subsystems/rfc5444/rfc5444_reader.h
rename to include/oonf/librfc5444/rfc5444_reader.h
index afee492..0804299 100644 (file)
 #ifndef RFC5444_PARSER_H_
 #define RFC5444_PARSER_H_
 
-#include "common/avl.h"
-#include "common/bitmap256.h"
-#include "common/common_types.h"
-#include "common/netaddr.h"
-#include "rfc5444_context.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/libcommon/bitmap256.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/librfc5444/rfc5444_context.h>
 
 /**
  * type of context for a rfc5444_reader_tlvblock_context
@@ -46,7 +46,7 @@
 #ifndef RFC5444_TLV_WRITER_H_
 #define RFC5444_TLV_WRITER_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 /**
  * tlv write session
similarity index 98%
rename from src-plugins/subsystems/rfc5444/rfc5444_writer.h
rename to include/oonf/librfc5444/rfc5444_writer.h
index 9ee6d8c..8092330 100644 (file)
 struct rfc5444_writer;
 struct rfc5444_writer_message;
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/list.h"
-#include "common/netaddr.h"
-#include "rfc5444_context.h"
-#include "rfc5444_reader.h"
-#include "rfc5444_tlv_writer.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/list.h>
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/librfc5444/rfc5444_context.h>
+#include <oonf/librfc5444/rfc5444_reader.h>
+#include <oonf/librfc5444/rfc5444_tlv_writer.h>
 
 /**
  * state machine values for the writer.
similarity index 98%
rename from src-plugins/nhdp/mpr/mpr_internal.h
rename to include/oonf/nhdp/mpr/mpr_internal.h
index 02d1cb4..3cb9259 100644 (file)
@@ -45,7 +45,7 @@
 
 #ifndef MPR_INTERNAL_H_
 #define MPR_INTERNAL_H_
-#include "core/oonf_logging.h"
+#include <oonf/libcore/oonf_logging.h>
 
 /* headers only for use inside the MPR subsystem */
 enum oonf_log_source LOG_MPR;
 #ifndef __NEIGHBOR_GRAPH_FLOODING__
 #define __NEIGHBOR_GRAPH_FLOODING__
 
-#include "nhdp/nhdp_domain.h"
-#include "nhdp/nhdp_interfaces.h"
+#include <oonf/nhdp/nhdp/nhdp_domain.h>
+#include <oonf/nhdp/nhdp/nhdp_interfaces.h>
 
-#include "neighbor-graph.h"
+#include <oonf/nhdp/mpr/neighbor-graph.h>
 
 struct mpr_flooding_data {
   struct nhdp_interface *current_interface;
@@ -46,9 +46,9 @@
 #ifndef __NEIGHBOR_GRAPH_ROUTING__
 #define __NEIGHBOR_GRAPH_ROUTING__
 
-#include "nhdp/nhdp_domain.h"
+#include <oonf/nhdp/nhdp/nhdp_domain.h>
 
-#include "neighbor-graph.h"
+#include <oonf/nhdp/mpr/neighbor-graph.h>
 
 void mpr_calculate_neighbor_graph_routing(const struct nhdp_domain *domain, struct neighbor_graph *graph);
 
similarity index 96%
rename from src-plugins/nhdp/mpr/neighbor-graph.h
rename to include/oonf/nhdp/mpr/neighbor-graph.h
index 0f2e787..281374f 100644 (file)
 #ifndef __NEIGHBOR_GRAPH__
 #define __NEIGHBOR_GRAPH__
 
-#include "common/avl.h"
-#include "common/netaddr.h"
-#include "nhdp/nhdp_db.h"
-#include "nhdp/nhdp_domain.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/nhdp/nhdp/nhdp_db.h>
+#include <oonf/nhdp/nhdp/nhdp_domain.h>
 
 struct neighbor_graph;
 struct addr_node;
similarity index 96%
rename from src-plugins/nhdp/mpr/selection-rfc7181.h
rename to include/oonf/nhdp/mpr/selection-rfc7181.h
index 863d1b3..245efef 100644 (file)
@@ -46,9 +46,9 @@
 #ifndef __SELECTION_RFC7181__
 #define __SELECTION_RFC7181__
 
-#include "nhdp/nhdp_domain.h"
+#include <oonf/nhdp/nhdp/nhdp_domain.h>
 
-#include "neighbor-graph.h"
+#include <oonf/nhdp/mpr/neighbor-graph.h>
 
 void mpr_calculate_mpr_rfc7181(const struct nhdp_domain *, struct neighbor_graph *graph);
 
similarity index 94%
rename from src-plugins/nhdp/nhdp/nhdp.h
rename to include/oonf/nhdp/nhdp/nhdp.h
index 1153278..444f754 100644 (file)
 #ifndef NHDP_H_
 #define NHDP_H_
 
-#include "common/common_types.h"
-#include "common/netaddr.h"
-#include "config/cfg_schema.h"
-#include "core/oonf_subsystem.h"
-#include "subsystems/oonf_rfc5444.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/libconfig/cfg_schema.h>
+#include <oonf/libcore/oonf_subsystem.h>
+#include <oonf/subsystems/oonf_rfc5444.h>
 
 /*! subsystem identifier */
 #define OONF_NHDP_SUBSYSTEM "nhdp"
similarity index 98%
rename from src-plugins/nhdp/nhdp/nhdp_db.h
rename to include/oonf/nhdp/nhdp/nhdp_db.h
index f23cd67..bb871ac 100644 (file)
@@ -51,14 +51,14 @@ struct nhdp_link;
 struct nhdp_l2hop;
 struct nhdp_laddr;
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/list.h"
-#include "common/netaddr.h"
-#include "subsystems/oonf_rfc5444.h"
-#include "subsystems/oonf_timer.h"
-
-#include "nhdp/nhdp.h"
+#include <oonf/libcommon/avl.h>
+#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/nhdp/nhdp/nhdp.h>
 
 /*! memory class for NHDP links */
 #define NHDP_CLASS_LINK "nhdp_link"
similarity index 98%
rename from src-plugins/nhdp/nhdp/nhdp_domain.h
rename to include/oonf/nhdp/nhdp/nhdp_domain.h
index 689ced4..da67e7a 100644 (file)
 #ifndef NHDP_DOMAIN_H_
 #define NHDP_DOMAIN_H_
 
-#include "common/common_types.h"
-#include "common/list.h"
-#include "subsystems/oonf_layer2.h"
-#include "subsystems/oonf_rfc5444.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/list.h>
+#include <oonf/subsystems/oonf_layer2.h>
+#include <oonf/subsystems/oonf_rfc5444.h>
 
-#include "nhdp/nhdp_db.h"
-#include "nhdp/nhdp_interfaces.h"
+#include <oonf/nhdp/nhdp/nhdp_db.h>
+#include <oonf/nhdp/nhdp/nhdp_interfaces.h>
 
 /*! memory class for nhdp domain */
 #define NHDP_CLASS_DOMAIN "nhdp_domain"
similarity index 97%
rename from src-plugins/nhdp/nhdp/nhdp_hysteresis.h
rename to include/oonf/nhdp/nhdp/nhdp_hysteresis.h
index d8f02bb..aa49c9d 100644 (file)
 #ifndef NHDP_HYSTERESIS_H_
 #define NHDP_HYSTERESIS_H_
 
-#include "common/common_types.h"
-#include "subsystems/oonf_rfc5444.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/oonf_rfc5444.h>
 
-#include "nhdp/nhdp_db.h"
+#include <oonf/nhdp/nhdp/nhdp_db.h>
 
 /**
  * Output buffer for hysteresis data string representation
similarity index 96%
rename from src-plugins/nhdp/nhdp/nhdp_interfaces.h
rename to include/oonf/nhdp/nhdp/nhdp_interfaces.h
index f4d6f71..601f38c 100644 (file)
@@ -50,16 +50,16 @@ struct nhdp_interface;
 struct nhdp_interface_addr;
 struct nhdp_interface_domaindata;
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/list.h"
-#include "common/netaddr.h"
-#include "common/netaddr_acl.h"
-#include "subsystems/oonf_rfc5444.h"
-#include "subsystems/oonf_timer.h"
-#include "subsystems/os_interface.h"
-
-#include "nhdp/nhdp_db.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#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/nhdp/nhdp/nhdp_db.h>
 
 /*! memory class for NHDP interface */
 #define NHDP_CLASS_INTERFACE "nhdp_interf"
similarity index 98%
rename from src-plugins/nhdp/nhdp/nhdp_internal.h
rename to include/oonf/nhdp/nhdp/nhdp_internal.h
index 3407765..b20e10f 100644 (file)
@@ -46,7 +46,7 @@
 #ifndef NHDP_INTERNAL_H_
 #define NHDP_INTERNAL_H_
 
-#include "core/oonf_logging.h"
+#include <oonf/libcore/oonf_logging.h>
 
 /* headers only for use inside the NHDP subsystem */
 enum oonf_log_source LOG_NHDP;
similarity index 96%
rename from src-plugins/nhdp/nhdp/nhdp_reader.h
rename to include/oonf/nhdp/nhdp/nhdp_reader.h
index 393703b..2d955b6 100644 (file)
@@ -46,8 +46,8 @@
 #ifndef NHDP_INCOMING_H_
 #define NHDP_INCOMING_H_
 
-#include "common/common_types.h"
-#include "subsystems/oonf_rfc5444.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/oonf_rfc5444.h>
 
 void nhdp_reader_init(struct oonf_rfc5444_protocol *);
 void nhdp_reader_cleanup(void);
similarity index 96%
rename from src-plugins/nhdp/nhdp/nhdp_writer.h
rename to include/oonf/nhdp/nhdp/nhdp_writer.h
index fae052d..3733628 100644 (file)
@@ -46,8 +46,8 @@
 #ifndef NHDP_WRITER_H_
 #define NHDP_WRITER_H_
 
-#include "common/common_types.h"
-#include "subsystems/oonf_rfc5444.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/oonf_rfc5444.h>
 
 int nhdp_writer_init(struct oonf_rfc5444_protocol *) __attribute__((warn_unused_result));
 void nhdp_writer_cleanup(void);
similarity index 94%
rename from src-plugins/olsrv2/olsrv2/olsrv2.h
rename to include/oonf/olsrv2/olsrv2/olsrv2.h
index 154822b..792a6d2 100644 (file)
 #ifndef OLSRV2_H_
 #define OLSRV2_H_
 
-#include "common/common_types.h"
-#include "common/netaddr.h"
-#include "common/netaddr_acl.h"
-#include "core/oonf_subsystem.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/libcommon/netaddr_acl.h>
+#include <oonf/libcore/oonf_subsystem.h>
 
-#include "nhdp/nhdp_domain.h"
+#include <oonf/nhdp/nhdp/nhdp_domain.h>
 
 /*! subsystem identifier */
 #define OONF_OLSRV2_SUBSYSTEM "olsrv2"
similarity index 97%
rename from src-plugins/olsrv2/olsrv2/olsrv2_internal.h
rename to include/oonf/olsrv2/olsrv2/olsrv2_internal.h
index 82403cc..a43efec 100644 (file)
@@ -46,8 +46,8 @@
 #ifndef OLSRV2_INTERNAL_H_
 #define OLSRV2_INTERNAL_H_
 
-#include "common/common_types.h"
-#include "core/oonf_logging.h"
+#include <oonf/oonf.h>
+#include <oonf/libcore/oonf_logging.h>
 
 /* headers only for use inside the OLSRv2 subsystem */
 EXPORT enum oonf_log_source LOG_OLSRV2;
similarity index 94%
rename from src-plugins/olsrv2/olsrv2/olsrv2_lan.h
rename to include/oonf/olsrv2/olsrv2/olsrv2_lan.h
index f27cb58..dd23262 100644 (file)
 #ifndef OLSRV2_LAN_H_
 #define OLSRV2_LAN_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/netaddr.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
 
-#include "nhdp/nhdp.h"
-#include "olsrv2/olsrv2.h"
-#include "subsystems/os_routing.h"
+#include <oonf/nhdp/nhdp/nhdp.h>
+#include <oonf/olsrv2/olsrv2/olsrv2.h>
+#include <oonf/subsystems/os_routing.h>
 
 /**
  * per-domain data for locally attached networks
 #ifndef OLSRV2_ORIGINATOR_SET_H_
 #define OLSRV2_ORIGINATOR_SET_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/netaddr.h"
-#include "subsystems/oonf_timer.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/subsystems/oonf_timer.h>
 
 /**
  * Former originator address of the local node
similarity index 96%
rename from src-plugins/olsrv2/olsrv2/olsrv2_reader.h
rename to include/oonf/olsrv2/olsrv2/olsrv2_reader.h
index 1097216..1c6ff8e 100644 (file)
@@ -46,8 +46,8 @@
 #ifndef OLSRV2_READER_H_
 #define OLSRV2_READER_H_
 
-#include "common/common_types.h"
-#include "subsystems/oonf_rfc5444.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/oonf_rfc5444.h>
 
 void olsrv2_reader_init(struct oonf_rfc5444_protocol *);
 void olsrv2_reader_cleanup(void);
similarity index 95%
rename from src-plugins/olsrv2/olsrv2/olsrv2_routing.h
rename to include/oonf/olsrv2/olsrv2/olsrv2_routing.h
index 24de0b7..c8d999b 100644 (file)
 #ifndef OLSRV2_ROUTING_H_
 #define OLSRV2_ROUTING_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/list.h"
-#include "common/netaddr.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/list.h>
+#include <oonf/libcommon/netaddr.h>
 
-#include "subsystems/os_routing.h"
+#include <oonf/subsystems/os_routing.h>
 
-#include "nhdp/nhdp.h"
-#include "nhdp/nhdp_db.h"
-#include "nhdp/nhdp_domain.h"
+#include <oonf/nhdp/nhdp/nhdp.h>
+#include <oonf/nhdp/nhdp/nhdp_db.h>
+#include <oonf/nhdp/nhdp/nhdp_domain.h>
 
 /*! minimum time between two dijkstra calculations in milliseconds */
 enum
similarity index 96%
rename from src-plugins/olsrv2/olsrv2/olsrv2_tc.h
rename to include/oonf/olsrv2/olsrv2/olsrv2_tc.h
index a72cd03..f5e1304 100644 (file)
 #ifndef OLSRV2_TC_H_
 #define OLSRV2_TC_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/netaddr.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
 
-#include "subsystems/oonf_timer.h"
+#include <oonf/subsystems/oonf_timer.h>
 
-#include "nhdp/nhdp.h"
-#include "nhdp/nhdp_domain.h"
+#include <oonf/nhdp/nhdp/nhdp.h>
+#include <oonf/nhdp/nhdp/nhdp_domain.h>
 
-#include "olsrv2/olsrv2.h"
-#include "olsrv2/olsrv2_routing.h"
+#include <oonf/olsrv2/olsrv2/olsrv2.h>
+#include <oonf/olsrv2/olsrv2/olsrv2_routing.h>
 
 /**
  * target types of olsrv2 edges
similarity index 97%
rename from src-plugins/olsrv2/olsrv2/olsrv2_writer.h
rename to include/oonf/olsrv2/olsrv2/olsrv2_writer.h
index bbe8127..2e878df 100644 (file)
@@ -46,8 +46,8 @@
 #ifndef OLSRV2_WRITER_H_
 #define OLSRV2_WRITER_H_
 
-#include "common/common_types.h"
-#include "subsystems/oonf_rfc5444.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/oonf_rfc5444.h>
 
 int olsrv2_writer_init(struct oonf_rfc5444_protocol *) __attribute__((warn_unused_result));
 void olsrv2_writer_cleanup(void);
similarity index 95%
rename from src-plugins/olsrv2/olsrv2_old_lan/old_lan.h
rename to include/oonf/olsrv2/olsrv2_old_lan/old_lan.h
index a15135d..eef09fe 100644 (file)
@@ -8,7 +8,7 @@
 #ifndef _OLD_LAN_H_
 #define _OLD_LAN_H_
 
-#include "config/cfg_schema.h"
+#include <oonf/libconfig/cfg_schema.h>
 
 #define OONF_OLD_LAN_SUBSYSTEM "olsrv2_old_lan"
 
similarity index 97%
rename from src-api/common/common_types.h
rename to include/oonf/oonf.h
index 761e6a9..6290862 100644 (file)
@@ -43,8 +43,8 @@
  * @file
  */
 
-#ifndef COMMON_TYPES_H_
-#define COMMON_TYPES_H_
+#ifndef OONF_H_
+#define OONF_H_
 
 #include <stddef.h>
 
 #error "OONF needs C99"
 #endif /* __STDC_VERSION__ && __STDC_VERSION__ >= 199901L */
 
-#endif /* COMMON_TYPES_H_ */
+#endif /* OONF_H_ */
similarity index 98%
rename from src-plugins/subsystems/oonf_class.h
rename to include/oonf/subsystems/oonf_class.h
index 9dbb960..87eec73 100644 (file)
@@ -46,9 +46,9 @@
 #ifndef _OONF_CLASS_H
 #define _OONF_CLASS_H
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/list.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/list.h>
 
 /*! subsystem identifier */
 #define OONF_CLASS_SUBSYSTEM "class"
similarity index 98%
rename from src-plugins/subsystems/oonf_clock.h
rename to include/oonf/subsystems/oonf_clock.h
index 319dd3a..bb2b286 100644 (file)
 #ifndef _OONF_CLOCK
 #define _OONF_CLOCK
 
-#include "common/common_types.h"
-#include "common/isonumber.h"
-#include "config/cfg.h"
-#include "config/cfg_schema.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/isonumber.h>
+#include <oonf/libconfig/cfg.h>
+#include <oonf/libconfig/cfg_schema.h>
 
 /*! subsystem identifier */
 #define OONF_CLOCK_SUBSYSTEM "clock"
similarity index 97%
rename from src-plugins/subsystems/oonf_duplicate_set.h
rename to include/oonf/subsystems/oonf_duplicate_set.h
index ec2a805..cae0110 100644 (file)
 #ifndef OONF_DUPLICATE_SET_H_
 #define OONF_DUPLICATE_SET_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/netaddr.h"
-#include "subsystems/oonf_timer.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/subsystems/oonf_timer.h>
 
 /*! subsystem identifier */
 #define OONF_DUPSET_SUBSYSTEM "duplicate_set"
similarity index 96%
rename from src-plugins/subsystems/oonf_http.h
rename to include/oonf/subsystems/oonf_http.h
index 87c279c..41baa8e 100644 (file)
 #ifndef OONF_HTTP_H_
 #define OONF_HTTP_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/netaddr.h"
-#include "common/netaddr_acl.h"
-#include "common/string.h"
-#include "subsystems/oonf_stream_socket.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/libcommon/netaddr_acl.h>
+#include <oonf/libcommon/string.h>
+#include <oonf/subsystems/oonf_stream_socket.h>
 
 /*! subsystem identifier */
 #define OONF_HTTP_SUBSYSTEM "http"
similarity index 99%
rename from src-plugins/subsystems/oonf_layer2.h
rename to include/oonf/subsystems/oonf_layer2.h
index 88d9d9a..51ca7f0 100644 (file)
 #ifndef OONF_LAYER2_H_
 #define OONF_LAYER2_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "core/oonf_subsystem.h"
-#include "subsystems/os_interface.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcore/oonf_subsystem.h>
+#include <oonf/subsystems/os_interface.h>
 
 /*! subsystem identifier */
 #define OONF_LAYER2_SUBSYSTEM "layer2"
similarity index 96%
rename from src-plugins/subsystems/oonf_packet_socket.h
rename to include/oonf/subsystems/oonf_packet_socket.h
index 403acfc..db3bf90 100644 (file)
 #ifndef OONF_PACKET_SOCKET_H_
 #define OONF_PACKET_SOCKET_H_
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
-#include "common/list.h"
-#include "common/netaddr.h"
-#include "common/netaddr_acl.h"
-#include "subsystems/oonf_socket.h"
-#include "subsystems/os_interface.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
+#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>
 
 #ifndef _WIN32
 #include <net/if.h>
similarity index 96%
rename from src-plugins/subsystems/oonf_rfc5444.h
rename to include/oonf/subsystems/oonf_rfc5444.h
index 509b96e..b0bab21 100644 (file)
 #ifndef OONF_RFC5444_H_
 #define OONF_RFC5444_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/netaddr.h"
-#include "subsystems/oonf_duplicate_set.h"
-#include "subsystems/oonf_packet_socket.h"
-#include "subsystems/oonf_timer.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 <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/librfc5444/rfc5444.h>
+#include <oonf/librfc5444/rfc5444_context.h>
+#include <oonf/librfc5444/rfc5444_iana.h>
+#include <oonf/librfc5444/rfc5444_reader.h>
+#include <oonf/librfc5444/rfc5444_writer.h>
 
 /*! subsystem identifier */
 #define OONF_RFC5444_SUBSYSTEM "rfc5444"
similarity index 96%
rename from src-plugins/subsystems/oonf_socket.h
rename to include/oonf/subsystems/oonf_socket.h
index ae92ca4..f703dd1 100644 (file)
 #ifndef OONF_SOCKET_H_
 #define OONF_SOCKET_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/list.h"
-#include "common/netaddr_acl.h"
-#include "subsystems/os_fd.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/list.h>
+#include <oonf/libcommon/netaddr_acl.h>
+#include <oonf/subsystems/os_fd.h>
 
 /*! subsystem identifier */
 #define OONF_SOCKET_SUBSYSTEM "socket"
similarity index 96%
rename from src-plugins/subsystems/oonf_stream_socket.h
rename to include/oonf/subsystems/oonf_stream_socket.h
index a4cb580..938a4e7 100644 (file)
 #ifndef OONF_STREAM_SOCKET_H_
 #define OONF_STREAM_SOCKET_H_
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
-#include "common/list.h"
-#include "common/netaddr.h"
-#include "common/netaddr_acl.h"
-
-#include "subsystems/oonf_class.h"
-#include "subsystems/oonf_socket.h"
-#include "subsystems/oonf_timer.h"
-#include "subsystems/os_interface.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/list.h>
+#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>
 
 /*! subsystem identifier */
 #define OONF_STREAM_SUBSYSTEM "stream_socket"
similarity index 97%
rename from src-plugins/subsystems/oonf_telnet.h
rename to include/oonf/subsystems/oonf_telnet.h
index d50de89..85dce02 100644 (file)
 #ifndef OONF_TELNET_H_
 #define OONF_TELNET_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/list.h"
-#include "common/netaddr.h"
-#include "common/netaddr_acl.h"
-#include "subsystems/oonf_stream_socket.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/list.h>
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/libcommon/netaddr_acl.h>
+#include <oonf/subsystems/oonf_stream_socket.h>
 
 /*! subsystem identifier */
 #define OONF_TELNET_SUBSYSTEM "telnet"
similarity index 98%
rename from src-plugins/subsystems/oonf_timer.h
rename to include/oonf/subsystems/oonf_timer.h
index 7a7bcf2..9b51952 100644 (file)
 #ifndef OONF_TIMER_H_
 #define OONF_TIMER_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/list.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/list.h>
 
-#include "subsystems/oonf_clock.h"
+#include <oonf/subsystems/oonf_clock.h>
 
 /*! subsystem identifier */
 #define OONF_TIMER_SUBSYSTEM "timer"
similarity index 95%
rename from src-plugins/subsystems/oonf_viewer.h
rename to include/oonf/subsystems/oonf_viewer.h
index a3c1abd..ba6cdbd 100644 (file)
 #ifndef OONF_VIEWER_H_
 #define OONF_VIEWER_H_
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
-#include "common/json.h"
-#include "common/template.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/json.h>
+#include <oonf/libcommon/template.h>
 
-#include "core/oonf_subsystem.h"
-#include "subsystems/oonf_telnet.h" /* compile-time dependency */
+#include <oonf/libcore/oonf_subsystem.h>
+#include <oonf/subsystems/oonf_telnet.h> /* compile-time dependency */
 
 /*! subsystem identifier */
 #define OONF_VIEWER_SUBSYSTEM "viewer"
similarity index 91%
rename from src-plugins/subsystems/os_clock.h
rename to include/oonf/subsystems/os_clock.h
index 86bb13c..17fd147 100644 (file)
 #include <stdio.h>
 #include <sys/time.h>
 
-#include "common/common_types.h"
-#include "core/oonf_subsystem.h"
+#include <oonf/oonf.h>
+#include <oonf/libcore/oonf_subsystem.h>
 
 /*! subsystem identifier */
 #define OONF_OS_CLOCK_SUBSYSTEM "os_clock"
 
 #if defined(__linux__)
-#include "subsystems/os_linux/os_clock_linux.h"
+#include <oonf/subsystems/os_linux/os_clock_linux.h>
 #elif defined(BSD)
-#include "subsystems/os_bsd/os_clock_bsd.h"
+#include <oonf/subsystems/os_bsd/os_clock_bsd.h>
 #elif defined(_WIN32)
-#include "subsystems/os_win32/os_clock_win32.h"
+#include <oonf/subsystems/os_win32/os_clock_win32.h>
 #else
 #error "Unknown operation system"
 #endif
similarity index 93%
rename from src-plugins/subsystems/os_fd.h
rename to include/oonf/subsystems/os_fd.h
index 6798c8b..9e21c91 100644 (file)
 #include <sys/select.h>
 #include <unistd.h>
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/list.h"
-#include "common/netaddr.h"
-#include "core/oonf_logging.h"
-#include "subsystems/oonf_timer.h"
-#include "subsystems/os_interface.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#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>
 
 /*! 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 "os_linux/os_fd_linux.h"
+#include <oonf/subsystems/os_linux/os_fd_linux.h>
 #elif defined(BSD)
-#include "subsystems/os_bsd/os_fd_bsd.h"
+#include <oonf/subsystems/os_bsd/os_fd_bsd.h>
 #elif defined(_WIN32)
-#include "subsystems/os_win32/os_fd_win32.h"
+#include <oonf/subsystems/os_win32/os_fd_win32.h>
 #else
 #error "Unknown operation system"
 #endif
@@ -8,10 +8,10 @@
 #ifndef _OS_FD_GENERIC_CONFIGSOCKET_H_
 #define _OS_FD_GENERIC_CONFIGSOCKET_H_
 
-#include "common/common_types.h"
-#include "core/oonf_logging.h"
-#include "subsystems/os_fd.h"
-#include "subsystems/os_interface.h"
+#include <oonf/oonf.h>
+#include <oonf/libcore/oonf_logging.h>
+#include <oonf/subsystems/os_fd.h>
+#include <oonf/subsystems/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);
@@ -8,8 +8,8 @@
 #ifndef _OS_FD_GENERIC_GETRAWSOCKET_H_
 #define _OS_FD_GENERIC_GETRAWSOCKET_H_
 
-#include "common/common_types.h"
-#include "subsystems/os_fd.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/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);
@@ -8,8 +8,8 @@
 #ifndef _OS_FD_GENERIC_GETSOCKET_H_
 #define _OS_FD_GENERIC_GETSOCKET_H_
 
-#include "common/common_types.h"
-#include "subsystems/os_fd.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/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);
@@ -8,8 +8,8 @@
 #ifndef _OS_FD_GENERIC_JOIN_MCAST_H_
 #define _OS_FD_GENERIC_JOIN_MCAST_H_
 
-#include "common/common_types.h"
-#include "subsystems/os_fd.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/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);
@@ -8,8 +8,8 @@
 #ifndef _OS_FD_GENERIC_SET_DSCP_H_
 #define _OS_FD_GENERIC_SET_DSCP_H_
 
-#include "common/common_types.h"
-#include "subsystems/os_fd.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/os_fd.h>
 
 EXPORT int os_fd_generic_set_dscp(struct os_fd *sock, int dscp, bool ipv6);
 
@@ -8,8 +8,8 @@
 #ifndef _OS_FD_GENERIC_SET_NONBLOCKING_H_
 #define _OS_FD_GENERIC_SET_NONBLOCKING_H_
 
-#include "common/common_types.h"
-#include "subsystems/os_fd.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/os_fd.h>
 
 EXPORT int os_fd_generic_set_nonblocking(struct os_fd *sock);
 
@@ -8,9 +8,9 @@
 #ifndef OS_INTERFACE_GENERIC_H_
 #define OS_INTERFACE_GENERIC_H_
 
-#include "common/common_types.h"
-#include "common/netaddr_acl.h"
-#include "subsystems/os_interface.h"
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr_acl.h>
+#include <oonf/subsystems/os_interface.h>
 
 EXPORT const struct netaddr *os_interface_generic_get_bindaddress(
   int af_type, struct netaddr_acl *filter, struct os_interface *os_if);
@@ -8,8 +8,8 @@
 #ifndef _OS_ROUTING_GENERIC_INIT_HALF_ROUTE_KEY_H_
 #define _OS_ROUTING_GENERIC_INIT_HALF_ROUTE_KEY_H_
 
-#include "common/common_types.h"
-#include "subsystems/os_routing.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/os_routing.h>
 
 EXPORT void os_routing_generic_init_half_os_route_key(
   struct netaddr *ipany, struct netaddr *specific, const struct netaddr *source);
@@ -8,8 +8,8 @@
 #ifndef _OS_GENERIC_OS_ROUTING_GENERIC_RT_TO_STRING_H_
 #define _OS_GENERIC_OS_ROUTING_GENERIC_RT_TO_STRING_H_
 
-#include "common/common_types.h"
-#include "subsystems/os_routing.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/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 96%
rename from src-plugins/subsystems/os_interface.h
rename to include/oonf/subsystems/os_interface.h
index b765212..5cea94a 100644 (file)
 #include <stdio.h>
 #include <sys/time.h>
 
-#include "common/common_types.h"
-#include "common/list.h"
-#include "core/oonf_logging.h"
-#include "subsystems/oonf_timer.h"
-#include "subsystems/os_interface.h"
+#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>
 
 /*! subsystem identifier */
 #define OONF_OS_INTERFACE_SUBSYSTEM "os_interface"
@@ -63,7 +63,7 @@
 
 /* include os-specific headers */
 #if defined(__linux__)
-#include "subsystems/os_linux/os_interface_linux_internal.h"
+#include <oonf/subsystems/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 "subsystems/os_linux/os_interface_linux.h"
+#include <oonf/subsystems/os_linux/os_interface_linux.h>
 #else
 #error "Unknown operation system"
 #endif
@@ -46,7 +46,7 @@
 #ifndef OS_CLOCK_LINUX_H_
 #define OS_CLOCK_LINUX_H_
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 EXPORT int os_clock_linux_gettime64_ns(uint64_t *t64);
 EXPORT int os_clock_linux_gettime64(uint64_t *t64);
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "subsystems/os_fd.h"
-#include "subsystems/os_generic/os_fd_generic_configsocket.h"
-#include "subsystems/os_generic/os_fd_generic_getrawsocket.h"
-#include "subsystems/os_generic/os_fd_generic_getsocket.h"
-#include "subsystems/os_generic/os_fd_generic_join_mcast.h"
-#include "subsystems/os_generic/os_fd_generic_set_dscp.h"
-#include "subsystems/os_generic/os_fd_generic_set_nonblocking.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>
 
 /*! name of the loopback interface */
 #define IF_LOOPBACK_NAME "lo"
@@ -49,9 +49,9 @@
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 
-#include "common/common_types.h"
-#include "subsystems/os_generic/os_interface_generic.h"
-#include "subsystems/os_interface.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/os_generic/os_interface_generic.h>
+#include <oonf/subsystems/os_interface.h>
 
 enum
 {
@@ -49,8 +49,8 @@
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 
-#include "common/common_types.h"
-#include "subsystems/os_interface.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/os_interface.h>
 
 /**
  * define scope of address on interface
@@ -46,9 +46,9 @@
 #ifndef OS_ROUTING_LINUX_H_
 #define OS_ROUTING_LINUX_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/list.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/list.h>
 
 /**
  * linux specifc data for changing a kernel route
@@ -69,8 +69,8 @@ struct os_route_listener_internal {
   struct list_entity _node;
 };
 
-#include "subsystems/os_generic/os_routing_generic_init_half_route_key.h"
-#include "subsystems/os_generic/os_routing_generic_rt_to_string.h"
+#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>
 
 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);
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 
-#include "common/netaddr.h"
-#include "core/oonf_subsystem.h"
-#include "subsystems/oonf_socket.h"
-#include "subsystems/oonf_timer.h"
+#include <oonf/libcommon/netaddr.h>
+#include <oonf/libcore/oonf_subsystem.h>
+#include <oonf/subsystems/oonf_socket.h>
+#include <oonf/subsystems/oonf_timer.h>
 
 /*! default timeout for netlink messages */
 #define OS_SYSTEM_NETLINK_TIMEOUT 1000
@@ -46,8 +46,8 @@
 #ifndef OS_TUNNEL_LINUX_H_
 #define OS_TUNNEL_LINUX_H_
 
-#include "common/common_types.h"
-#include "subsystems/os_tunnel.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/os_tunnel.h>
 
 struct os_tunnel_internal {};
 
@@ -46,8 +46,8 @@
 #ifndef OS_VIF_LINUX_H_
 #define OS_VIF_LINUX_H_
 
-#include "common/common_types.h"
-#include "subsystems/os_vif.h"
+#include <oonf/oonf.h>
+#include <oonf/subsystems/os_vif.h>
 
 /**
  * Linux internal data for handling virtual interfaces (tun/tap)
similarity index 96%
rename from src-plugins/subsystems/os_routing.h
rename to include/oonf/subsystems/os_routing.h
index 5958618..94fa528 100644 (file)
 #include <stdio.h>
 #include <sys/time.h>
 
-#include "common/common_types.h"
-#include "common/list.h"
-#include "common/netaddr.h"
-#include "core/oonf_logging.h"
-#include "subsystems/os_interface.h"
-#include "subsystems/os_system.h"
+#include <oonf/oonf.h>
+#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>
 
 /*! 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 "subsystems/os_linux/os_routing_linux.h"
+#include <oonf/subsystems/os_linux/os_routing_linux.h>
 #else
 #error "Unknown operation system"
 #endif
similarity index 92%
rename from src-plugins/subsystems/os_system.h
rename to include/oonf/subsystems/os_system.h
index 5328f3d..feda34e 100644 (file)
 #include <stdio.h>
 #include <sys/time.h>
 
-#include "common/common_types.h"
+#include <oonf/oonf.h>
 
 /*! subsystem identifier */
 #define OONF_OS_SYSTEM_SUBSYSTEM "os_system"
 
 /* include os-specific headers */
 #if defined(__linux__)
-#include "subsystems/os_linux/os_system_linux.h"
+#include <oonf/subsystems/os_linux/os_system_linux.h>
 #elif defined(BSD)
-#include "subsystems/os_bsd/os_system_bsd.h"
+#include <oonf/subsystems/os_bsd/os_system_bsd.h>
 #elif defined(_WIN32)
-#include "subsystems/os_win32/os_system_win32.h"
+#include <oonf/subsystems/os_win32/os_system_win32.h>
 #else
 #error "Unknown operation system"
 #endif
similarity index 95%
rename from src-plugins/subsystems/os_tunnel.h
rename to include/oonf/subsystems/os_tunnel.h
index e6c8f1b..5ff2afa 100644 (file)
@@ -46,9 +46,9 @@
 #ifndef OS_TUNNEL_H_
 #define OS_TUNNEL_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
-#include "common/netaddr.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
 
 /*! subsystem identifier */
 #define OONF_OS_TUNNEL_SUBSYSTEM "os_tunnel"
@@ -57,7 +57,7 @@ struct os_tunnel;
 
 /* include os-specific headers */
 #if defined(__linux__)
-#include "subsystems/os_linux/os_tunnel_linux.h"
+#include <oonf/subsystems/os_linux/os_tunnel_linux.h>
 #else
 #error "Unknown operation system"
 #endif
similarity index 95%
rename from src-plugins/subsystems/os_vif.h
rename to include/oonf/subsystems/os_vif.h
index 836af7a..fb2ed9d 100644 (file)
 #ifndef OS_VIF_H_
 #define OS_VIF_H_
 
-#include "common/avl.h"
-#include "common/common_types.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/oonf.h>
 
-#include "subsystems/os_fd.h"
+#include <oonf/subsystems/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 "subsystems/os_linux/os_vif_linux.h"
+#include <oonf/subsystems/os_linux/os_vif_linux.h>
 #else
 #error "Unknown operation system"
 #endif
diff --git a/src-api/CMakeLists.txt b/src-api/CMakeLists.txt
deleted file mode 100644 (file)
index 26d003f..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# build framework
-add_subdirectory(common)
-add_subdirectory(config)
-add_subdirectory(core)
diff --git a/src-plugins/CMakeLists.txt b/src-plugins/CMakeLists.txt
deleted file mode 100644 (file)
index 93937c3..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# add include directoy
-include_directories(.)
-include_directories(crypto)
-include_directories(generic)
-include_directories(nhdp)
-include_directories(olsrv2)
-
-# add subdirectories
-#add_subdirectory(crypto)
-add_subdirectory(generic)
-add_subdirectory(nhdp)
-add_subdirectory(olsrv2)
-add_subdirectory(subsystems)
diff --git a/src-plugins/subsystems/rfc5444/CMakeLists.txt b/src-plugins/subsystems/rfc5444/CMakeLists.txt
deleted file mode 100644 (file)
index 772c52c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# create plugins for single-file (source plus header) subsystems
-SET(rfc5444_api_source  rfc5444.c
-                        rfc5444_context.c
-                        rfc5444_iana.c
-                        rfc5444_msg_generator.c
-                        rfc5444_pkt_generator.c
-                        rfc5444_print.c
-                        rfc5444_reader.c
-                        rfc5444_tlv_writer.c
-                        rfc5444_writer.c)
-
-add_library(oonf_static_rfc5444_api OBJECT ${rfc5444_api_source})
index 28fc18d..13369fc 100644 (file)
@@ -1,6 +1,15 @@
 # build framework
-add_subdirectory(dlep-radio)
-add_subdirectory(dlep-router)
-add_subdirectory(olsrd2)
-add_subdirectory(olsrd2-dlep)
-add_subdirectory(oonf)
+add_subdirectory(libcommon)
+add_subdirectory(libconfig)
+add_subdirectory(libcore)
+add_subdirectory(librfc5444)
+#add_subdirectory(crypto)
+add_subdirectory(generic)
+add_subdirectory(nhdp)
+add_subdirectory(olsrv2)
+add_subdirectory(subsystems)
+
+if (NOT OONF_NO_TESTING)
+    add_subdirectory(tests)
+endif (NOT OONF_NO_TESTING)
+
similarity index 97%
rename from src-plugins/crypto/hash_polarssl/hash_polarssl.c
rename to src/crypto/hash_polarssl/hash_polarssl.c
index 307d941..c032c04 100644 (file)
 #ifdef POLARSSL_SHA512_C
 #include <polarssl/sha512.h>
 #endif
-#include "common/common_types.h"
-#include "core/oonf_subsystem.h"
-#include "rfc7182_provider/rfc7182_provider.h"
-#include "subsystems/rfc5444/rfc5444_iana.h"
+#include <oonf/oonf.h>
+#include <oonf/libcore/oonf_subsystem.h>
+#include <oonf/crypto/rfc7182_provider/rfc7182_provider.h>
+#include <oonf/librfc5444/rfc5444_iana.h>
 
-#include "hash_polarssl/hash_polarssl.h"
+#include <oonf/crypto/hash_polarssl/hash_polarssl.h>
 
 #define LOG_HASH_POLARSSL _hash_polarssl_subsystem.logging
 
similarity index 97%
rename from src-plugins/crypto/hash_tomcrypt/hash_tomcrypt.c
rename to src/crypto/hash_tomcrypt/hash_tomcrypt.c
index 5d851ae..6dd6238 100644 (file)
 
 #include <tomcrypt.h>
 
-#include "common/common_types.h"
-#include "core/oonf_subsystem.h"
-#include "rfc5444_signature/rfc5444_signature.h"
-#include "subsystems/rfc5444/rfc5444_iana.h"
+#include <oonf/oonf.h>
+#include <oonf/libcore/oonf_subsystem.h>
+#include <oonf/crypto/rfc5444_signature/rfc5444_signature.h>
+#include <oonf/librfc5444/rfc5444_iana.h>
 
-#include "hash_tomcrypt/hash_tomcrypt.h"
+#include <oonf/crypto/hash_tomcrypt/hash_tomcrypt.h>
 
 #define LOG_HASH_TOMCRYPT _hash_tomcrypt_subsystem.logging
 
  * @file
  */
 
-#include "common/avl.h"
-#include "common/avl_comp.h"
-#include "common/common_types.h"
-#include "core/oonf_subsystem.h"
-#include "rfc7182_provider/rfc7182_provider.h"
-#include "subsystems/oonf_class.h"
-#include "subsystems/oonf_rfc5444.h"
-#include "subsystems/rfc5444/rfc5444_reader.h"
-#include "subsystems/rfc5444/rfc5444_writer.h"
-
-#include "rfc5444_signature/rfc5444_signature.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/libcommon/avl_comp.h>
+#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/librfc5444/rfc5444_reader.h>
+#include <oonf/librfc5444/rfc5444_writer.h>
+
+#include <oonf/crypto/rfc5444_signature/rfc5444_signature.h>
 
 #define LOG_RFC5444_SIG _rfc5444_sig_subsystem.logging
 
  * @file
  */
 
-#include "common/avl.h"
-#include "common/avl_comp.h"
-#include "common/common_types.h"
-#include "core/oonf_subsystem.h"
-#include "subsystems/oonf_class.h"
-#include "subsystems/rfc5444/rfc5444_iana.h"
-
-#include "rfc7182_provider/rfc7182_provider.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/libcommon/avl_comp.h>
+#include <oonf/oonf.h>
+#include <oonf/libcore/oonf_subsystem.h>
+#include <oonf/subsystems/oonf_class.h>
+#include <oonf/librfc5444/rfc5444_iana.h>
+
+#include <oonf/crypto/rfc7182_provider/rfc7182_provider.h>
 
 #define LOG_RFC7182_PROVIDER _rfc7182_provider_subsystem.logging
 
similarity index 96%
rename from src-plugins/crypto/sharedkey_sig/sharedkey_sig.c
rename to src/crypto/sharedkey_sig/sharedkey_sig.c
index 21384fc..18232c4 100644 (file)
  * @file
  */
 
-#include "common/avl.h"
-#include "common/avl_comp.h"
-#include "common/bitmap256.h"
-#include "common/common_types.h"
-#include "config/cfg_schema.h"
-#include "core/oonf_subsystem.h"
-#include "rfc5444_signature/rfc5444_signature.h"
-#include "subsystems/oonf_class.h"
-#include "subsystems/oonf_rfc5444.h"
-#include "subsystems/rfc5444/rfc5444_iana.h"
-
-#include "sharedkey_sig/sharedkey_sig.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/libcommon/avl_comp.h>
+#include <oonf/libcommon/bitmap256.h>
+#include <oonf/oonf.h>
+#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/librfc5444/rfc5444_iana.h>
+
+#include <oonf/crypto/sharedkey_sig/sharedkey_sig.h>
 
 #define LOG_SHAREDKEY_SIG _sharedkey_sig_subsystem.logging
 
 
 #include <string.h>
 
-#include "common/avl.h"
-#include "common/avl_comp.h"
-#include "common/common_types.h"
-#include "common/netaddr.h"
-#include "config/cfg_schema.h"
-#include "core/oonf_subsystem.h"
-#include "crypto/rfc5444_signature/rfc5444_signature.h"
-#include "subsystems/oonf_class.h"
-#include "subsystems/oonf_rfc5444.h"
-#include "subsystems/oonf_timer.h"
-#include "subsystems/os_interface.h"
-
-#include "crypto/simple_security/simple_security.h"
+#include <oonf/libcommon/avl.h>
+#include <oonf/libcommon/avl_comp.h>
+#include <oonf/oonf.h>
+#include <oonf/libcommon/netaddr.h>
+#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/crypto/simple_security/simple_security.h>
 
 /* definitions */
 #define LOG_SIMPLE_SECURITY _simple_security_subsystem.logging
similarity index 98%
rename from src-plugins/generic/cfg_compact/cfg_compact.c
rename to src/generic/cfg_compact/cfg_compact.c
index 8179a7f..2b4eda3 100644 (file)
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "common/autobuf.h"
-#include "config/cfg.h"
-#include "config/cfg_io.h"
-#include "core/oonf_subsystem.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/libconfig/cfg.h>
+#include <oonf/libconfig/cfg_io.h>
+#include <oonf/libcore/oonf_subsystem.h>
 
-#include "core/oonf_cfg.h"
+#include <oonf/libcore/oonf_cfg.h>
 
-#include "cfg_compact/cfg_compact.h"
+#include <oonf/generic/cfg_compact/cfg_compact.h>
 
 static void _early_cfg_init(void);
 static void _cleanup(void);
 #include <uci.h>
 #undef container_of
 
-#include "common/autobuf.h"
-#include "common/common_types.h"
-#include "config/cfg.h"
-#include "config/cfg_io.h"
-#include "core/oonf_subsystem.h"
+#include <oonf/libcommon/autobuf.h>
+#include <oonf/oonf.h>
+#include <oonf/libconfig/cfg.h>
+#include <oonf/libconfig/cfg_io.h>
+#include <oonf/libcore/oonf_subsystem.h>