uloop: do not use ULOOP_EDGE_TRIGGER for the blocking socket, it can miss some events...

[project/ubus.git] / ubusd_proto.c

diff --git a/ubusd_proto.c b/ubusd_proto.c
index ff2725b..d49ef48 100644 (file)
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -1,3 +1,16 @@
+/*
+ * Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * 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.
+ */
+
 #include <arpa/inet.h>
 #include "ubusd.h"
 
@@ -150,7 +163,6 @@ static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub,
 {
        struct ubus_object *obj;
        char *objpath;
-       bool wildcard = false;
        bool found = false;
        int len;
 
@@ -172,7 +184,6 @@ static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub,
        }
 
        objpath[--len] = 0;
-       wildcard = true;
 
        obj = avl_find_ge_element(&path, objpath, obj, path);
        if (!obj)
@@ -194,6 +205,7 @@ static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub,
 
 static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
+       struct ubus_msg_buf *ub_new;
        struct ubus_object *obj = NULL;
        struct ubus_id *id;
        const char *method;
@@ -219,9 +231,10 @@ static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub,
                blob_put(&b, UBUS_ATTR_DATA, blob_data(attr[UBUS_ATTR_DATA]),
                         blob_len(attr[UBUS_ATTR_DATA]));
 
+       ub_new = ubus_reply_from_blob(ub, true);
        ubus_msg_free(ub);
+       ub = ub_new;
 
-       ub = ubus_reply_from_blob(ub, true);
        if (!ub)
                return UBUS_STATUS_NO_DATA;