projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netifd: Check interface state only when main device is set during interface_change_config
[project/netifd.git]
/
netifd.h
diff --git
a/netifd.h
b/netifd.h
index
ac0c0f2
..
5a90858
100644
(file)
--- a/
netifd.h
+++ b/
netifd.h
@@
-21,17
+21,21
@@
#include <stdio.h>
#include <libubox/uloop.h>
#include <stdio.h>
#include <libubox/uloop.h>
+#include <libubox/ustream.h>
+#include <libubox/utils.h>
#include <libubus.h>
#include "utils.h"
#ifdef DUMMY_MODE
#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_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
#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_SYSTEM = 0,
DEBUG_DEVICE = 1,
DEBUG_INTERFACE = 2,
+ DEBUG_WIRELESS = 3,
};
#ifdef DEBUG
};
#ifdef DEBUG
@@
-77,10
+82,8
@@
struct netifd_process {
void (*cb)(struct netifd_process *, int ret);
int dir_fd;
void (*cb)(struct netifd_process *, int ret);
int dir_fd;
- struct u
loop_fd log_uloop
;
+ struct u
stream_fd log
;
const char *log_prefix;
const char *log_prefix;
- char *log_buf;
- int log_buf_ofs;
bool log_overflow;
};
bool log_overflow;
};
@@
-93,6
+96,7
@@
struct device;
struct interface;
extern const char *main_path;
struct interface;
extern const char *main_path;
+extern const char *config_path;
void netifd_restart(void);
void netifd_reload(void);
void netifd_restart(void);
void netifd_reload(void);