use ustream for process message logging

[project/netifd.git] / netifd.h

diff --git a/netifd.h b/netifd.h
index 5eeb5e2..aa955ef 100644 (file)
--- a/netifd.h
+++ b/netifd.h
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #ifndef __NETIFD_H
 #define __NETIFD_H
 
@@ -8,6 +21,7 @@
 #include <stdio.h>
 
 #include <libubox/uloop.h>
+#include <libubox/ustream.h>
 
 #include <libubus.h>
 
@@ -19,7 +33,7 @@
 #define DEFAULT_RESOLV_CONF    "./tmp/resolv.conf"
 #else
 #define DEFAULT_MAIN_PATH      "/lib/netifd"
-#define DEFAULT_HOTPLUG_PATH   "/sbin/hotplug-cmd"
+#define DEFAULT_HOTPLUG_PATH   "/sbin/hotplug-call"
 #define DEFAULT_RESOLV_CONF    "/tmp/resolv.conf.auto"
 #endif
 
@@ -28,6 +42,14 @@ extern char *hotplug_cmd_path;
 extern unsigned int debug_mask;
 
 enum {
+       L_CRIT,
+       L_WARNING,
+       L_NOTICE,
+       L_INFO,
+       L_DEBUG
+};
+
+enum {
        DEBUG_SYSTEM    = 0,
        DEBUG_DEVICE    = 1,
        DEBUG_INTERFACE = 2,
@@ -44,6 +66,8 @@ enum {
 #define D(level, format, ...) no_debug(DEBUG_ ## level, format, ## __VA_ARGS__)
 #endif
 
+#define LOG_BUF_SIZE   256
+
 static inline void no_debug(int level, const char *fmt, ...)
 {
 }
@@ -52,9 +76,16 @@ struct netifd_process {
        struct list_head list;
        struct uloop_process uloop;
        void (*cb)(struct netifd_process *, int ret);
+       int dir_fd;
+
+       struct ustream_fd log;
+       const char *log_prefix;
+       bool log_overflow;
 };
 
-int netifd_start_process(const char **argv, char **env, int dir_fd, struct netifd_process *proc);
+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);
 
 struct device;