summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-09-21 10:10:04 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-09-28 11:12:40 +0200
commita8eaf1f71c2906140b600314dfe935fab3a06bf2 (patch)
tree8fca4500ec77fd5b63f5236a7b75f387c75cd7e1
parent1dcedd671f892f07d7805c88352661007b88800d (diff)
Handle batched subscriptions in a JSON array
Change-Id: I33ade46eaf022a5c7e7cf874f8b838a4a6827f87 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--low-can-binding/binding/low-can-cb.cpp52
1 files changed, 30 insertions, 22 deletions
diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp
index 1b7ce107..e84a9c70 100644
--- a/low-can-binding/binding/low-can-cb.cpp
+++ b/low-can-binding/binding/low-can-cb.cpp
@@ -308,22 +308,13 @@ static int one_subscribe_unsubscribe(struct afb_req request,
{
if (json_object_object_get_ex(filter, "frequency", &obj)
&& (json_object_is_type(obj, json_type_double) || json_object_is_type(obj, json_type_int)))
- {
- event_filter.frequency = (float)json_object_get_double(obj);
- ret += 1;
- }
+ {event_filter.frequency = (float)json_object_get_double(obj);}
if (json_object_object_get_ex(filter, "min", &obj)
&& (json_object_is_type(obj, json_type_double) || json_object_is_type(obj, json_type_int)))
- {
- event_filter.min = (float)json_object_get_double(obj);
- ret += 2;
- }
+ {event_filter.min = (float)json_object_get_double(obj);}
if (json_object_object_get_ex(filter, "max", &obj)
&& (json_object_is_type(obj, json_type_double) || json_object_is_type(obj, json_type_int)))
- {
- event_filter.max = (float)json_object_get_double(obj);
- ret += 4;
- }
+ {event_filter.max = (float)json_object_get_double(obj);}
}
// subscribe or unsubscribe
@@ -339,14 +330,12 @@ static int one_subscribe_unsubscribe(struct afb_req request,
return ret;
}
-
-static void do_subscribe_unsubscribe(struct afb_req request, bool subscribe)
+static int process_one_subscribe_args(struct afb_req request, bool subscribe, json_object *args)
{
- int i, n, rc, rc2;
- struct json_object *args, *event, *x;
-
- args = afb_req_json(request);
- if (args == NULL || !json_object_object_get_ex(args, "event", &event))
+ int rc = 0, rc2=0;
+ json_object *x = nullptr, *event = nullptr;
+ if(args == NULL ||
+ !json_object_object_get_ex(args, "event", &event))
{
rc = one_subscribe_unsubscribe(request, subscribe, "*", args);
}
@@ -356,9 +345,7 @@ static void do_subscribe_unsubscribe(struct afb_req request, bool subscribe)
}
else
{
- rc = 0;
- n = json_object_array_length(event);
- for (i = 0 ; i < n ; i++)
+ for (int i = 0 ; i < json_object_array_length(event); i++)
{
x = json_object_array_get_idx(event, i);
rc2 = one_subscribe_unsubscribe(request, subscribe, json_object_get_string(x), args);
@@ -366,6 +353,27 @@ static void do_subscribe_unsubscribe(struct afb_req request, bool subscribe)
rc = rc2 >= 0 ? rc + rc2 : rc2;
}
}
+ return rc;
+}
+
+static void do_subscribe_unsubscribe(struct afb_req request, bool subscribe)
+{
+ int rc = 0;
+ struct json_object *args, *x;
+
+ args = afb_req_json(request);
+ if (json_object_get_type(args) == json_type_array)
+ {
+ for(int i = 0; i < json_object_array_length(args); i++)
+ {
+ x = json_object_array_get_idx(args, i);
+ rc += process_one_subscribe_args(request, subscribe, x);
+ }
+ }
+ else
+ {
+ rc += process_one_subscribe_args(request, subscribe, args);
+ }
if (rc >= 0)
afb_req_success(request, NULL, NULL);