Changeset bc73e2ba

Timestamp:

2015-04-04T00:33:30Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

16652e9

Parents:

578790e

Message:

Error parsing, support for optional args, added handle_cmp to avoid segfault.

File:

• protocols/rpc/rpc.c (modified) (11 diffs)

protocols/rpc/rpc.c

@@ -27 +27 @@
 
 static JSON_Value *jsonrpc_error(int code, const char *msg) {
-        JSON_Value *error = json_value_init_object();
-        json_object_set_number(json_object(error), "code", code);
-        json_object_set_string(json_object(error), "message", msg);
         JSON_Value *ret = json_value_init_object();
-        json_object_set_value(json_object(ret), "error", error);
+        json_object_set_null(json_object(ret), "result");
+        if (TRUE) {
+                /* Format from http://jsonrpc.org/historical/json-rpc-1-1-alt.html.
+                 * Not sure whether to use it. */
+                JSON_Value *error = json_value_init_object();
+                json_object_set_number(json_object(error), "code", code);
+                json_object_set_string(json_object(error), "message", msg);
+                json_object_set_value(json_object(ret), "error", error);
+        } else {
+                json_object_set_string(json_object(ret), "error", msg);
+        }
         
         return ret;
+}
+
+static void json_array_append_string_or_null(JSON_Array *params, const char *string) {
+        if (string)
+                json_array_append_string(params, string);
+        else
+                json_array_append_null(params);
 }
 
@@ -150 +164 @@
 static void rpc_set_away(struct im_connection *ic, char *state, char *message) {
         RPC_OUT_INIT("set_away");
-        json_array_append_string(params, state);
-        json_array_append_string(params, message);
+        json_array_append_string_or_null(params, state);
+        json_array_append_string_or_null(params, message);
         rpc_send(ic, rpc);
 }
@@ -165 +179 @@
         RPC_OUT_INIT("add_buddy");
         json_array_append_string(params, name);
-        json_array_append_string(params, group);
+        json_array_append_string_or_null(params, group);
         rpc_send(ic, rpc);
 }
@@ -172 +186 @@
         RPC_OUT_INIT("remove_buddy");
         json_array_append_string(params, name);
-        json_array_append_string(params, group);
+        json_array_append_string_or_null(params, group);
         rpc_send(ic, rpc);
 }
@@ -211 +225 @@
         json_array_append_number(params, rc->id);
         json_array_append_string(params, who);
-        json_array_append_string(params, message);
+        json_array_append_string_or_null(params, message);
         rpc_send(gc->ic, rpc);
 }
@@ -220 +234 @@
         json_array_append_number(params, rc->id);
         json_array_append_string(params, who);
-        json_array_append_string(params, message);
+        json_array_append_string_or_null(params, message);
         rpc_send(gc->ic, rpc);
 }
@@ -282 +296 @@
         json_array_append_number(params, rc->id);
         json_array_append_string(params, room);
-        json_array_append_string(params, nick);
-        json_array_append_string(params, password);
+        json_array_append_string_or_null(params, nick);
+        json_array_append_string_or_null(params, password);
         //json_array_append_value(params, rpc_ser_sets(sets));
         rpc_send(ic, rpc);
@@ -303 +317 @@
         const char *cmd = json_object_get_string(rpc, "method");
         JSON_Value *id = json_object_get_value(rpc, "id");
+        JSON_Value *error = json_object_get_value(rpc, "error");
         JSON_Array *params = json_object_get_array(rpc, "params");
 
@@ -322 +337 @@
                 json_object_set_value(json_object(resp), "id", json_value_deep_copy(id));
                 return rpc_send(ic, resp);
+        } else if (error && json_type(error) != JSONNull) {
+                char *error_str = json_serialize_to_string(error);
+                /* Maybe sanitise/truncate? Though really that should be done at
+                 * a different layer. */
+                imcb_error(ic, "RPC Error: %s", error_str);
+                g_free(error_str);
         }
 
@@ -534 +555 @@
                                 switch (methods[i].args[j]) {
                                 case 's':
-                                        ok = type == JSONString;
+                                        ok = type == JSONString || type == JSONNull;
                                         break;
                                 case 'n':
@@ -663 +684 @@
 
         // TODO: Property for a few standard nickcmp implementations.
+        ret->handle_cmp = g_ascii_strcasecmp;
         
         struct rpc_plugin *proto_data = g_new0(struct rpc_plugin, 1);