HTTP layer for ESP32, make static specifier in matrix.c optional by defining it as...

diff --git a/Todo.md b/Todo.md
index b8e62c527e77e786bb5f65a46c589898315079c1..bbf754d51a03cae31a2a4f75696539cd081f1d56 100644 (file)
--- a/Todo.md
+++ b/Todo.md
@@ -12,8 +12,8 @@
   + incoming\r
   + outgoing\r
 + store keys/sessions\r
-- respond to events\r
-  - room_key_request\r
++ respond to events\r
+  + room_key_request\r
 + add client saving/loading\r
 - overhaul client saving/loading\r
 + esp compatibility\r

diff --git a/esp32/esp_project/CMakeLists.txt b/esp32/esp_project/CMakeLists.txt
index 1d08676f6db2ef9f9c9e5c4fd7e6a5750e118078..897cd8ea12ab6a77fdc3cd66be4c10c7c4af01ef 100644 (file)
--- a/esp32/esp_project/CMakeLists.txt
+++ b/esp32/esp_project/CMakeLists.txt
@@ -4,3 +4,6 @@ cmake_minimum_required(VERSION 3.16)
 \r
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)\r
 project(esp_project)\r
+\r
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fpermissive")\r
+SET(CMAKE_CXX_COMPILER  "C:/Espressif/tools/xtensa-esp32-elf/esp-12.2.0_20230208/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc.exe")
\ No newline at end of file

diff --git a/esp32/esp_project/components/olm/CMakeLists.txt b/esp32/esp_project/components/olm/CMakeLists.txt
index 352ab9cbe32dd7dc25093e9dcdd15d833107a203..e17b8ad955fa1e9afbfc37d1a4ad4b96b36d90a5 100644 (file)
--- a/esp32/esp_project/components/olm/CMakeLists.txt
+++ b/esp32/esp_project/components/olm/CMakeLists.txt
@@ -1,6 +1,6 @@
 idf_component_register(SRCS\r
                             "../../../../ext/olm/src/account.cpp"\r
-                            #"../../../../ext/olm/lib/crypto-algorithms/aes.c"\r
+                            "../../../../ext/olm/lib/crypto-algorithms/aes.c"\r
                             "../../../../ext/olm/src/base64.cpp"\r
                             "../../../../ext/olm/src/cipher.cpp"\r
                             "../../../../ext/olm/src/crypto.cpp"\r
@@ -16,29 +16,23 @@ idf_component_register(SRCS
                             "../../../../ext/olm/src/pickle.cpp"\r
                             "../../../../ext/olm/src/pickle_encoding.c"\r
                             "../../../../ext/olm/src/pk.cpp"\r
+                            "../../../../ext/olm/src/ratchet.cpp"\r
                             "../../../../ext/olm/src/sas.c"\r
                             "../../../../ext/olm/src/session.cpp"\r
                             "../../../../ext/olm/lib/crypto-algorithms/sha256.c"\r
                             "../../../../ext/olm/src/utility.cpp"\r
-                            "../../../../src/matrix.c"\r
-                            "../../../../src/matrix_http_mongoose.c"\r
-                            "../../../../ext/mongoose/mongoose.c"\r
-                            "../../../../ext/mjson/src/mjson.c"\r
                        INCLUDE_DIRS\r
                             "../../../../ext/olm/include"\r
                             "../../../../ext/olm/lib"\r
-                            "../../../../ext/mongoose"\r
-                            "../../../../ext/mjson/src"\r
                             "../../../../src"\r
                        REQUIRES\r
-                            esp_timer\r
-                            mbedtls)\r
+                            esp_timer)\r
 \r
 add_definitions(-DOLM_STATIC_DEFINE)\r
 add_definitions(-DOLMLIB_VERSION_MAJOR=3)\r
 add_definitions(-DOLMLIB_VERSION_MINOR=2)\r
 add_definitions(-DOLMLIB_VERSION_PATCH=15)\r
-add_definitions(-DMG_ENABLE_MBEDTLS=1)\r
 \r
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fpermissive")\r
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fpermissive -Wl,--allow-multiple-definition")\r
+SET(CMAKE_CXX_COMPILER  "C:/Espressif/tools/xtensa-esp32-elf/esp-12.2.0_20230208/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc.exe")\r
 \r

diff --git a/esp32/esp_project/main/CMakeLists.txt b/esp32/esp_project/main/CMakeLists.txt
index d0c6abbd14f5c3a0d1fdfe7244ea4cbef2d338e5..ddba2b12b1134cd0fbf0825f9b225b79d4327952 100644 (file)
--- a/esp32/esp_project/main/CMakeLists.txt
+++ b/esp32/esp_project/main/CMakeLists.txt
@@ -1,2 +1,2 @@
-idf_component_register(SRCS "main.c" "wifi.c"\r
+idf_component_register(SRCS "wifi.c" "Verify.c"\r
                     INCLUDE_DIRS "")
\ No newline at end of file

diff --git a/esp32/esp_project/main/main.c b/esp32/esp_project/main/main.c
deleted file mode 100644 (file)
index b090849..0000000
--- a/esp32/esp_project/main/main.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*\r
- * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD\r
- *\r
- * SPDX-License-Identifier: CC0-1.0\r
- */\r
-\r
-#define OLMLIB_VERSION_MAJOR 3\r
-#define OLMLIB_VERSION_MINOR 2\r
-#define OLMLIB_VERSION_PATCH 15\r
-\r
-#define OLM_STATIC_DEFINE\r
-\r
-#include <mongoose.h>\r
-#include <olm/olm.h>\r
-#include <matrix.h>\r
-\r
-#include <esp_wifi.h>\r
-\r
-#define SERVER       "https://matrix.org"\r
-#define USER_ID      "@pscho:matrix.org"\r
-#define ROOM_ID      "!XKFUjAsGrSSrpDFIxB:matrix.org"\r
-\r
-void\r
-app_main(void)\r
-{\r
-    MatrixClient client;\r
-    MatrixClientInit(&client,\r
-        SERVER);\r
-    \r
-    MatrixHttpInit(&client);\r
-\r
-    MatrixClientSetUserId(&client, USER_ID);\r
-\r
-    MatrixClientLoginPassword(&client,\r
-        "pscho",\r
-        "Wc23EbmB9G3faMq",\r
-        "Test1");\r
-\r
-    MatrixClientUploadDeviceKey(&client);\r
-    MatrixClientGenerateOnetimeKeys(&client, 10);\r
-    MatrixClientUploadOnetimeKeys(&client);\r
-\r
-    // create megolmsession\r
-    MatrixMegolmOutSession * megolmOutSession;\r
-    MatrixClientGetMegolmOutSession(&client,\r
-        ROOM_ID,\r
-        &megolmOutSession);\r
-    printf("megolm session id: %.10s... key: %.10s...\n", megolmOutSession->id, megolmOutSession->key);\r
-\r
-    MatrixClientShareMegolmOutSession(&client,\r
-        USER_ID,\r
-        "ULZZOKJBYN",\r
-        megolmOutSession);\r
-\r
-    MatrixClientSendEventEncrypted(&client,\r
-        ROOM_ID,\r
-        "m.room.message",\r
-        "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}");\r
-        \r
-    MatrixClientDeleteDevice(&client);\r
-\r
-    MatrixHttpDeinit(&client);\r
-}\r

diff --git a/esp32/esp_project/main/wifi.c b/esp32/esp_project/main/wifi.c
index 07d1e41b2431d4fe1765fa3df60841f2f380ed86..788d61cab216f7cf42c8e41da50ed95dbed01f3f 100644 (file)
--- a/esp32/esp_project/main/wifi.c
+++ b/esp32/esp_project/main/wifi.c
@@ -1,4 +1,9 @@
-// Code taken from the ESP32 IDF WiFi station Example\r
+/*\r
+ * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD\r
+ *\r
+ * SPDX-License-Identifier: CC0-1.0\r
+ */\r
+\r
 \r
 #include <string.h>\r
 #include "esp_event.h"\r
@@ -13,8 +18,6 @@
 #include "lwip/err.h"\r
 #include "lwip/sys.h"\r
 \r
-#include "mongoose.h"\r
-\r
 static EventGroupHandle_t s_wifi_event_group;\r
 \r
 /* The event group allows multiple bits for each event, but we only care about\r
@@ -35,14 +38,14 @@ static void event_handler(void *arg, esp_event_base_t event_base,
     if (s_retry_num < 3) {\r
       esp_wifi_connect();\r
       s_retry_num++;\r
-      MG_INFO(("retry to connect to the AP"));\r
+      printf("retry to connect to the AP\n");\r
     } else {\r
       xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT);\r
     }\r
-    MG_ERROR(("connect to the AP fail"));\r
+    printf("connect to the AP fail\n");\r
   } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {\r
     ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data;\r
-    MG_INFO(("IP ADDRESS:" IPSTR, IP2STR(&event->ip_info.ip)));\r
+    printf("IP ADDRESS:" IPSTR "\n", IP2STR(&event->ip_info.ip));\r
     s_retry_num = 0;\r
     xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);\r
   }\r
@@ -81,18 +84,18 @@ void wifi_init(const char *ssid, const char *pass) {
   ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));\r
   ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &c));\r
   ESP_ERROR_CHECK(esp_wifi_start());\r
-  MG_DEBUG(("wifi_init_sta finished."));\r
+  printf("wifi_init_sta finished.\n");\r
 \r
   EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group,\r
                                          WIFI_CONNECTED_BIT | WIFI_FAIL_BIT,\r
                                          pdFALSE, pdFALSE, portMAX_DELAY);\r
 \r
   if (bits & WIFI_CONNECTED_BIT) {\r
-    MG_INFO(("connected to ap SSID:%s password:%s", ssid, pass));\r
+    printf("connected to ap SSID:%s password:%s\n", ssid, pass);\r
   } else if (bits & WIFI_FAIL_BIT) {\r
-    MG_ERROR(("Failed to connect to SSID:%s, password:%s", ssid, pass));\r
+    printf("Failed to connect to SSID:%s, password:%s\n", ssid, pass);\r
   } else {\r
-    MG_ERROR(("UNEXPECTED EVENT"));\r
+    printf("UNEXPECTED EVENT\n");\r
   }\r
 \r
   /* The event will not be processed after unregister */\r

diff --git a/esp32/esp_project/sdkconfig b/esp32/esp_project/sdkconfig
index c55b69175efeeaf0e0b27aa15eb9531b92214989..def88a31ff82b569dd0d6826837bb0e11dc9339b 100644 (file)
--- a/esp32/esp_project/sdkconfig
+++ b/esp32/esp_project/sdkconfig
@@ -338,15 +338,15 @@ CONFIG_PARTITION_TABLE_MD5=y
 #\r
 # Compiler options\r
 #\r
-CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y\r
-# CONFIG_COMPILER_OPTIMIZATION_SIZE is not set\r
+# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set\r
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y\r
 # CONFIG_COMPILER_OPTIMIZATION_PERF is not set\r
 # CONFIG_COMPILER_OPTIMIZATION_NONE is not set\r
-CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y\r
-# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set\r
+# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set\r
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y\r
 # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set\r
 CONFIG_COMPILER_FLOAT_LIB_FROM_GCCLIB=y\r
-CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=2\r
+CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=1\r
 # CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT is not set\r
 CONFIG_COMPILER_HIDE_PATHS_MACROS=y\r
 # CONFIG_COMPILER_CXX_EXCEPTIONS is not set\r
@@ -516,7 +516,8 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y
 # CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set\r
 # CONFIG_ESP_TLS_SERVER is not set\r
 # CONFIG_ESP_TLS_PSK_VERIFICATION is not set\r
-# CONFIG_ESP_TLS_INSECURE is not set\r
+CONFIG_ESP_TLS_INSECURE=y\r
+CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y\r
 # end of ESP-TLS\r
 \r
 #\r
@@ -793,7 +794,7 @@ CONFIG_ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS=0
 \r
 CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32\r
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304\r
-CONFIG_ESP_MAIN_TASK_STACK_SIZE=3584\r
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192\r
 CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y\r
 # CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set\r
 # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set\r
@@ -997,7 +998,6 @@ CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=1
 #\r
 # Port\r
 #\r
-CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y\r
 # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set\r
 CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y\r
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set\r
@@ -1026,8 +1026,7 @@ CONFIG_FREERTOS_DEBUG_OCDAWARE=y
 CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y\r
 # CONFIG_HAL_ASSERTION_DISABLE is not set\r
 # CONFIG_HAL_ASSERTION_SILENT is not set\r
-# CONFIG_HAL_ASSERTION_ENABLE is not set\r
-CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2\r
+CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=1\r
 CONFIG_HAL_SPI_MASTER_FUNC_IN_IRAM=y\r
 CONFIG_HAL_SPI_SLAVE_FUNC_IN_IRAM=y\r
 # end of Hardware Abstraction Layer (HAL) and Low Level (LL)\r
@@ -1278,7 +1277,10 @@ CONFIG_MBEDTLS_TLS_ENABLED=y
 #\r
 # TLS Key Exchange Methods\r
 #\r
-# CONFIG_MBEDTLS_PSK_MODES is not set\r
+CONFIG_MBEDTLS_PSK_MODES=y\r
+CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y\r
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK=y\r
+CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK=y\r
 CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y\r
 CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y\r
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y\r
@@ -1424,9 +1426,9 @@ CONFIG_MMU_PAGE_SIZE=0x10000
 # CONFIG_SPI_FLASH_VERIFY_WRITE is not set\r
 # CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set\r
 CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y\r
-CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y\r
+# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS is not set\r
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set\r
-# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set\r
+CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y\r
 # CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set\r
 # CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set\r
 CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y\r
@@ -1592,14 +1594,14 @@ CONFIG_LOG_BOOTLOADER_LEVEL=3
 CONFIG_FLASHMODE_DIO=y\r
 # CONFIG_FLASHMODE_DOUT is not set\r
 CONFIG_MONITOR_BAUD=115200\r
-CONFIG_OPTIMIZATION_LEVEL_DEBUG=y\r
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=y\r
-# CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set\r
-# CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set\r
-CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y\r
-# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set\r
+# CONFIG_OPTIMIZATION_LEVEL_DEBUG is not set\r
+# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set\r
+CONFIG_OPTIMIZATION_LEVEL_RELEASE=y\r
+CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y\r
+# CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED is not set\r
+CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y\r
 # CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set\r
-CONFIG_OPTIMIZATION_ASSERTION_LEVEL=2\r
+CONFIG_OPTIMIZATION_ASSERTION_LEVEL=1\r
 # CONFIG_CXX_EXCEPTIONS is not set\r
 CONFIG_STACK_CHECK_NONE=y\r
 # CONFIG_STACK_CHECK_NORM is not set\r
@@ -1652,7 +1654,7 @@ CONFIG_ESP32_PANIC_PRINT_REBOOT=y
 # CONFIG_ESP32_PANIC_GDBSTUB is not set\r
 CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32\r
 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304\r
-CONFIG_MAIN_TASK_STACK_SIZE=3584\r
+CONFIG_MAIN_TASK_STACK_SIZE=8192\r
 CONFIG_CONSOLE_UART_DEFAULT=y\r
 # CONFIG_CONSOLE_UART_CUSTOM is not set\r
 # CONFIG_CONSOLE_UART_NONE is not set\r
@@ -1773,9 +1775,9 @@ CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y
 # CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1 is not set\r
 CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1\r
 CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"\r
-CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y\r
+# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS is not set\r
 # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set\r
-# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set\r
+CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED=y\r
 # CONFIG_ESP32_ULP_COPROC_ENABLED is not set\r
 CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y\r
 CONFIG_SUPPORT_TERMIOS=y\r

diff --git a/examples/Send.c b/examples/Send.c
index cddb96615ef3e1a56f6a1d3cc833e07b13cd01d0..9ab7dfb82f7e60a6ee701c0b8192e5c6ca55fe1b 100644 (file)
--- a/examples/Send.c
+++ b/examples/Send.c
@@ -1,8 +1,7 @@
 #include <matrix.h>\r
 \r
 #define SERVER       "https://matrix.org"\r
-#define ACCESS_TOKEN "syt_cHNjaG8_yBvTjVTquGCikvsAenOJ_49mBMO"\r
-#define DEVICE_ID    "MAZNCCZLBR"\r
+#define USER_ID      "@pscho:matrix.org"\r
 #define ROOM_ID      "!koVStwyiiKcBVbXZYz:matrix.org"\r
 \r
 int\r
@@ -14,14 +13,23 @@ main(void)
     \r
     MatrixHttpInit(&client);\r
 \r
-    MatrixClientSetAccessToken(&client,\r
-        ACCESS_TOKEN);\r
+\r
+    MatrixClientSetUserId(&client, USER_ID);\r
+\r
+    MatrixClientLoginPassword(&client,\r
+        "pscho",\r
+        "Wc23EbmB9G3faMq",\r
+        "Test1");\r
+\r
 \r
     MatrixClientSendEvent(&client,\r
         ROOM_ID,\r
         "m.room.message",\r
         "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}");\r
         \r
+    \r
+    MatrixClientDeleteDevice(&client);\r
+        \r
     MatrixHttpDeinit(&client);\r
 \r
     return 0;\r

diff --git a/examples/SendEncrypted.c b/examples/SendEncrypted.c
index df1d27291185f9a2329226d4c52dd9b1f7b0aea1..c2fda6c4a2e358d63dfe674b5fdf9de605de77f4 100644 (file)
--- a/examples/SendEncrypted.c
+++ b/examples/SendEncrypted.c
@@ -34,7 +34,7 @@ main(void)
 \r
     // create megolmsession\r
     MatrixMegolmOutSession * megolmOutSession;\r
-    MatrixClientGetMegolmOutSession(&client,\r
+    MatrixClientNewMegolmOutSession(&client,\r
         ROOM_ID,\r
         &megolmOutSession);\r
     printf("megolm session id: %.10s... key: %.10s...\n", megolmOutSession->id, megolmOutSession->key);\r

diff --git a/src/matrix.c b/src/matrix.c
index 40c2e5b2b673c4df2328df903bd02078d61498b4..ef094b8fad63800f0c425f7b3517fd6072bef750 100644 (file)
--- a/src/matrix.c
+++ b/src/matrix.c
@@ -4,6 +4,11 @@
 #include <stdio.h>\r
 #include <mjson.h>\r
 \r
+#ifdef ESP_PLATFORM\r
+#include <esp_random.h>\r
+#endif\r
+\r
+#define STATIC\r
 \r
 #define LOGIN_REQUEST_SIZE 1024\r
 #define LOGIN_RESPONSE_SIZE 1024\r
@@ -47,13 +52,24 @@ Randomize(
     uint8_t * random,\r
     int randomLen)\r
 {\r
-    static bool first = true;\r
+    #ifdef ESP_PLATFORM\r
+\r
+    for (int i = 0; i < randomLen; i++)\r
+    {\r
+        random[i] = esp_random() % 256;\r
+    }\r
+\r
+    #else\r
+\r
+    STATIC bool first = true;\r
     if (first) { srand(time(0)); first = false; }\r
 \r
     for (int i = 0; i < randomLen; i++)\r
     {\r
         random[i] = rand() % 256;\r
     }\r
+\r
+    #endif\r
 }\r
 \r
 bool\r
@@ -130,7 +146,7 @@ JsonCanonicalize(
         int valLen;\r
         mjson_find(sIn, sInLen, jp, &valPtr, &valLen);\r
         \r
-        static char newEntry[JSON_MAX_ENTRY_SIZE];\r
+        STATIC char newEntry[JSON_MAX_ENTRY_SIZE];\r
         snprintf(newEntry, JSON_MAX_ENTRY_SIZE, "{%.*s:%.*s}", keys[i].len, keys[i].ptr, valLen, valPtr);\r
 \r
         char * buffer = strdup(sOut);\r
@@ -151,7 +167,7 @@ bool JsonSign(
     const char * sIn, int sInLen,\r
     char * sOut, int sOutCap)\r
 {\r
-    static char signature[OLM_SIGNATURE_SIZE];\r
+    STATIC char signature[OLM_SIGNATURE_SIZE];\r
     size_t res =\r
         olm_account_sign(client->olmAccount.account,\r
             sIn, sInLen,\r
@@ -159,10 +175,10 @@ bool JsonSign(
     \r
     int signatureLen = res;\r
     \r
-    static char thisSigningKey[SIGNING_KEY_SIZE];\r
+    STATIC char thisSigningKey[SIGNING_KEY_SIZE];\r
     MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, SIGNING_KEY_SIZE);\r
 \r
-    static char signatureJson[JSON_SIGNATURE_SIZE];\r
+    STATIC char signatureJson[JSON_SIGNATURE_SIZE];\r
     int signatureJsonLen =\r
         mjson_snprintf(signatureJson, JSON_SIGNATURE_SIZE,\r
             "{"\r
@@ -194,7 +210,7 @@ MatrixOlmAccountInit(
 {\r
     account->account = olm_account(account->memory);\r
 \r
-    static uint8_t random[OLM_ACCOUNT_RANDOM_SIZE];\r
+    STATIC uint8_t random[OLM_ACCOUNT_RANDOM_SIZE];\r
     Randomize(random, OLM_ACCOUNT_RANDOM_SIZE);\r
 \r
     size_t res = olm_create_account(\r
@@ -227,7 +243,7 @@ MatrixOlmAccountGetDeviceKey(
     MatrixOlmAccount * account,\r
     char * key, int keyCap)\r
 {\r
-    static char deviceKeysJson[OLM_IDENTITY_KEYS_JSON_SIZE];\r
+    STATIC char deviceKeysJson[OLM_IDENTITY_KEYS_JSON_SIZE];\r
     size_t res =\r
         olm_account_identity_keys(account->account,\r
             deviceKeysJson, OLM_IDENTITY_KEYS_JSON_SIZE);\r
@@ -242,7 +258,7 @@ MatrixOlmAccountGetSigningKey(
     MatrixOlmAccount * account,\r
     char * key, int keyCap)\r
 {\r
-    static char deviceKeysJson[OLM_IDENTITY_KEYS_JSON_SIZE];\r
+    STATIC char deviceKeysJson[OLM_IDENTITY_KEYS_JSON_SIZE];\r
     size_t res =\r
         olm_account_identity_keys(account->account,\r
             deviceKeysJson, OLM_IDENTITY_KEYS_JSON_SIZE);\r
@@ -268,7 +284,7 @@ MatrixOlmSessionFrom(
         olm_session(session->memory);\r
     \r
     char * encryptedCopy = strdup(encrypted);\r
-\r
+    \r
     size_t res =\r
         olm_create_inbound_session_from(session->session, olmAccount,\r
             deviceKey, strlen(deviceKey),\r
@@ -296,7 +312,7 @@ MatrixOlmSessionTo(
     session->session =\r
         olm_session(session->memory);\r
 \r
-    static uint8_t random[OLM_OUTBOUND_SESSION_RANDOM_SIZE];\r
+    STATIC uint8_t random[OLM_OUTBOUND_SESSION_RANDOM_SIZE];\r
     Randomize(random, OLM_OUTBOUND_SESSION_RANDOM_SIZE);\r
 \r
     size_t res =\r
@@ -345,7 +361,7 @@ MatrixOlmSessionEncrypt(
     const char * plaintext,\r
     char * outBuffer, int outBufferCap)\r
 {\r
-    static uint8_t random[OLM_ENCRYPT_RANDOM_SIZE];\r
+    STATIC uint8_t random[OLM_ENCRYPT_RANDOM_SIZE];\r
     Randomize(random, OLM_ENCRYPT_RANDOM_SIZE);\r
 \r
     size_t res = olm_encrypt(session->session,\r
@@ -363,7 +379,7 @@ MatrixOlmSessionDecrypt(
     char * encrypted,\r
     char * outBuffer, int outBufferCap)\r
 {\r
-    static uint8_t random[OLM_ENCRYPT_RANDOM_SIZE];\r
+    STATIC uint8_t random[OLM_ENCRYPT_RANDOM_SIZE];\r
     Randomize(random, OLM_ENCRYPT_RANDOM_SIZE);\r
 \r
     size_t res =\r
@@ -423,7 +439,7 @@ MatrixMegolmInSessionDecrypt(
             (uint8_t *)outDecrypted, outDecryptedCap,\r
             &megolmInMessageIndex);\r
     \r
-    printf("message index: %d\n", megolmInMessageIndex);\r
+    printf("message index: %d\n", (int)megolmInMessageIndex);\r
     \r
     if (res == olm_error()) {\r
         printf("error decrypting megolm message: %s\n", olm_inbound_group_session_last_error(session->session));\r
@@ -443,7 +459,7 @@ MatrixMegolmOutSessionInit(
 {\r
     memset(session, 0, sizeof(MatrixMegolmOutSession));\r
 \r
-    static uint8_t random[MEGOLM_INIT_RANDOM_SIZE];\r
+    STATIC uint8_t random[MEGOLM_INIT_RANDOM_SIZE];\r
     Randomize(random, MEGOLM_INIT_RANDOM_SIZE);\r
 \r
     strncpy(session->roomId, roomId, ROOM_ID_SIZE);\r
@@ -550,13 +566,10 @@ MatrixMegolmOutSessionLoad(
 \r
 bool\r
 MatrixClientInit(\r
-    MatrixClient * client,\r
-    const char * server)\r
+    MatrixClient * client)\r
 {\r
     memset(client, 0, sizeof(MatrixClient));\r
 \r
-    strcpy(client->server, server);\r
-\r
     // init olm account\r
     MatrixOlmAccountInit(&client->olmAccount);\r
 \r
@@ -580,7 +593,6 @@ MatrixClientSave(
     fwrite(thisDeviceKey, 1, DEVICE_KEY_SIZE, f);\r
     fwrite(thisSigningKey, 1, DEVICE_KEY_SIZE, f);\r
     fwrite(client->userId, 1, USER_ID_SIZE, f);\r
-    fwrite(client->server, 1, SERVER_SIZE, f);\r
     fwrite(client->accessToken, 1, ACCESS_TOKEN_SIZE, f);\r
     fwrite(client->deviceId, 1, DEVICE_ID_SIZE, f);\r
     fwrite(client->expireMs, 1, EXPIRE_MS_SIZE, f);\r
@@ -613,7 +625,6 @@ MatrixClientLoad(
     fread(thisDeviceKey, 1, DEVICE_KEY_SIZE, f);\r
     fread(thisSigningKey, 1, DEVICE_KEY_SIZE, f);\r
     fread(client->userId, 1, USER_ID_SIZE, f);\r
-    fread(client->server, 1, SERVER_SIZE, f);\r
     fread(client->accessToken, 1, ACCESS_TOKEN_SIZE, f);\r
     fread(client->deviceId, 1, DEVICE_ID_SIZE, f);\r
     fread(client->expireMs, 1, EXPIRE_MS_SIZE, f);\r
@@ -670,7 +681,7 @@ MatrixClientGenerateOnetimeKeys(
     MatrixClient * client,\r
     int numberOfKeys)\r
 {\r
-    static uint8_t random[OLM_ONETIME_KEYS_RANDOM_SIZE];\r
+    STATIC uint8_t random[OLM_ONETIME_KEYS_RANDOM_SIZE];\r
     Randomize(random, OLM_ONETIME_KEYS_RANDOM_SIZE);\r
 \r
     size_t res =\r
@@ -685,12 +696,12 @@ bool
 MatrixClientUploadOnetimeKeys(\r
     MatrixClient * client)\r
 {\r
-    static char requestBuffer[KEYS_UPLOAD_REQUEST_SIZE];\r
+    STATIC char requestBuffer[KEYS_UPLOAD_REQUEST_SIZE];\r
 \r
     mjson_snprintf(requestBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
         "{");\r
 \r
-    static char onetimeKeysBuffer[1024];\r
+    STATIC char onetimeKeysBuffer[1024];\r
     olm_account_one_time_keys(client->olmAccount.account,\r
         onetimeKeysBuffer, 1024);\r
 \r
@@ -700,14 +711,14 @@ MatrixClientUploadOnetimeKeys(
 \r
     int koff, klen, voff, vlen, vtype, off = 0;\r
     while ((off = mjson_next(keys, keysLen, off, &koff, &klen, &voff, &vlen, &vtype)) != 0) {\r
-        static char keyJson[JSON_ONETIME_KEY_SIZE];\r
+        STATIC char keyJson[JSON_ONETIME_KEY_SIZE];\r
         \r
         int keyJsonLen =\r
             snprintf(keyJson, JSON_ONETIME_KEY_SIZE,\r
                 "{\"key\":\"%.*s\"}",\r
                 vlen-2, keys + voff+1);\r
 \r
-        static char keyJsonSigned[JSON_ONETIME_KEY_SIGNED_SIZE];\r
+        STATIC char keyJsonSigned[JSON_ONETIME_KEY_SIGNED_SIZE];\r
 \r
         JsonSign(client,\r
             keyJson, keyJsonLen,\r
@@ -725,20 +736,20 @@ MatrixClientUploadOnetimeKeys(
     mjson_snprintf(requestBuffer+strlen(requestBuffer), KEYS_UPLOAD_REQUEST_SIZE-strlen(requestBuffer),\r
         "}");\r
         \r
-    // static char onetimeKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
+    // STATIC char onetimeKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
     // JsonSign(client,\r
     //     requestBuffer, strlen(requestBuffer),\r
     //     onetimeKeysSignedBuffer, KEYS_UPLOAD_REQUEST_SIZE);\r
         \r
-    // static char finalEvent[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\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
+    STATIC char finalEvent[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
     snprintf(finalEvent, KEYS_UPLOAD_REQUEST_SIGNED_SIZE,\r
     "{\"one_time_keys\":%s}", requestBuffer);\r
 \r
-    static char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];\r
-    MatrixHttpPost(client,\r
+    STATIC char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];\r
+    MatrixHttpPost(client->hc,\r
         KEYS_UPLOAD_URL,\r
         finalEvent,\r
         responseBuffer, KEYS_UPLOAD_RESPONSE_SIZE,\r
@@ -757,7 +768,7 @@ MatrixClientUploadDeviceKey(
     char thisSigningKey[DEVICE_KEY_SIZE];\r
     MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);\r
 \r
-    static char deviceKeysBuffer[KEYS_UPLOAD_REQUEST_SIZE];\r
+    STATIC char deviceKeysBuffer[KEYS_UPLOAD_REQUEST_SIZE];\r
 \r
     int deviceKeysBufferLen =\r
         mjson_snprintf(deviceKeysBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
@@ -775,17 +786,17 @@ MatrixClientUploadDeviceKey(
             client->deviceId, thisSigningKey,\r
             client->userId);\r
 \r
-    static char deviceKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
+    STATIC char deviceKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
     JsonSign(client,\r
         deviceKeysBuffer, deviceKeysBufferLen,\r
         deviceKeysSignedBuffer, KEYS_UPLOAD_REQUEST_SIZE);\r
     \r
-    static char finalEvent[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
-    snprintf(finalEvent, KEYS_UPLOAD_REQUEST_SIGNED_SIZE,\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
 \r
-    static char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];\r
-    MatrixHttpPost(client,\r
+    STATIC char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];\r
+    MatrixHttpPost(client->hc,\r
         KEYS_UPLOAD_URL,\r
         finalEvent,\r
         responseBuffer, KEYS_UPLOAD_RESPONSE_SIZE,\r
@@ -802,7 +813,7 @@ MatrixClientClaimOnetimeKey(
     const char * deviceId,\r
     char * outOnetimeKey, int outOnetimeKeyCap)\r
 {\r
-    static char requestBuffer[KEYS_CLAIM_REQUEST_SIZE];\r
+    STATIC char requestBuffer[KEYS_CLAIM_REQUEST_SIZE];\r
     mjson_snprintf(requestBuffer, KEYS_CLAIM_REQUEST_SIZE,\r
     "{"\r
       "\"one_time_keys\":{"\r
@@ -815,18 +826,18 @@ MatrixClientClaimOnetimeKey(
     userId,\r
     deviceId);\r
 \r
-    static char responseBuffer[KEYS_CLAIM_RESPONSE_SIZE];\r
-    MatrixHttpPost(client,\r
+    STATIC char responseBuffer[KEYS_CLAIM_RESPONSE_SIZE];\r
+    MatrixHttpPost(client->hc,\r
         KEYS_CLAIM_URL,\r
         requestBuffer,\r
         responseBuffer, KEYS_CLAIM_RESPONSE_SIZE,\r
         true);\r
     \r
-    char userIdEscaped[USER_ID_SIZE];\r
+    STATIC char userIdEscaped[USER_ID_SIZE];\r
     JsonEscape(userId, strlen(userId),\r
         userIdEscaped, USER_ID_SIZE);\r
     \r
-    static char query[JSON_QUERY_SIZE];\r
+    STATIC char query[JSON_QUERY_SIZE];\r
     snprintf(query, JSON_QUERY_SIZE,\r
         "$.one_time_keys.%s.%s",\r
         userIdEscaped,\r
@@ -858,7 +869,7 @@ MatrixClientLoginPassword(
     const char * password,\r
     const char * displayName)\r
 {\r
-    static char requestBuffer[LOGIN_REQUEST_SIZE];\r
+    STATIC char requestBuffer[LOGIN_REQUEST_SIZE];\r
 \r
     mjson_snprintf(requestBuffer, LOGIN_REQUEST_SIZE,\r
         "{"\r
@@ -874,9 +885,9 @@ MatrixClientLoginPassword(
         password,\r
         displayName);\r
     \r
-    static char responseBuffer[LOGIN_RESPONSE_SIZE];\r
+    STATIC char responseBuffer[LOGIN_RESPONSE_SIZE];\r
     bool result =\r
-        MatrixHttpPost(client,\r
+        MatrixHttpPost(client->hc,\r
             LOGIN_URL,\r
             requestBuffer,\r
             responseBuffer, LOGIN_RESPONSE_SIZE,\r
@@ -899,6 +910,8 @@ MatrixClientLoginPassword(
     mjson_get_string(responseBuffer, responseLen,\r
         "$.refresh_token",\r
         client->refreshToken, REFRESH_TOKEN_SIZE);\r
+        \r
+    MatrixHttpSetAccessToken(client->hc, client->accessToken);\r
 \r
     return true;\r
 }\r
@@ -911,13 +924,13 @@ MatrixClientSendEvent(
     const char * msgType,\r
     const char * msgBody)\r
 {    \r
-    static char requestUrl[MAX_URL_LEN];\r
+    STATIC char requestUrl[MAX_URL_LEN];\r
     sprintf(requestUrl,\r
         ROOM_SEND_URL, roomId, msgType, (int)time(NULL));\r
 \r
-    static char responseBuffer[ROOM_SEND_RESPONSE_SIZE];\r
+    STATIC char responseBuffer[ROOM_SEND_RESPONSE_SIZE];\r
     bool result =\r
-        MatrixHttpPut(client,\r
+        MatrixHttpPut(client->hc,\r
             requestUrl,\r
             msgBody,\r
             responseBuffer, ROOM_SEND_RESPONSE_SIZE,\r
@@ -936,7 +949,7 @@ MatrixClientSendEventEncrypted(
     const char * msgBody)\r
 {\r
     // event json\r
-    static char requestBuffer[ROOM_SEND_REQUEST_SIZE];\r
+    STATIC char requestBuffer[ROOM_SEND_REQUEST_SIZE];\r
     sprintf(requestBuffer,\r
         "{"\r
         "\"type\":\"%s\","\r
@@ -953,7 +966,7 @@ MatrixClientSendEventEncrypted(
         MatrixClientNewMegolmOutSession(client, roomId, &outSession);\r
         \r
     // encrypt\r
-    static char encryptedBuffer[ENCRYPTED_REQUEST_SIZE];\r
+    STATIC char encryptedBuffer[ENCRYPTED_REQUEST_SIZE/10];\r
     MatrixMegolmOutSessionEncrypt(outSession,\r
         requestBuffer,\r
         encryptedBuffer, ENCRYPTED_REQUEST_SIZE);\r
@@ -967,7 +980,7 @@ MatrixClientSendEventEncrypted(
     const char * sessionId = outSession->id;\r
     const char * deviceId = client->deviceId;\r
 \r
-    static char encryptedEventBuffer[ENCRYPTED_EVENT_SIZE];\r
+    STATIC char encryptedEventBuffer[ENCRYPTED_EVENT_SIZE/10];\r
     sprintf(encryptedEventBuffer,\r
         "{"\r
         "\"algorithm\":\"m.megolm.v1.aes-sha2\","\r
@@ -996,7 +1009,7 @@ MatrixClientSync(
     const char * nextBatch)\r
 {\r
     // filter={\"event_fields\":[\"to_device\"]}\r
-    static char url[MAX_URL_LEN];\r
+    STATIC char url[MAX_URL_LEN];\r
     snprintf(url, MAX_URL_LEN,\r
         "/_matrix/client/v3/sync?timeout=%d%s",\r
         SYNC_TIMEOUT,\r
@@ -1019,7 +1032,7 @@ MatrixClientSync(
     url[index] = '\0';\r
 \r
     return\r
-        MatrixHttpGet(client,\r
+        MatrixHttpGet(client->hc,\r
             url,\r
             outSyncBuffer, outSyncCap,\r
             true);\r
@@ -1033,14 +1046,14 @@ MatrixClientGetRoomEvent(
     const char * eventId,\r
     char * outEvent, int outEventCap)\r
 {\r
-    static char url[MAX_URL_LEN];\r
+    STATIC char url[MAX_URL_LEN];\r
     snprintf(url, MAX_URL_LEN,\r
         "/_matrix/client/v3/rooms/%s/event/%s",\r
             roomId,\r
             eventId);\r
 \r
     return\r
-        MatrixHttpGet(client,\r
+        MatrixHttpGet(client->hc,\r
             url,\r
             outEvent, outEventCap,\r
             true);\r
@@ -1054,7 +1067,7 @@ MatrixClientShareMegolmOutSession(
     MatrixMegolmOutSession * session)\r
 {\r
     // generate room key event\r
-    static char eventBuffer[KEY_SHARE_EVENT_LEN];\r
+    STATIC char eventBuffer[KEY_SHARE_EVENT_LEN];\r
     sprintf(eventBuffer,\r
         "{"\r
             "\"algorithm\":\"m.megolm.v1.aes-sha2\","\r
@@ -1210,7 +1223,7 @@ MatrixClientRequestMegolmInSession(
     // TODO: cancel requests\r
     MatrixClientSendDummy(client, userId, deviceId);\r
 \r
-    static char event[ROOMKEY_REQUEST_SIZE];\r
+    STATIC char event[ROOMKEY_REQUEST_SIZE];\r
     snprintf(event, ROOMKEY_REQUEST_SIZE,\r
         "{"\r
             "\"action\":\"request\","\r
@@ -1220,7 +1233,7 @@ MatrixClientRequestMegolmInSession(
                 "\"sender_key\":\"%s\","\r
                 "\"session_id\":\"%s\""\r
             "},"\r
-            "\"request_id\":\"%d\","\r
+            "\"request_id\":\"%lld\","\r
             "\"requesting_device_id\":\"%s\""\r
         "}",\r
         roomId,\r
@@ -1244,7 +1257,6 @@ MatrixClientGetOlmSessionIn(
     MatrixClient * client,\r
     const char * userId,\r
     const char * deviceId,\r
-    const char * encrypted,\r
     MatrixOlmSession ** outSession)\r
 {\r
     for (int i = 0; i < client->numOlmSessions; i++)\r
@@ -1256,9 +1268,20 @@ MatrixClientGetOlmSessionIn(
         }\r
     }\r
 \r
+    return false;\r
+}\r
+\r
+bool\r
+MatrixClientNewOlmSessionIn(\r
+    MatrixClient * client,\r
+    const char * userId,\r
+    const char * deviceId,\r
+    const char * encrypted,\r
+    MatrixOlmSession ** outSession)\r
+{\r
     if (client->numOlmSessions < NUM_OLM_SESSIONS)\r
     {\r
-        static char deviceKey[DEVICE_KEY_SIZE];\r
+        STATIC char deviceKey[DEVICE_KEY_SIZE];\r
         MatrixClientRequestDeviceKey(client,\r
             deviceId,\r
             deviceKey, DEVICE_KEY_SIZE);\r
@@ -1296,9 +1319,19 @@ MatrixClientGetOlmSessionOut(
         }\r
     }\r
 \r
+    return false;\r
+}\r
+\r
+bool\r
+MatrixClientNewOlmSessionOut(\r
+    MatrixClient * client,\r
+    const char * userId,\r
+    const char * deviceId,\r
+    MatrixOlmSession ** outSession)\r
+{\r
     if (client->numOlmSessions < NUM_OLM_SESSIONS)\r
     {\r
-        static char deviceKey[DEVICE_KEY_SIZE];\r
+        STATIC char deviceKey[DEVICE_KEY_SIZE];\r
         MatrixClientRequestDeviceKey(client,\r
             deviceId,\r
             deviceKey, DEVICE_KEY_SIZE);\r
@@ -1335,11 +1368,11 @@ MatrixClientSendToDevice(
     const char * message,\r
     const char * msgType)\r
 {\r
-    static char requestUrl[MAX_URL_LEN];\r
+    STATIC char requestUrl[MAX_URL_LEN];\r
     sprintf(requestUrl,\r
         TODEVICE_URL, msgType, (int)time(NULL));\r
 \r
-    static char eventBuffer[TODEVICE_EVENT_SIZE];\r
+    STATIC char eventBuffer[TODEVICE_EVENT_SIZE];\r
     snprintf(eventBuffer, TODEVICE_EVENT_SIZE,\r
         "{"\r
             "\"messages\":{"\r
@@ -1352,9 +1385,9 @@ MatrixClientSendToDevice(
         deviceId,\r
         message);\r
 \r
-    static char responseBuffer[ROOM_SEND_RESPONSE_SIZE];\r
+    STATIC char responseBuffer[ROOM_SEND_RESPONSE_SIZE];\r
     bool result =\r
-        MatrixHttpPut(client,\r
+        MatrixHttpPut(client->hc,\r
             requestUrl,\r
             eventBuffer,\r
             responseBuffer, ROOM_SEND_RESPONSE_SIZE,\r
@@ -1375,7 +1408,8 @@ MatrixClientSendToDeviceEncrypted(
 {\r
     // get olm session\r
     MatrixOlmSession * olmSession;\r
-    MatrixClientGetOlmSessionOut(client, userId, deviceId, &olmSession);\r
+    if (! MatrixClientGetOlmSessionOut(client, userId, deviceId, &olmSession))\r
+        MatrixClientNewOlmSessionOut(client, userId, deviceId, &olmSession);\r
 \r
     // create event json\r
     char targetDeviceKey[DEVICE_KEY_SIZE];\r
@@ -1386,7 +1420,7 @@ MatrixClientSendToDeviceEncrypted(
     char thisSigningKey[DEVICE_KEY_SIZE];\r
     MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);\r
 \r
-    static char eventBuffer[TODEVICE_EVENT_SIZE];\r
+    STATIC char eventBuffer[TODEVICE_EVENT_SIZE];\r
     sprintf(eventBuffer,\r
         "{"\r
         "\"type\":\"%s\","\r
@@ -1408,7 +1442,7 @@ MatrixClientSendToDeviceEncrypted(
         thisSigningKey);\r
 \r
     // encrypt\r
-    static char encryptedBuffer[ENCRYPTED_REQUEST_SIZE];\r
+    STATIC char encryptedBuffer[ENCRYPTED_REQUEST_SIZE];\r
     MatrixOlmSessionEncrypt(olmSession,\r
         eventBuffer,\r
         encryptedBuffer, ENCRYPTED_REQUEST_SIZE);\r
@@ -1417,7 +1451,7 @@ MatrixClientSendToDeviceEncrypted(
     MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);\r
 \r
 \r
-    static char encryptedEventBuffer[ENCRYPTED_EVENT_SIZE];\r
+    STATIC char encryptedEventBuffer[ENCRYPTED_EVENT_SIZE];\r
     sprintf(encryptedEventBuffer,\r
         "{"\r
         "\"algorithm\":\"m.olm.v1.curve25519-aes-sha2\","\r
@@ -1535,16 +1569,21 @@ bool
 MatrixClientRequestDeviceKeys(\r
     MatrixClient * client)\r
 {\r
-    static char userIdEscaped[USER_ID_SIZE];\r
+    if (client->numDevices >= NUM_DEVICES) {\r
+        printf("Maximum number of devices reached\n");\r
+        return false;\r
+    }\r
+\r
+    STATIC char userIdEscaped[USER_ID_SIZE];\r
     JsonEscape(client->userId, strlen(client->userId),\r
         userIdEscaped, USER_ID_SIZE);\r
 \r
-    static char request[KEYS_QUERY_REQUEST_SIZE];\r
+    STATIC char request[KEYS_QUERY_REQUEST_SIZE];\r
     snprintf(request, KEYS_QUERY_REQUEST_SIZE,\r
         "{\"device_keys\":{\"%s\":[]}}", client->userId);\r
 \r
-    static char responseBuffer[KEYS_QUERY_RESPONSE_SIZE];\r
-    bool requestResult = MatrixHttpPost(client,\r
+    STATIC char responseBuffer[KEYS_QUERY_RESPONSE_SIZE];\r
+    bool requestResult = MatrixHttpPost(client->hc,\r
         KEYS_QUERY_URL,\r
         request,\r
         responseBuffer, KEYS_QUERY_RESPONSE_SIZE,\r
@@ -1554,7 +1593,7 @@ MatrixClientRequestDeviceKeys(
         return false;\r
 \r
     // query for retrieving device keys for user id\r
-    static char query[JSON_QUERY_SIZE];\r
+    STATIC char query[JSON_QUERY_SIZE];\r
     snprintf(query, JSON_QUERY_SIZE,\r
         "$.device_keys.%s", userIdEscaped);\r
     \r
@@ -1577,14 +1616,14 @@ MatrixClientRequestDeviceKeys(
             "%.*s", klen-2, key+1);\r
 \r
         // look for device key in value\r
-        static char deviceKeyQuery[JSON_QUERY_SIZE];\r
+        STATIC char deviceKeyQuery[JSON_QUERY_SIZE];\r
         snprintf(deviceKeyQuery, JSON_QUERY_SIZE,\r
             "$.keys.curve25519:%s", d.deviceId);\r
         mjson_get_string(val, vlen,\r
             deviceKeyQuery, d.deviceKey, DEVICE_KEY_SIZE);\r
 \r
         // look for signing key in value\r
-        static char signingKeyQuery[JSON_QUERY_SIZE];\r
+        STATIC char signingKeyQuery[JSON_QUERY_SIZE];\r
         snprintf(signingKeyQuery, JSON_QUERY_SIZE,\r
             "$.keys.ed25519:%s", d.deviceId);\r
         mjson_get_string(val, vlen,\r
@@ -1617,12 +1656,12 @@ bool
 MatrixClientDeleteDevice(\r
     MatrixClient * client)\r
 {\r
-    static char deleteRequest[1024];\r
+    STATIC char deleteRequest[1024];\r
     snprintf(deleteRequest, 1024,\r
         "{\"devices\":[\"%s\"]}",\r
         client->deviceId);\r
-    static char deleteResponse[1024];\r
-    bool res = MatrixHttpPost(client, "/_matrix/client/v3/delete_devices",\r
+    STATIC char deleteResponse[1024];\r
+    bool res = MatrixHttpPost(client->hc, "/_matrix/client/v3/delete_devices",\r
         deleteRequest, deleteResponse, 1024, true);\r
     return res;\r
 }
\ No newline at end of file

diff --git a/src/matrix.h b/src/matrix.h
index 4037f0968705f717c8b6cbd7f17394672662be4b..d31a7f6abd8f4d9b01173b14e8101b1fde320b72 100644 (file)
--- a/src/matrix.h
+++ b/src/matrix.h
@@ -49,7 +49,54 @@
 \r
 #define NUM_MEGOLM_SESSIONS 10\r
 #define NUM_OLM_SESSIONS 10\r
-#define NUM_DEVICES 100\r
+#define NUM_DEVICES 10\r
+\r
+// HTTP\r
+\r
+typedef struct MatrixHttpConnection MatrixHttpConnection;\r
+\r
+bool\r
+MatrixHttpInit(\r
+    MatrixHttpConnection ** hc,\r
+    const char * host);\r
+\r
+// bool\r
+// MatrixHttpConnect(\r
+//     MatrixHttpConnection * hc);\r
+\r
+bool\r
+MatrixHttpDeinit(\r
+    MatrixHttpConnection ** hc);\r
+    \r
+bool\r
+MatrixHttpSetAccessToken(\r
+    MatrixHttpConnection * hc,\r
+    const char * accessToken);\r
+\r
+bool\r
+MatrixHttpGet(\r
+    MatrixHttpConnection * hc,\r
+    const char * url,\r
+    char * outResponseBuffer, int outResponseCap,\r
+    bool authenticated);\r
+\r
+bool\r
+MatrixHttpPost(\r
+    MatrixHttpConnection * hc,\r
+    const char * url,\r
+    const char * requestBuffer,\r
+    char * outResponseBuffer, int outResponseCap,\r
+    bool authenticated);\r
+\r
+bool\r
+MatrixHttpPut(\r
+    MatrixHttpConnection * hc,\r
+    const char * url,\r
+    const char * requestBuffer,\r
+    char * outResponseBuffer, int outResponseCap,\r
+    bool authenticated);\r
+\r
+\r
 \r
 // Matrix Device\r
 \r
@@ -212,19 +259,17 @@ typedef struct MatrixClient {
     // char signingKey[DEVICE_KEY_SIZE];\r
 \r
     char userId[USER_ID_SIZE];\r
-    char server[SERVER_SIZE];\r
     char accessToken[ACCESS_TOKEN_SIZE];\r
     char deviceId[DEVICE_ID_SIZE];\r
     char expireMs[EXPIRE_MS_SIZE];\r
     char refreshToken[REFRESH_TOKEN_SIZE];\r
 \r
-    void * httpUserData;\r
+    MatrixHttpConnection * hc;\r
 } MatrixClient;\r
 \r
 bool\r
 MatrixClientInit(\r
-    MatrixClient * client,\r
-    const char * server);\r
+    MatrixClient * client);\r
 \r
 bool\r
 MatrixClientSave(\r
@@ -357,6 +402,13 @@ MatrixClientRequestMegolmInSession(
 \r
 bool\r
 MatrixClientGetOlmSessionIn(\r
+    MatrixClient * client,\r
+    const char * userId,\r
+    const char * deviceId,\r
+    MatrixOlmSession ** outSession);\r
+\r
+bool\r
+MatrixClientNewOlmSessionIn(\r
     MatrixClient * client,\r
     const char * userId,\r
     const char * deviceId,\r
@@ -369,6 +421,13 @@ MatrixClientGetOlmSessionOut(
     const char * userId,\r
     const char * deviceId,\r
     MatrixOlmSession ** outSession);\r
+    \r
+bool\r
+MatrixClientNewOlmSessionOut(\r
+    MatrixClient * client,\r
+    const char * userId,\r
+    const char * deviceId,\r
+    MatrixOlmSession ** outSession);\r
 \r
 bool\r
 MatrixClientSendToDevice(\r
@@ -413,43 +472,6 @@ MatrixClientDeleteDevice(
     MatrixClient * client);\r
 \r
 \r
-\r
-\r
-bool\r
-MatrixHttpInit(\r
-    MatrixClient * client);\r
-\r
-bool\r
-MatrixHttpConnect(\r
-    MatrixClient * client);\r
-\r
-bool\r
-MatrixHttpDeinit(\r
-    MatrixClient * client);\r
-\r
-bool\r
-MatrixHttpGet(\r
-    MatrixClient * client,\r
-    const char * url,\r
-    char * outResponseBuffer, int outResponseCap,\r
-    bool authenticated);\r
-\r
-bool\r
-MatrixHttpPost(\r
-    MatrixClient * client,\r
-    const char * url,\r
-    const char * requestBuffer,\r
-    char * outResponseBuffer, int outResponseCap,\r
-    bool authenticated);\r
-\r
-bool\r
-MatrixHttpPut(\r
-    MatrixClient * client,\r
-    const char * url,\r
-    const char * requestBuffer,\r
-    char * outResponseBuffer, int outResponseCap,\r
-    bool authenticated);\r
-\r
 // util\r
 \r
 void\r