Merge Ubus with the 2016.02.26 version.

3P/ubus/ubusmsg.h

@@ -22,6 +22,8 @@
 #define UBUS_MSG_CHUNK_SIZE	65536
 
 #define UBUS_SYSTEM_OBJECT_EVENT	1
+#define UBUS_SYSTEM_OBJECT_ACL		2
+#define UBUS_SYSTEM_OBJECT_MONITOR	3
 #define UBUS_SYSTEM_OBJECT_MAX		1024
 
 struct ubus_msghdr {
@@ -68,6 +70,8 @@ enum ubus_msg_type {
 	 */
 	UBUS_MSG_NOTIFY,
 
+	UBUS_MSG_MONITOR,
+
 	/* must be last */
 	__UBUS_MSG_LAST,
 };
@@ -92,10 +96,25 @@ enum ubus_msg_attr {
 
 	UBUS_ATTR_SUBSCRIBERS,
 
+	UBUS_ATTR_USER,
+	UBUS_ATTR_GROUP,
+
 	/* must be last */
 	UBUS_ATTR_MAX,
 };
 
+enum ubus_monitor_attr {
+	UBUS_MONITOR_CLIENT,
+	UBUS_MONITOR_PEER,
+	UBUS_MONITOR_SEND,
+	UBUS_MONITOR_SEQ,
+	UBUS_MONITOR_TYPE,
+	UBUS_MONITOR_DATA,
+
+	/* must be last */
+	UBUS_MONITOR_MAX,
+};
+
 enum ubus_msg_status {
 	UBUS_STATUS_OK,
 	UBUS_STATUS_INVALID_COMMAND,