X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=ubus.c;h=a74df6cf5682e9e1f5ab757ea0f39d3bf2da7c2c;hp=9a16a8645a7aeb2b4202b34ef0bc6f9c6e436740;hb=a957c3e347e4f628c77b61a9dc6e49cb81a0efec;hpb=95d8e0d4f03dd7c1211d3f98dc31074365717acf

diff --git a/ubus.c b/ubus.c
index 9a16a86..a74df6c 100644
--- a/ubus.c
+++ b/ubus.c
@@ -39,11 +39,11 @@ umdns_reload(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 static int
-umdns_scan(struct ubus_context *ctx, struct ubus_object *obj,
+umdns_update(struct ubus_context *ctx, struct ubus_object *obj,
 		struct ubus_request_data *req, const char *method,
 		struct blob_attr *msg)
 {
-	cache_scan();
+	cache_update();
 	return 0;
 }
 
@@ -59,7 +59,7 @@ umdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
 	blob_buf_init(&b, 0);
 	avl_for_each_element(&services, s, avl) {
 		char *local;
-		if (*((char *) s->avl.key) != '_')
+		if (cache_service_is_host(s))
 			continue;
 		snprintf(buffer, MAX_NAME_LEN, "%s", (const char *) s->avl.key);
 		local = strstr(buffer, ".local");
@@ -103,7 +103,7 @@ umdns_hosts(struct ubus_context *ctx, struct ubus_object *obj,
 	blob_buf_init(&b, 0);
 	avl_for_each_element(&services, s, avl) {
 		char *local;
-		if (*((char *) s->avl.key) == '_')
+		if (!cache_service_is_host(s))
 			continue;
 		snprintf(buffer, MAX_NAME_LEN, "%s", (const char *) s->entry);
 		local = strstr(buffer, "._");
@@ -228,7 +228,7 @@ static const struct ubus_method umdns_methods[] = {
 	UBUS_METHOD("set_config", umdns_set_config, config_policy),
 	UBUS_METHOD("query", umdns_query, query_policy),
 	UBUS_METHOD("fetch", umdns_query, query_policy),
-	UBUS_METHOD_NOARG("scan", umdns_scan),
+	UBUS_METHOD_NOARG("update", umdns_update),
 	UBUS_METHOD_NOARG("browse", umdns_browse),
 	UBUS_METHOD_NOARG("hosts", umdns_hosts),
 	UBUS_METHOD_NOARG("reload", umdns_reload),