X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=72cf0e54737f8ff972cc9bf4f1448da63ee6192e;hp=cdd1ff0583212766b675aa00f9071ccca565d69b;hb=d6bcf552c169c1d0fd317f9654b8c81c3d838362;hpb=856b9f1c3794b96738e89b4d7655b3acdb16d9a9

diff --git a/ubus.c b/ubus.c
index cdd1ff0..72cf0e5 100644
--- a/ubus.c
+++ b/ubus.c
@@ -1,6 +1,7 @@
 #include <string.h>
 
 #include "netifd.h"
+#include "interface.h"
 #include "ubus.h"
 
 static struct ubus_context *ctx = NULL;
@@ -110,16 +111,46 @@ static int netifd_handle_down(struct ubus_context *ctx, struct ubus_object *obj,
 	return 0;
 }
 
+static void netifd_add_interface_errors(struct blob_buf *b, struct interface *iface)
+{
+	struct interface_error *error;
+	void *e, *e2, *e3;
+	int i;
+
+	e = blobmsg_open_array(b, "errors");
+	list_for_each_entry(error, &iface->errors, list) {
+		e2 = blobmsg_open_table(b, NULL);
+
+		blobmsg_add_string(b, "subsystem", error->subsystem);
+		blobmsg_add_string(b, "code", error->code);
+		if (error->data[0]) {
+			e3 = blobmsg_open_array(b, "data");
+			for (i = 0; error->data[i]; i++)
+				blobmsg_add_string(b, NULL, error->data[i]);
+			blobmsg_close_array(b, e3);
+		}
+
+		blobmsg_close_table(b, e2);
+	}
+	blobmsg_close_array(b, e);
+}
+
 static int netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
 				struct ubus_request_data *req, const char *method,
 				struct blob_attr *msg)
 {
+	static const char *iface_state[] = {
+		[IFS_SETUP] = "setup",
+		[IFS_UP] = "up",
+		[IFS_TEARDOWN] = "teardown",
+		[IFS_DOWN] = "down",
+	};
 	struct interface *iface;
 
 	iface = container_of(obj, struct interface, ubus);
 
 	blob_buf_init(&b, 0);
-	blobmsg_add_u8(&b, "up", iface->up);
+	blobmsg_add_string(&b, "state", iface_state[iface->state]);
 	blobmsg_add_u8(&b, "active", iface->active);
 	blobmsg_add_u8(&b, "autostart", iface->autostart);
 	if (iface->main_dev.dev) {
@@ -142,6 +173,9 @@ static int netifd_handle_status(struct ubus_context *ctx, struct ubus_object *ob
 		blobmsg_close_table(&b, devinfo);
 	}
 
+	if (!list_is_empty(&iface->errors))
+		netifd_add_interface_errors(&b, iface);
+
 	ubus_send_reply(ctx, req, b.head);
 
 	return 0;