use global static buffers to save memory, get Verify example working on ESP32

[matrix_esp_thesis] / src / matrix.c

diff --git a/src/matrix.c b/src/matrix.c
index ef094b8fad63800f0c425f7b3517fd6072bef750..fe8e1a3e241fdabb1b9ac94cc62dbb39e5b897f6 100644 (file)
--- a/src/matrix.c
+++ b/src/matrix.c
@@ -8,14 +8,16 @@
 #include <esp_random.h>\r
 #endif\r
 \r
-#define STATIC\r
+#define STATIC static\r
 \r
 #define LOGIN_REQUEST_SIZE 1024\r
 #define LOGIN_RESPONSE_SIZE 1024\r
 #define LOGIN_URL "/_matrix/client/v3/login"\r
 \r
 #define ENCRYPTED_REQUEST_SIZE (1024*5)\r
+STATIC char g_EncryptedRequestBuffer[ENCRYPTED_REQUEST_SIZE];\r
 #define ENCRYPTED_EVENT_SIZE (1024*10)\r
+STATIC char g_EncryptedEventBuffer[ENCRYPTED_EVENT_SIZE];\r
 #define ROOM_SEND_REQUEST_SIZE 256\r
 #define ROOM_SEND_RESPONSE_SIZE 1024\r
 #define ROOM_SEND_URL "/_matrix/client/v3/rooms/%s/send/%s/%d"\r
@@ -23,15 +25,18 @@
 #define ROOMKEY_REQUEST_SIZE (1024*4)\r
 \r
 #define TODEVICE_EVENT_SIZE (1024*5)\r
+STATIC char g_TodeviceEventBuffer[TODEVICE_EVENT_SIZE];\r
 #define TODEVICE_URL "/_matrix/client/v3/sendToDevice/%s/%d"\r
 \r
 #define KEYS_QUERY_URL "/_matrix/client/v3/keys/query"\r
 #define KEYS_QUERY_REQUEST_SIZE 256\r
-#define KEYS_QUERY_RESPONSE_SIZE (1024*10)\r
+#define KEYS_QUERY_RESPONSE_SIZE (1024*5)\r
 \r
 #define KEYS_UPLOAD_URL "/_matrix/client/v3/keys/upload"\r
 #define KEYS_UPLOAD_REQUEST_SIZE 1024*4\r
+STATIC char g_KeysUploadRequestBuffer[KEYS_UPLOAD_REQUEST_SIZE];\r
 #define KEYS_UPLOAD_REQUEST_SIGNED_SIZE 2048*4\r
+STATIC char g_KeysUploadRequestSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
 #define KEYS_UPLOAD_RESPONSE_SIZE 2048\r
 \r
 #define KEYS_CLAIM_URL "/_matrix/client/v3/keys/claim"\r
@@ -696,9 +701,7 @@ bool
 MatrixClientUploadOnetimeKeys(\r
     MatrixClient * client)\r
 {\r
-    STATIC char requestBuffer[KEYS_UPLOAD_REQUEST_SIZE];\r
-\r
-    mjson_snprintf(requestBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
+    mjson_snprintf(g_KeysUploadRequestBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
         "{");\r
 \r
     STATIC char onetimeKeysBuffer[1024];\r
@@ -724,34 +727,33 @@ MatrixClientUploadOnetimeKeys(
             keyJson, keyJsonLen,\r
             keyJsonSigned, JSON_ONETIME_KEY_SIGNED_SIZE);\r
         \r
-        mjson_snprintf(requestBuffer+strlen(requestBuffer), KEYS_UPLOAD_REQUEST_SIZE-strlen(requestBuffer),\r
+        mjson_snprintf(g_KeysUploadRequestBuffer+strlen(g_KeysUploadRequestBuffer), KEYS_UPLOAD_REQUEST_SIZE-strlen(g_KeysUploadRequestBuffer),\r
             "\"signed_curve25519:%.*s\":%s,",\r
             klen-2, keys + koff+1,\r
             keyJsonSigned);\r
     }\r
 \r
-    if (requestBuffer[strlen(requestBuffer)-1] == ',')\r
-        requestBuffer[strlen(requestBuffer)-1] = '\0';\r
+    if (g_KeysUploadRequestBuffer[strlen(g_KeysUploadRequestBuffer)-1] == ',')\r
+        g_KeysUploadRequestBuffer[strlen(g_KeysUploadRequestBuffer)-1] = '\0';\r
 \r
-    mjson_snprintf(requestBuffer+strlen(requestBuffer), KEYS_UPLOAD_REQUEST_SIZE-strlen(requestBuffer),\r
+    mjson_snprintf(g_KeysUploadRequestBuffer+strlen(g_KeysUploadRequestBuffer), KEYS_UPLOAD_REQUEST_SIZE-strlen(g_KeysUploadRequestBuffer),\r
         "}");\r
         \r
     // STATIC char onetimeKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
     // JsonSign(client,\r
-    //     requestBuffer, strlen(requestBuffer),\r
+    //     g_KeysUploadRequestBuffer, strlen(g_KeysUploadRequestBuffer),\r
     //     onetimeKeysSignedBuffer, KEYS_UPLOAD_REQUEST_SIZE);\r
         \r
     // STATIC char finalEvent[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
     // snprintf(finalEvent, KEYS_UPLOAD_REQUEST_SIGNED_SIZE,\r
     // "{\"one_time_keys\":%s}", onetimeKeysSignedBuffer);\r
-    STATIC char finalEvent[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
-    snprintf(finalEvent, KEYS_UPLOAD_REQUEST_SIGNED_SIZE,\r
-    "{\"one_time_keys\":%s}", requestBuffer);\r
+    snprintf(g_KeysUploadRequestSignedBuffer, KEYS_UPLOAD_REQUEST_SIGNED_SIZE,\r
+    "{\"one_time_keys\":%s}", g_KeysUploadRequestBuffer);\r
 \r
     STATIC char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];\r
     MatrixHttpPost(client->hc,\r
         KEYS_UPLOAD_URL,\r
-        finalEvent,\r
+        g_KeysUploadRequestSignedBuffer,\r
         responseBuffer, KEYS_UPLOAD_RESPONSE_SIZE,\r
         true);\r
 \r
@@ -768,10 +770,8 @@ MatrixClientUploadDeviceKey(
     char thisSigningKey[DEVICE_KEY_SIZE];\r
     MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);\r
 \r
-    STATIC char deviceKeysBuffer[KEYS_UPLOAD_REQUEST_SIZE];\r
-\r
     int deviceKeysBufferLen =\r
-        mjson_snprintf(deviceKeysBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
+        mjson_snprintf(g_KeysUploadRequestBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
             "{"\r
                 "\"algorithms\":[\"m.olm.v1.curve25519-aes-sha2\",\"m.megolm.v1.aes-sha2\"],"\r
                 "\"device_id\":\"%s\","\r
@@ -786,14 +786,13 @@ MatrixClientUploadDeviceKey(
             client->deviceId, thisSigningKey,\r
             client->userId);\r
 \r
-    STATIC char deviceKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
     JsonSign(client,\r
-        deviceKeysBuffer, deviceKeysBufferLen,\r
-        deviceKeysSignedBuffer, KEYS_UPLOAD_REQUEST_SIZE);\r
+        g_KeysUploadRequestBuffer, deviceKeysBufferLen,\r
+        g_KeysUploadRequestSignedBuffer, KEYS_UPLOAD_REQUEST_SIZE);\r
     \r
     STATIC char finalEvent[KEYS_UPLOAD_REQUEST_SIGNED_SIZE+30];\r
     snprintf(finalEvent, KEYS_UPLOAD_REQUEST_SIGNED_SIZE+30,\r
-    "{\"device_keys\":%s}", deviceKeysSignedBuffer);\r
+    "{\"device_keys\":%s}", g_KeysUploadRequestSignedBuffer);\r
 \r
     STATIC char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];\r
     MatrixHttpPost(client->hc,\r
@@ -966,10 +965,9 @@ MatrixClientSendEventEncrypted(
         MatrixClientNewMegolmOutSession(client, roomId, &outSession);\r
         \r
     // encrypt\r
-    STATIC char encryptedBuffer[ENCRYPTED_REQUEST_SIZE/10];\r
     MatrixMegolmOutSessionEncrypt(outSession,\r
         requestBuffer,\r
-        encryptedBuffer, ENCRYPTED_REQUEST_SIZE);\r
+        g_EncryptedRequestBuffer, ENCRYPTED_REQUEST_SIZE);\r
 \r
     char thisDeviceKey[DEVICE_KEY_SIZE];\r
     MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);\r
@@ -980,8 +978,7 @@ MatrixClientSendEventEncrypted(
     const char * sessionId = outSession->id;\r
     const char * deviceId = client->deviceId;\r
 \r
-    STATIC char encryptedEventBuffer[ENCRYPTED_EVENT_SIZE/10];\r
-    sprintf(encryptedEventBuffer,\r
+    snprintf(g_EncryptedEventBuffer, ENCRYPTED_EVENT_SIZE,\r
         "{"\r
         "\"algorithm\":\"m.megolm.v1.aes-sha2\","\r
         "\"ciphertext\":\"%s\","\r
@@ -989,7 +986,7 @@ MatrixClientSendEventEncrypted(
         "\"sender_key\":\"%s\","\r
         "\"session_id\":\"%s\""\r
         "}",\r
-        encryptedBuffer,\r
+        g_EncryptedRequestBuffer,\r
         deviceId,\r
         senderKey,\r
         sessionId);\r
@@ -998,7 +995,7 @@ MatrixClientSendEventEncrypted(
     return MatrixClientSendEvent(client,\r
         roomId,\r
         "m.room.encrypted",\r
-        encryptedEventBuffer);\r
+        g_EncryptedEventBuffer);\r
 }\r
 \r
 // https://spec.matrix.org/v1.6/client-server-api/#get_matrixclientv3sync\r
@@ -1011,8 +1008,10 @@ MatrixClientSync(
     // filter={\"event_fields\":[\"to_device\"]}\r
     STATIC char url[MAX_URL_LEN];\r
     snprintf(url, MAX_URL_LEN,\r
-        "/_matrix/client/v3/sync?timeout=%d%s",\r
+        "/_matrix/client/v3/sync?timeout=%d" "%s" "%s",\r
         SYNC_TIMEOUT,\r
+        "",\r
+        // "&filter={\"event_fields\":[\"to_device\"]}",\r
         strlen(nextBatch) > 0 ? "&since=" : "");\r
     \r
     int index = strlen(url);\r
@@ -1253,7 +1252,7 @@ MatrixClientRequestMegolmInSession(
 }\r
 \r
 bool\r
-MatrixClientGetOlmSessionIn(\r
+MatrixClientGetOlmSession(\r
     MatrixClient * client,\r
     const char * userId,\r
     const char * deviceId,\r
@@ -1303,25 +1302,6 @@ MatrixClientNewOlmSessionIn(
     return false;\r
 }\r
 \r
-bool\r
-MatrixClientGetOlmSessionOut(\r
-    MatrixClient * client,\r
-    const char * userId,\r
-    const char * deviceId,\r
-    MatrixOlmSession ** outSession)\r
-{\r
-    for (int i = 0; i < client->numOlmSessions; i++)\r
-    {\r
-        if (strcmp(client->olmSessions[i].deviceId, deviceId) == 0)\r
-        {\r
-            *outSession = &client->olmSessions[i];\r
-            return true;\r
-        }\r
-    }\r
-\r
-    return false;\r
-}\r
-\r
 bool\r
 MatrixClientNewOlmSessionOut(\r
     MatrixClient * client,\r
@@ -1372,8 +1352,7 @@ MatrixClientSendToDevice(
     sprintf(requestUrl,\r
         TODEVICE_URL, msgType, (int)time(NULL));\r
 \r
-    STATIC char eventBuffer[TODEVICE_EVENT_SIZE];\r
-    snprintf(eventBuffer, TODEVICE_EVENT_SIZE,\r
+    snprintf(g_TodeviceEventBuffer, TODEVICE_EVENT_SIZE,\r
         "{"\r
             "\"messages\":{"\r
                 "\"%s\":{"\r
@@ -1389,7 +1368,7 @@ MatrixClientSendToDevice(
     bool result =\r
         MatrixHttpPut(client->hc,\r
             requestUrl,\r
-            eventBuffer,\r
+            g_TodeviceEventBuffer,\r
             responseBuffer, ROOM_SEND_RESPONSE_SIZE,\r
             true);\r
     \r
@@ -1408,7 +1387,7 @@ MatrixClientSendToDeviceEncrypted(
 {\r
     // get olm session\r
     MatrixOlmSession * olmSession;\r
-    if (! MatrixClientGetOlmSessionOut(client, userId, deviceId, &olmSession))\r
+    if (! MatrixClientGetOlmSession(client, userId, deviceId, &olmSession))\r
         MatrixClientNewOlmSessionOut(client, userId, deviceId, &olmSession);\r
 \r
     // create event json\r
@@ -1420,8 +1399,7 @@ MatrixClientSendToDeviceEncrypted(
     char thisSigningKey[DEVICE_KEY_SIZE];\r
     MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);\r
 \r
-    STATIC char eventBuffer[TODEVICE_EVENT_SIZE];\r
-    sprintf(eventBuffer,\r
+    snprintf(g_TodeviceEventBuffer, TODEVICE_EVENT_SIZE,\r
         "{"\r
         "\"type\":\"%s\","\r
         "\"content\":%s,"\r
@@ -1442,17 +1420,14 @@ MatrixClientSendToDeviceEncrypted(
         thisSigningKey);\r
 \r
     // encrypt\r
-    STATIC char encryptedBuffer[ENCRYPTED_REQUEST_SIZE];\r
     MatrixOlmSessionEncrypt(olmSession,\r
-        eventBuffer,\r
-        encryptedBuffer, ENCRYPTED_REQUEST_SIZE);\r
+        g_TodeviceEventBuffer,\r
+        g_EncryptedRequestBuffer, ENCRYPTED_REQUEST_SIZE);\r
 \r
     char thisDeviceKey[DEVICE_KEY_SIZE];\r
     MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);\r
 \r
-\r
-    STATIC char encryptedEventBuffer[ENCRYPTED_EVENT_SIZE];\r
-    sprintf(encryptedEventBuffer,\r
+    snprintf(g_EncryptedEventBuffer, ENCRYPTED_EVENT_SIZE,\r
         "{"\r
         "\"algorithm\":\"m.olm.v1.curve25519-aes-sha2\","\r
         "\"ciphertext\":{"\r
@@ -1465,7 +1440,7 @@ MatrixClientSendToDeviceEncrypted(
         "\"sender_key\":\"%s\""\r
         "}",\r
         targetDeviceKey,\r
-        encryptedBuffer,\r
+        g_EncryptedRequestBuffer,\r
         olm_session_has_received_message(olmSession->session),\r
         client->deviceId,\r
         thisDeviceKey);\r
@@ -1475,7 +1450,7 @@ MatrixClientSendToDeviceEncrypted(
         client,\r
         userId,\r
         deviceId,\r
-        encryptedEventBuffer,\r
+        g_EncryptedEventBuffer,\r
         "m.room.encrypted");\r
 }\r
 \r