X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=netifd.h;h=5a908587efafeec1ce5640d219d52e6b08c37a91;hp=e51514e9e267910a70cfb4842eb588e987be57af;hb=fb2f843edf44c6f12b636cd82cdd1c71e953495f;hpb=bfe5db1ea8018aaa940dc6e991110fac62b85516;ds=sidebyside

diff --git a/netifd.h b/netifd.h
index e51514e..5a90858 100644
--- a/netifd.h
+++ b/netifd.h
@@ -21,17 +21,21 @@
 #include <stdio.h>
 
 #include <libubox/uloop.h>
+#include <libubox/ustream.h>
+#include <libubox/utils.h>
 
 #include <libubus.h>
 
 #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"
 #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"
 #endif
@@ -52,6 +56,7 @@ enum {
 	DEBUG_SYSTEM	= 0,
 	DEBUG_DEVICE	= 1,
 	DEBUG_INTERFACE	= 2,
+	DEBUG_WIRELESS	= 3,
 };
 
 #ifdef DEBUG
@@ -71,23 +76,14 @@ static inline void no_debug(int level, const char *fmt, ...)
 {
 }
 
-struct netifd_fd {
-	struct list_head list;
-	struct netifd_process *proc;
-	int fd;
-};
-
 struct netifd_process {
 	struct list_head list;
 	struct uloop_process uloop;
 	void (*cb)(struct netifd_process *, int ret);
 	int dir_fd;
 
-	struct netifd_fd log_fd;
-	struct uloop_fd log_uloop;
+	struct ustream_fd log;
 	const char *log_prefix;
-	char *log_buf;
-	int log_buf_ofs;
 	bool log_overflow;
 };
 
@@ -96,13 +92,11 @@ void netifd_log_message(int priority, const char *format, ...);
 int netifd_start_process(const char **argv, char **env, struct netifd_process *proc);
 void netifd_kill_process(struct netifd_process *proc);
 
-void netifd_fd_add(struct netifd_fd *fd);
-void netifd_fd_delete(struct netifd_fd *fd);
-
 struct device;
 struct interface;
 
 extern const char *main_path;
+extern const char *config_path;
 void netifd_restart(void);
 void netifd_reload(void);