bridge: fix config reload on 32 bit systems

[project/netifd.git] / netifd.h

diff --git a/netifd.h b/netifd.h
index ac0c0f24bab9180c3e164ce292ec33b5655bdff5..9645a0a33769148f80b469fe610e17ce637f5da6 100644 (file)
--- a/netifd.h
+++ b/netifd.h
@@ -21,19 +21,31 @@
 #include <stdio.h>
 
 #include <libubox/uloop.h>
+#include <libubox/ustream.h>
+#include <libubox/utils.h>
 
 #include <libubus.h>
 
+#ifdef linux
+#include <netinet/ether.h>
+#else
+#include <net/ethernet.h>
+#endif
+
 #include "utils.h"
 
 #ifdef DUMMY_MODE
-#define DEFAULT_MAIN_PATH      "./dummy"
-#define DEFAULT_HOTPLUG_PATH   "./scripts/hotplug-cmd"
+#define DEFAULT_MAIN_PATH      "./examples"
+#define DEFAULT_CONFIG_PATH    "./config"
+#define DEFAULT_HOTPLUG_PATH   "./examples/hotplug-cmd"
 #define DEFAULT_RESOLV_CONF    "./tmp/resolv.conf"
+#define DEFAULT_BOARD_JSON     "./config/board.json"
 #else
 #define DEFAULT_MAIN_PATH      "/lib/netifd"
+#define DEFAULT_CONFIG_PATH    NULL /* use the default set in libuci */
 #define DEFAULT_HOTPLUG_PATH   "/sbin/hotplug-call"
-#define DEFAULT_RESOLV_CONF    "/tmp/resolv.conf.auto"
+#define DEFAULT_RESOLV_CONF    "/tmp/resolv.conf.d/resolv.conf.auto"
+#define DEFAULT_BOARD_JSON     "/etc/board.json"
 #endif
 
 extern const char *resolv_conf;
@@ -52,6 +64,7 @@ enum {
        DEBUG_SYSTEM    = 0,
        DEBUG_DEVICE    = 1,
        DEBUG_INTERFACE = 2,
+       DEBUG_WIRELESS  = 3,
 };
 
 #ifdef DEBUG
@@ -77,10 +90,8 @@ struct netifd_process {
        void (*cb)(struct netifd_process *, int ret);
        int dir_fd;
 
-       struct uloop_fd log_uloop;
+       struct ustream_fd log;
        const char *log_prefix;
-       char *log_buf;
-       int log_buf_ofs;
        bool log_overflow;
 };
 
@@ -93,7 +104,8 @@ struct device;
 struct interface;
 
 extern const char *main_path;
+extern const char *config_path;
 void netifd_restart(void);
-void netifd_reload(void);
+int netifd_reload(void);
 
 #endif