upload device/onetime keys, fix recurring http accesses

[matrix_esp_thesis] / src / matrix.c

diff --git a/src/matrix.c b/src/matrix.c
index d1878c5057f0d5bcc93f2b69e54190c262b99f0c..1f5ed2de70135ea20d2f215b8f251156380c3f34 100644 (file)
--- a/src/matrix.c
+++ b/src/matrix.c
@@ -22,8 +22,10 @@
 #define KEYS_QUERY_REQUEST_SIZE 256\r
 #define KEYS_QUERY_RESPONSE_SIZE 1024\r
 \r
-#define UPLOAD_KEYS_REQUEST_SIZE 512\r
-#define UPLOAD_KEYS_REQUEST_SIGNED_SIZE 1024\r
+#define KEYS_UPLOAD_URL "/_matrix/client/v3/keys/upload"\r
+#define KEYS_UPLOAD_REQUEST_SIZE 1024\r
+#define KEYS_UPLOAD_REQUEST_SIGNED_SIZE 2048\r
+#define KEYS_UPLOAD_RESPONSE_SIZE 2048\r
 \r
 #define JSON_QUERY_SIZE 128\r
 \r
@@ -301,13 +303,14 @@ MatrixClientGenerateOnetimeKeys(
     return res != olm_error();\r
 }\r
 \r
+// https://spec.matrix.org/v1.7/client-server-api/#post_matrixclientv3keysupload\r
 bool\r
 MatrixClientUploadOnetimeKeys(\r
     MatrixClient * client)\r
 {\r
-    static char requestBuffer[UPLOAD_KEYS_REQUEST_SIZE];\r
+    static char requestBuffer[KEYS_UPLOAD_REQUEST_SIZE];\r
 \r
-    mjson_snprintf(requestBuffer, UPLOAD_KEYS_REQUEST_SIZE,\r
+    mjson_snprintf(requestBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
         "{\"one_time_keys\":{");\r
 \r
     static char onetimeKeysBuffer[1024];\r
@@ -332,27 +335,33 @@ MatrixClientUploadOnetimeKeys(
             keyJson, JSON_ONETIME_KEY_SIZE,\r
             keyJsonSigned, JSON_ONETIME_KEY_SIGNED_SIZE);\r
         \r
-        mjson_snprintf(requestBuffer+strlen(requestBuffer), UPLOAD_KEYS_REQUEST_SIZE-strlen(requestBuffer),\r
+        mjson_snprintf(requestBuffer+strlen(requestBuffer), KEYS_UPLOAD_REQUEST_SIZE-strlen(requestBuffer),\r
             "\"signed_curve25519:%.*s\":%s,",\r
             klen-2, keys + koff+1,\r
             keyJsonSigned);\r
     }\r
 \r
-    mjson_snprintf(requestBuffer+strlen(requestBuffer), UPLOAD_KEYS_REQUEST_SIZE-strlen(requestBuffer),\r
+    mjson_snprintf(requestBuffer+strlen(requestBuffer)-1, KEYS_UPLOAD_REQUEST_SIZE-strlen(requestBuffer),\r
         "}}");\r
 \r
-    printf("%s\n", requestBuffer);\r
+    static char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];\r
+    MatrixHttpPost(client,\r
+        KEYS_UPLOAD_URL,\r
+        requestBuffer,\r
+        responseBuffer, KEYS_UPLOAD_RESPONSE_SIZE,\r
+        true);\r
 \r
     return true;\r
 }\r
 \r
+// https://spec.matrix.org/v1.7/client-server-api/#post_matrixclientv3keysupload\r
 bool\r
 MatrixClientUploadDeviceKeys(\r
     MatrixClient * client)\r
 {\r
-    static char deviceKeysBuffer[UPLOAD_KEYS_REQUEST_SIZE];\r
+    static char deviceKeysBuffer[KEYS_UPLOAD_REQUEST_SIZE];\r
 \r
-    mjson_snprintf(deviceKeysBuffer, UPLOAD_KEYS_REQUEST_SIZE,\r
+    mjson_snprintf(deviceKeysBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
         "{\"device_keys\":{"\r
             "\"algorithms\":[\"m.olm.v1.curve25519-aes-sha2\",\"m.megolm.v1.aes-sha2\"],"\r
             "\"device_id\":\"%s\","\r
@@ -367,12 +376,18 @@ MatrixClientUploadDeviceKeys(
         client->deviceId, client->signingKey,\r
         client->userId);\r
 \r
-    static char deviceKeysSignedBuffer[UPLOAD_KEYS_REQUEST_SIGNED_SIZE];\r
+    static char deviceKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
     JsonSign(client,\r
-        deviceKeysBuffer, UPLOAD_KEYS_REQUEST_SIZE,\r
-        deviceKeysSignedBuffer, UPLOAD_KEYS_REQUEST_SIZE);\r
+        deviceKeysBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
+        deviceKeysSignedBuffer, KEYS_UPLOAD_REQUEST_SIZE);\r
 \r
-    printf("%s\n", deviceKeysSignedBuffer);\r
+\r
+    static char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];\r
+    MatrixHttpPost(client,\r
+        KEYS_UPLOAD_URL,\r
+        deviceKeysSignedBuffer,\r
+        responseBuffer, KEYS_UPLOAD_RESPONSE_SIZE,\r
+        true);\r
 \r
     return true;\r
 }\r