#include <stdio.h>
#include <libubox/uloop.h>
+#include <libubox/ustream.h>
+#include <libubox/utils.h>
#include <libubus.h>
+#include <udebug.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;
extern char *hotplug_cmd_path;
extern unsigned int debug_mask;
+extern struct udebug_buf udb_nl;
enum {
L_CRIT,
DEBUG_SYSTEM = 0,
DEBUG_DEVICE = 1,
DEBUG_INTERFACE = 2,
+ DEBUG_WIRELESS = 3,
};
#ifdef DEBUG
#define DPRINTF(format, ...) fprintf(stderr, "%s(%d): " format, __func__, __LINE__, ## __VA_ARGS__)
#define D(level, format, ...) do { \
- if (debug_mask & (1 << (DEBUG_ ## level))) \
- DPRINTF(format, ##__VA_ARGS__); \
+ netifd_udebug_printf("[" #level "] %s(%d): " format, __func__, __LINE__, ## __VA_ARGS__); \
+ if (debug_mask & (1 << (DEBUG_ ## level))) { \
+ DPRINTF(format, ##__VA_ARGS__); \
+ fprintf(stderr, "\n"); \
+ } \
} while (0)
#else
#define DPRINTF(format, ...) no_debug(0, format, ## __VA_ARGS__)
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;
};
+void netifd_udebug_printf(const char *format, ...);
+void netifd_udebug_config(struct udebug_ubus *ctx, struct blob_attr *data,
+ bool enabled);
void netifd_log_message(int priority, const char *format, ...);
int netifd_start_process(const char **argv, char **env, struct netifd_process *proc);
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