First code revision that does not freeze the netlink sockets in autom…

…atic test setup

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 */

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>

include/oonf/base/oonf_layer2.h

@@ -46,8 +46,8 @@
 #ifndef OONF_LAYER2_H_
 #define OONF_LAYER2_H_
 
-#include <oonf/libcommon/avl.h>
 #include <oonf/oonf.h>
+#include <oonf/libcommon/avl.h>
 #include <oonf/libcore/oonf_subsystem.h>
 #include <oonf/base/os_interface.h>
 

include/oonf/base/oonf_packet_socket.h

@@ -46,8 +46,8 @@
 #ifndef OONF_PACKET_SOCKET_H_
 #define OONF_PACKET_SOCKET_H_
 
-#include <oonf/libcommon/autobuf.h>
 #include <oonf/oonf.h>
+#include <oonf/libcommon/autobuf.h>
 #include <oonf/libcommon/list.h>
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcommon/netaddr_acl.h>

include/oonf/base/oonf_rfc5444.h

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

include/oonf/base/oonf_socket.h

@@ -46,47 +46,18 @@
 #ifndef OONF_SOCKET_H_
 #define OONF_SOCKET_H_
 
-#include <oonf/libcommon/avl.h>
+struct oonf_socket_entry;
+
 #include <oonf/oonf.h>
+#include <oonf/libcommon/avl.h>
 #include <oonf/libcommon/list.h>
 #include <oonf/libcommon/netaddr_acl.h>
 #include <oonf/base/os_fd.h>
+#include <oonf/base/oonf_socket_data.h>
 
 /*! subsystem identifier */
 #define OONF_SOCKET_SUBSYSTEM "socket"
 
-/**
- * registered socket handler
- */
-struct oonf_socket_entry {
-  /*! name of socket handler */
-  const char *name;
-
-  /*! file descriptor of the socket */
-  struct os_fd fd;
-
-  /**
-   * Callback when read or write event happens to socket
-   * @param fd file descriptor of socket
-   */
-  void (*process)(struct oonf_socket_entry *entry);
-
-  /*! usage counter, will be increased every times the socket receives data */
-  uint32_t _stat_recv;
-
-  /*! usage counter, will be increased every times the socket sends data */
-  uint32_t _stat_send;
-
-  /*!
-   * usage counter, will be increased every times a socket processing takes
-   * more than a TIMER slice
-   */
-  uint32_t _stat_long;
-
-  /*! list of socket handlers */
-  struct list_entity _node;
-};
-
 EXPORT void oonf_socket_add(struct oonf_socket_entry *);
 EXPORT void oonf_socket_remove(struct oonf_socket_entry *);
 EXPORT void oonf_socket_set_read(struct oonf_socket_entry *entry, bool event_read);

include/oonf/base/oonf_socket_data.h

@@ -0,0 +1,87 @@
+
+/*
+ * 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_SOCKET_DATA_H_
+#define OONF_SOCKET_DATA_H_
+
+struct oonf_socket_entry;
+
+#include <oonf/oonf.h>
+#include <oonf/libcommon/list.h>
+#include <oonf/base/os_fd_data.h>
+
+/**
+ * registered socket handler
+ */
+struct oonf_socket_entry {
+  /*! name of socket handler */
+  const char *name;
+
+  /*! file descriptor of the socket */
+  struct os_fd fd;
+
+  /**
+   * Callback when read or write event happens to socket
+   * @param fd file descriptor of socket
+   */
+  void (*process)(struct oonf_socket_entry *entry);
+
+  /*! usage counter, will be increased every times the socket receives data */
+  uint32_t _stat_recv;
+
+  /*! usage counter, will be increased every times the socket sends data */
+  uint32_t _stat_send;
+
+  /*!
+   * usage counter, will be increased every times a socket processing takes
+   * more than a TIMER slice
+   */
+  uint32_t _stat_long;
+
+  /*! list of socket handlers */
+  struct list_entity _node;
+};
+
+#endif /* OONF_SOCKET_DATA_H_ */

include/oonf/base/oonf_stream_socket.h

@@ -46,8 +46,8 @@
 #ifndef OONF_STREAM_SOCKET_H_
 #define OONF_STREAM_SOCKET_H_
 
-#include <oonf/libcommon/autobuf.h>
 #include <oonf/oonf.h>
+#include <oonf/libcommon/autobuf.h>
 #include <oonf/libcommon/list.h>
 #include <oonf/libcommon/netaddr.h>
 #include <oonf/libcommon/netaddr_acl.h>

include/oonf/base/os_clock.h

@@ -56,11 +56,7 @@
 #define OONF_OS_CLOCK_SUBSYSTEM "os_clock"
 
 #if defined(__linux__)
-#include <oonf/base/os_linux/os_clock_linux.h>
-#elif defined(BSD)
-#include <oonf/base/os_bsd/os_clock_bsd.h>
-#elif defined(_WIN32)
-#include <oonf/base/os_win32/os_clock_win32.h>
+#include <oonf/base/os_linux/os_clock_linux_data.h>
 #else
 #error "Unknown operation system"
 #endif
@@ -69,4 +65,10 @@
 static INLINE int os_clock_gettime64_ns(uint64_t *t64);
 static INLINE int os_clock_gettime64(uint64_t *t64);
 
+#if defined(__linux__)
+#include <oonf/base/os_linux/os_clock_linux.h>
+#else
+#error "Unknown operation system"
+#endif
+
 #endif /* OS_CLOCK_H_ */

include/oonf/base/os_fd.h

@@ -46,6 +46,12 @@
 #ifndef OS_FD_H_
 #define OS_FD_H_
 
+#if 0
+/* pre-definition of structs */
+struct os_fd;
+struct os_fd_select;
+#endif
+
 #include <sys/select.h>
 #include <unistd.h>
 
@@ -57,13 +63,20 @@
 #include <oonf/base/oonf_timer.h>
 #include <oonf/base/os_interface.h>
 
+#include <oonf/base/os_fd_data.h>
+
+#if 0
+/* include os-specific headers */
+#if defined(__linux__)
+#include <oonf/base/os_linux/os_fd_linux_data.h>
+#elif defined(BSD)
+#error "Unknown operation system"
+#endif
+#endif
+
 /*! subsystem identifier */
 #define OONF_OS_FD_SUBSYSTEM "os_fd"
 
-/* pre-definition of structs */
-struct os_fd;
-struct os_fd_select;
-
 /* pre-declare inlines */
 static INLINE int os_fd_init(struct os_fd *, int fd);
 static INLINE int os_fd_copy(struct os_fd *dst, struct os_fd *from);
@@ -116,10 +129,6 @@ static INLINE uint8_t *os_fd_skip_rawsocket_prefix(uint8_t *ptr, ssize_t *len, i
 #if defined(__linux__)
 #include <oonf/base/os_linux/os_fd_linux.h>
 #elif defined(BSD)
-#include <oonf/base/os_bsd/os_fd_bsd.h>
-#elif defined(_WIN32)
-#include <oonf/base/os_win32/os_fd_win32.h>
-#else
 #error "Unknown operation system"
 #endif
 

include/oonf/base/os_fd_data.h

@@ -0,0 +1,60 @@
+
+/*
+ * 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 OS_FD_DATA_H_
+#define OS_FD_DATA_H_
+
+/* pre-definition of structs */
+struct os_fd;
+struct os_fd_select;
+
+/* include os-specific headers */
+#if defined(__linux__)
+#include <oonf/base/os_linux/os_fd_linux_data.h>
+#elif defined(BSD)
+#error "Unknown operation system"
+#endif
+
+#endif /* OS_FD_DATA_H_ */