Pull changes from development (08/2022)

CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+project (OONF C)
 
 ###########################
 #### API configuration ####

apps/dlep-radio/CMakeLists.txt

@@ -28,12 +28,14 @@ set (OONF_APP_DEFAULT_CFG_HANDLER Compact)
 
 IF (NOT OONF_STATIC_PLUGINS)
     set (OONF_STATIC_PLUGINS class
+                             callback
                              clock
                              layer2
                              packet_socket
                              socket
                              stream_socket
                              telnet
+                             http
                              timer
                              viewer
                              os_clock
@@ -44,9 +46,11 @@ IF (NOT OONF_STATIC_PLUGINS)
                              cfg_compact
                              layer2info
                              systeminfo
+                             remotecontrol
                              layer2_config
                              layer2_import
-                             dlep_radio
+                             layer2_export
+                             dlep
                              )
 ENDIF (NOT OONF_STATIC_PLUGINS)
 

apps/dlep-router/CMakeLists.txt

@@ -28,12 +28,14 @@ set (OONF_APP_DEFAULT_CFG_HANDLER Compact)
 
 IF (NOT OONF_STATIC_PLUGINS)
     set (OONF_STATIC_PLUGINS class
+                             callback
                              clock
                              layer2
                              packet_socket
                              socket
                              stream_socket
                              telnet
+                             http
                              timer
                              viewer
                              os_clock
@@ -44,8 +46,12 @@ IF (NOT OONF_STATIC_PLUGINS)
                              cfg_compact
                              layer2info
                              systeminfo
-                             dlep_router
+                             remotecontrol
+                             layer2_config
                              layer2_export
+#                             dns_query
+#                             dns_sd
+                             dlep
                              )
 ENDIF (NOT OONF_STATIC_PLUGINS)
 

apps/olsrd2-dlep/CMakeLists.txt

@@ -28,6 +28,7 @@ set (OONF_APP_DEFAULT_CFG_HANDLER Compact)
 
 IF (NOT OONF_STATIC_PLUGINS)
     set (OONF_STATIC_PLUGINS class
+                             callback
                              clock
                              duplicate_set
                              layer2
@@ -54,17 +55,24 @@ IF (NOT OONF_STATIC_PLUGINS)
                              olsrv2
                              olsrv2info
                              olsrv2_lan
+                             olsrv2_old_lan
+                             olsrv2_l2import
                              netjsoninfo
                              layer2_import
                              auto_ll4
                              http
-                             dlep_router
+                             mpr
+                             remotecontrol
+                             route_modifier
+                             dlep
                              )
 ENDIF (NOT OONF_STATIC_PLUGINS)
 
 
 IF (NOT OONF_OPTIONAL_STATIC_PLUGINS)
-    set (OONF_OPTIONAL_STATIC_PLUGINS nl80211_listener)
+    set (OONF_OPTIONAL_STATIC_PLUGINS nl80211_listener
+                                      cfg_uciloader
+                                      )
 ENDIF (NOT OONF_OPTIONAL_STATIC_PLUGINS)
 
 ##################################

apps/olsrd2/CMakeLists.txt

@@ -28,6 +28,7 @@ set (OONF_APP_DEFAULT_CFG_HANDLER Compact)
 
 IF (NOT OONF_STATIC_PLUGINS)
     set (OONF_STATIC_PLUGINS class
+                             callback
                              clock
                              duplicate_set
                              layer2
@@ -62,6 +63,7 @@ IF (NOT OONF_STATIC_PLUGINS)
                              http
                              mpr
                              remotecontrol
+                             route_modifier
                              )
 ENDIF (NOT OONF_STATIC_PLUGINS)
 

include/oonf/base/oonf_callback.h

@@ -0,0 +1,78 @@
+
+/*
+ * The olsr.org Optimized Link-State Routing daemon version 2 (olsrd2)
+ * Copyright (c) 2004-2015, the olsr.org team - see HISTORY file
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in
+ *   the documentation and/or other materials provided with the
+ *   distribution.
+ * * Neither the name of olsr.org, olsrd nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Visit http://www.olsr.org for more information.
+ *
+ * If you find this software useful feel free to make a donation
+ * to the project. For more information see the website or contact
+ * the copyright holders.
+ *
+ */
+
+/**
+ * @file
+ */
+
+#ifndef OONF_CALLBACK_H_
+#define OONF_CALLBACK_H_
+
+#include <oonf/oonf.h>
+#include <oonf/libcommon/list.h>
+
+/*! subsystem identifier */
+#define OONF_CALLBACK_SUBSYSTEM "callback"
+
+/**
+ * This struct defines callback that should be called as soon as
+ * the runtime returns to the mainloop.
+ */
+struct oonf_callback {
+  /*! node of callback list */
+  struct list_entity _node;
+
+  /*! name of this callback */
+  const char *name;
+
+  /**
+   * Callback when timer is triggered
+   * @param ptr pointer to timer instance that fired
+   */
+  void (*cb_trigger)(struct oonf_callback *ptr);
+};
+
+EXPORT void oonf_callback_add(struct oonf_callback *cb);
+EXPORT void oonf_callback_remove(struct oonf_callback *cb);
+EXPORT void oonf_callback_walk(void);
+EXPORT struct list_entity *oonf_callback_get_list(void);
+
+#endif /* OONF_CALLBACK_H_ */

include/oonf/base/oonf_class.h

@@ -46,8 +46,8 @@
 #ifndef _OONF_CLASS_H
 #define _OONF_CLASS_H
 
-#include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
+#include <oonf/libcommon/avl.h>
 #include <oonf/libcommon/list.h>
 
 /*! subsystem identifier */
@@ -76,6 +76,44 @@ struct oonf_objectkey_str {
   char buf[128];
 };
 
+/* storage data for a custom guard */
+struct oonf_class_guard {
+  const char *name;
+  uint32_t id;
+};
+
+enum {
+  OONF_CLASS_GUARD1 = 0x13572468,
+  OONF_CLASS_GUARD2 = 0x75318642
+};
+
+/**
+ * Prefix to check data for overwriting and type error
+ */
+struct oonf_class_guard_prefix {
+  uint32_t id;
+  uint32_t guard1;
+};
+
+#ifdef OONF_LOG_DEBUG_INFO
+#define OONF_CLASS_GUARD_PREFIX struct oonf_class_guard_prefix __guard_prefix;
+#else
+#define OONF_CLASS_GUARD_PREFIX
+#endif
+
+/**
+ * Suffix to check data for overwriting
+ */
+struct oonf_class_guard_suffix {
+  uint32_t guard2;
+};
+
+#ifdef OONF_LOG_DEBUG_INFO
+#define OONF_CLASS_GUARD_SUFFIX struct oonf_class_guard_suffix __guard_suffix;
+#else
+#define OONF_CLASS_GUARD_SUFFIX
+#endif
+
 /**
  * This structure represents a class of memory object, each with the same size.
  */
@@ -124,6 +162,12 @@ struct oonf_class {
 
   /*! Stats, recycled memory blocks */
   uint32_t _recycled;
+
+  /*! track debug status of class */
+  bool debug;
+
+  /* guard for debugging */
+  struct oonf_class_guard class_guard;
 };
 
 /**
@@ -174,6 +218,9 @@ EXPORT void oonf_class_remove(struct oonf_class *);
 
 EXPORT void *oonf_class_malloc(struct oonf_class *) __attribute__((warn_unused_result));
 EXPORT void oonf_class_free(struct oonf_class *, void *);
+EXPORT void oonf_class_check(struct oonf_class *ci, void *ptr);
+
+EXPORT void oonf_class_guard_add(struct oonf_class_guard *);
 
 EXPORT int oonf_class_extension_add(struct oonf_class_extension *);
 EXPORT void oonf_class_extension_remove(struct oonf_class_extension *);
@@ -232,11 +279,7 @@ oonf_class_get_extension(struct oonf_class_extension *ext, void *ptr) {
 /**
  * @param ext extension data structure
  * @param ptr pointer to extension block
-<<<<<<< HEAD
  * @return pointer to base memory block
-=======
- * @return pointer to extensions base block
->>>>>>> mpr_rework
  */
 static INLINE void *
 oonf_class_get_base(struct oonf_class_extension *ext, void *ptr) {
@@ -252,4 +295,44 @@ oonf_class_is_extension_registered(struct oonf_class_extension *ext) {
   return list_is_node_added(&ext->_node);
 }
 
+#ifdef OONF_LOG_DEBUG_INFO
+#define oonf_class_guard_init(guard, base) oonf_class_guard_init_ext(guard, &(base)->__guard_prefix, &(base)->__guard_suffix)
+
+static INLINE void
+oonf_class_guard_init_ext(struct oonf_class_guard *guard,
+    struct oonf_class_guard_prefix *prefix, struct oonf_class_guard_suffix *suffix) {
+  prefix->guard1 = OONF_CLASS_GUARD1;
+  prefix->id = guard->id;
+  suffix->guard2 = OONF_CLASS_GUARD2;
+}
+
+#define oonf_class_guard_is_valid(guard, base) oonf_class_guard_is_valid_ext(guard, &(base)->__guard_prefix, &(base)->__guard_suffix)
+#define OONF_CLASS_GUARD_ASSERT(guard, base, logging) OONF_ASSERT(oonf_class_guard_is_valid(guard, base), logging, "%s (%u) guard is bad (id=%u, guard1=%08x, guard2=%08x)", (guard)->name, (guard)->id, (base)->__guard_prefix.id, (base)->__guard_prefix.guard1, (base)->__guard_suffix.guard2)
+
+static INLINE bool
+oonf_class_guard_is_valid_ext(struct oonf_class_guard *guard,
+    struct oonf_class_guard_prefix *prefix, struct oonf_class_guard_suffix *suffix) {
+  return prefix->guard1 == OONF_CLASS_GUARD1
+      && suffix->guard2 == OONF_CLASS_GUARD2
+      && prefix->id == guard->id;
+}
+#else /* OONF_LOG_DEBUG_INFO */
+#define oonf_class_guard_init(guard, base) do {} while(0)
+static INLINE void
+oonf_class_guard_init_ext(struct oonf_class_guard *guard __attribute__((unused)),
+    struct oonf_class_guard_prefix *prefix __attribute__((unused)),
+    struct oonf_class_guard_suffix *suffix __attribute__((unused))) {
+}
+#define oonf_class_guard_is_valid(guard, base) true
+#define OONF_CLASS_GUARD_ASSERT(guard, ptr, logging) do {} while(0)
+
+static INLINE bool
+oonf_class_guard_is_valid_ext(struct oonf_class_guard *guard __attribute__((unused)),
+    struct oonf_class_guard_prefix *prefix __attribute__((unused)),
+    struct oonf_class_guard_suffix *suffix __attribute__((unused))) {
+  return true;
+}
+
+#endif /* OONF_LOG_DEBUG_INFO */
+
 #endif /* _OONF_CLASS_H */

include/oonf/base/oonf_clock.h

@@ -177,15 +177,27 @@ EXPORT uint64_t oonf_clock_getNow(void);
 EXPORT const char *oonf_clock_toClockString(struct isonumber_str *, uint64_t);
 
 /**
- * Converts an internal time value into a string representation with
+ * Converts an internal time interval into a string representation with
+ * the numbers of seconds (including milliseconds as fractions)
+ * @param buf target buffer
+ * @param i time value
+ * @return pointer to string representation
+ */
+static INLINE const char *
+oonf_clock_toIntervalString_ext(struct isonumber_str *buf, int64_t i, bool raw) {
+  return isonumber_from_s64(buf, i, "", 1000, raw);
+}
+
+/**
+ * Converts an internal time interval into a string representation with
  * the numbers of seconds (including milliseconds as fractions)
  * @param buf target buffer
  * @param i time value
  * @return pointer to string representation
  */
 static INLINE const char *
 oonf_clock_toIntervalString(struct isonumber_str *buf, int64_t i) {
-  return isonumber_from_s64(buf, i, "", 1000, true);
+  return oonf_clock_toIntervalString_ext(buf, i, false);
 }
 
 /**
@@ -200,7 +212,7 @@ oonf_clock_fromIntervalString(uint64_t *result, const char *string) {
   int64_t t;
   int r;
 
-  r = isonumber_to_s64(&t, string, 1000);
+  r = isonumber_to_s64(&t, string, NULL, 1000);
   if (r == 0) {
     *result = t;
   }

include/oonf/base/oonf_duplicate_set.h

@@ -46,8 +46,8 @@
 #ifndef OONF_DUPLICATE_SET_H_
 #define OONF_DUPLICATE_SET_H_
 
-#include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
+#include <oonf/libcommon/avl.h>
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/base/oonf_timer.h>
 

include/oonf/base/oonf_http.h

@@ -46,8 +46,8 @@
 #ifndef OONF_HTTP_H_
 #define OONF_HTTP_H_
 
-#include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
+#include <oonf/libcommon/avl.h>
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcommon/netaddr_acl.h>
 #include <oonf/libcommon/string.h>