get send encrypted to send :)

diff --git a/Makefile b/Makefile
index 88b1941467427fd1cf0d9ac19d3a5b65a8cccf3e..8197ee5b4ffdd60824214a7383d44cb87b54b06b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CC=gcc\r
+CC=clang++\r

 \r
 C_OPTS=-Wall -Wextra -pedantic\r
 C_OPTS+=src/matrix.c\r
 \r
 C_OPTS=-Wall -Wextra -pedantic\r
 C_OPTS+=src/matrix.c\r


@@ -9,12 +9,12 @@ C_OPTS+=-I src/
 C_OPTS+=-I ext/olm/include/\r
 C_OPTS+=-I ext/mjson/src/\r
 C_OPTS+=-I ext/mongoose/\r
 C_OPTS+=-I ext/olm/include/\r
 C_OPTS+=-I ext/mjson/src/\r
 C_OPTS+=-I ext/mongoose/\r

-C_OPTS+=-L out/olm/\r

 C_OPTS+=-l ws2_32\r
 C_OPTS+=-l ssl\r
 C_OPTS+=-l crypto\r
 C_OPTS+=-l ws2_32\r
 C_OPTS+=-l ssl\r
 C_OPTS+=-l crypto\r

-C_OPTS+=-l olm\r
+C_OPTS+=out/olm/libolm.a\r

 C_OPTS+=-D MG_ENABLE_OPENSSL=1\r
 C_OPTS+=-D MG_ENABLE_OPENSSL=1\r

+C_OPTS+=-fuse-ld=lld.exe -g -gcodeview -Wl,/debug,/pdb:test.pdb\r

 # C_OPTS+=-I ext/curl/include/\r
 # C_OPTS+=-L ext/curl/build/lib/\r
 # C_OPTS+=-l curl\r
 # C_OPTS+=-I ext/curl/include/\r
 # C_OPTS+=-L ext/curl/build/lib/\r
 # C_OPTS+=-l curl\r

diff --git a/src/matrix.c b/src/matrix.c
index 28e7634e9b367d4f9bd13a7934195167f6a5d910..cc34a0a727bcc74915552f4efb02e12b5f265ab5 100644 (file)
--- a/src/matrix.c
+++ b/src/matrix.c
@@ -294,7 +294,7 @@ MatrixClientSendEventEncrypted(
         "\"algorithm\":\"m.megolm.v1.aes-sha2\","\r
         "\"sender_key\":\"%s\","\r
         "\"ciphertext\":\"%s\","\r
         "\"algorithm\":\"m.megolm.v1.aes-sha2\","\r
         "\"sender_key\":\"%s\","\r
         "\"ciphertext\":\"%s\","\r

-        "\"session_id\":%s,"\r
+        "\"session_id\":\"%s\","\r

         "\"device_id\":\"%s\""\r
         "}",\r
         senderKey,\r
         "\"device_id\":\"%s\""\r
         "}",\r
         senderKey,\r

diff --git a/src/matrix_http_mongoose.c b/src/matrix_http_mongoose.c
index 020b4c8cf638256edc9db6a521b454f7c71c4f98..2e500d69c5557ae35dff29bacb2a89bd4b8e4845 100644 (file)
--- a/src/matrix_http_mongoose.c
+++ b/src/matrix_http_mongoose.c
@@ -36,7 +36,7 @@ MatrixHttpCallback(
         // If s_url is https://, tell client connection to use TLS\r
         if (mg_url_is_ssl(client->server))\r
         {\r
         // If s_url is https://, tell client connection to use TLS\r
         if (mg_url_is_ssl(client->server))\r
         {\r

-            struct mg_tls_opts opts;\r
+            static struct mg_tls_opts opts;\r

             opts.srvname = host;\r
             mg_tls_init(c, &opts);\r
         }\r
             opts.srvname = host;\r
             mg_tls_init(c, &opts);\r
         }\r


@@ -71,7 +71,8 @@ MatrixHttpInit(
     \r
     mg_mgr_init(&conn->mgr);\r
 \r
     \r
     mg_mgr_init(&conn->mgr);\r
 \r

-    mg_http_connect(&conn->mgr, client->server, MatrixHttpCallback, client);\r
+    struct mg_connection * c =\r
+        mg_http_connect(&conn->mgr, client->server, MatrixHttpCallback, client);\r

 \r
     while (! conn->connected)\r
         mg_mgr_poll(&conn->mgr, 1000);\r
 \r
     while (! conn->connected)\r
         mg_mgr_poll(&conn->mgr, 1000);\r


@@ -198,6 +199,20 @@ MatrixHttpPut(
     else\r
         authorizationHeader[0] = '\0';\r
 \r
     else\r
         authorizationHeader[0] = '\0';\r
 \r

+    printf("PUT %s HTTP/1.0\r\n"\r
+            "Host: %.*s\r\n"\r
+            "%s"\r
+            "Content-Type: application/json\r\n"\r
+            "Content-Length: %d\r\n"\r
+            "\r\n"\r
+            "%s"\r
+            "\r\n",\r
+            url,\r
+            host.len, host.ptr,\r
+            authorizationHeader,\r
+            strlen(requestBuffer),\r
+            requestBuffer);\r
+\r

     mg_printf(conn->connection,\r
             "PUT %s HTTP/1.0\r\n"\r
             "Host: %.*s\r\n"\r
     mg_printf(conn->connection,\r
             "PUT %s HTTP/1.0\r\n"\r
             "Host: %.*s\r\n"\r