X-Git-Url: https://gitweb.ps.run/matrix_esp_thesis/blobdiff_plain/b231872efcb97e52856f5972efd161c6e9b03cd6..50f9d03ea29a8ae2f82d5edb5404fdebf4316b13:/src/matrix.h

diff --git a/src/matrix.h b/src/matrix.h
index 4037f09..81b6170 100644
--- a/src/matrix.h
+++ b/src/matrix.h
@@ -23,6 +23,7 @@
 #define DEVICE_KEY_SIZE 44
 #define SIGNING_KEY_SIZE 44
 #define ONETIME_KEY_SIZE 44
+#define MASTER_KEY_SIZE 44
 
 #define KEY_SHARE_EVENT_LEN 1024
 
@@ -47,9 +48,52 @@
 #define JSON_ONETIME_KEY_SIGNED_SIZE 256
 #define JSON_SIGNATURE_SIZE 256
 
-#define NUM_MEGOLM_SESSIONS 10
-#define NUM_OLM_SESSIONS 10
-#define NUM_DEVICES 100
+#define NUM_MEGOLM_SESSIONS 2
+#define NUM_OLM_SESSIONS 2
+#define NUM_DEVICES 10
+
+// HTTP
+
+typedef struct MatrixHttpConnection MatrixHttpConnection;
+
+bool
+MatrixHttpInit(
+    MatrixHttpConnection ** hc,
+    const char * host);
+
+bool
+MatrixHttpDeinit(
+    MatrixHttpConnection ** hc);
+    
+bool
+MatrixHttpSetAccessToken(
+    MatrixHttpConnection * hc,
+    const char * accessToken);
+
+bool
+MatrixHttpGet(
+    MatrixHttpConnection * hc,
+    const char * url,
+    char * outResponseBuffer, int outResponseCap,
+    bool authenticated);
+
+bool
+MatrixHttpPost(
+    MatrixHttpConnection * hc,
+    const char * url,
+    const char * requestBuffer,
+    char * outResponseBuffer, int outResponseCap,
+    bool authenticated);
+
+bool
+MatrixHttpPut(
+    MatrixHttpConnection * hc,
+    const char * url,
+    const char * requestBuffer,
+    char * outResponseBuffer, int outResponseCap,
+    bool authenticated);
+
+
 
 // Matrix Device
 
@@ -180,18 +224,6 @@ MatrixMegolmOutSessionEncrypt(
     const char * plaintext,
     char * outBuffer, int outBufferCap);
 
-bool
-MatrixMegolmOutSessionSave(
-    MatrixMegolmOutSession * session,
-    const char * filename,
-    const char * key);
-    
-bool
-MatrixMegolmOutSessionLoad(
-    MatrixMegolmOutSession * session,
-    const char * filename,
-    const char * key);
-
 
 // Matrix Client
 
@@ -212,29 +244,20 @@ typedef struct MatrixClient {
     // char signingKey[DEVICE_KEY_SIZE];
 
     char userId[USER_ID_SIZE];
-    char server[SERVER_SIZE];
     char accessToken[ACCESS_TOKEN_SIZE];
     char deviceId[DEVICE_ID_SIZE];
     char expireMs[EXPIRE_MS_SIZE];
     char refreshToken[REFRESH_TOKEN_SIZE];
+    char masterKey[MASTER_KEY_SIZE];
+
+    bool verified;
 
-    void * httpUserData;
+    MatrixHttpConnection * hc;
 } MatrixClient;
 
 bool
 MatrixClientInit(
-    MatrixClient * client,
-    const char * server);
-
-bool
-MatrixClientSave(
-    MatrixClient * client,
-    const char * filename);
-
-bool
-MatrixClientLoad(
-    MatrixClient * client,
-    const char * filename);
+    MatrixClient * client);
 
 bool
 MatrixClientSetAccessToken(
@@ -261,7 +284,7 @@ MatrixClientUploadOnetimeKeys(
     MatrixClient * client);
 
 bool
-MatrixClientUploadDeviceKey(
+MatrixClientUploadDeviceKeys(
     MatrixClient * client);
 
 bool
@@ -292,11 +315,22 @@ MatrixClientSendEventEncrypted(
     const char * msgType,
     const char * msgBody);
 
+void
+HandleEvent(
+    MatrixClient * client,
+    const char * event, int eventLen);
+
+void
+HandleRoomEvent(
+    MatrixClient * client,
+    const char * room, int roomLen,
+    const char * event, int eventLen);
+
 bool
 MatrixClientSync(
     MatrixClient * client,
-    char * outSync, int outSyncCap,
-    const char * nextBatch);
+    char * outSyncBuffer, int outSyncCap,
+    char * nextBatch, int nextBatchCap);
 
 bool
 MatrixClientGetRoomEvent(
@@ -356,7 +390,14 @@ MatrixClientRequestMegolmInSession(
     const char * deviceId); // TODO: remove deviceId (query all devices)
 
 bool
-MatrixClientGetOlmSessionIn(
+MatrixClientGetOlmSession(
+    MatrixClient * client,
+    const char * userId,
+    const char * deviceId,
+    MatrixOlmSession ** outSession);
+
+bool
+MatrixClientNewOlmSessionIn(
     MatrixClient * client,
     const char * userId,
     const char * deviceId,
@@ -364,7 +405,7 @@ MatrixClientGetOlmSessionIn(
     MatrixOlmSession ** outSession);
     
 bool
-MatrixClientGetOlmSessionOut(
+MatrixClientNewOlmSessionOut(
     MatrixClient * client,
     const char * userId,
     const char * deviceId,
@@ -405,50 +446,18 @@ MatrixClientRequestSigningKey(
     char * outSigningKey, int outSigningKeyCap);
 
 bool
-MatrixClientRequestDeviceKeys(
-    MatrixClient * client);
-
-bool
-MatrixClientDeleteDevice(
-    MatrixClient * client);
-
-
-
-
-bool
-MatrixHttpInit(
-    MatrixClient * client);
+MatrixClientRequestMasterKey(
+    MatrixClient * client,
+    char * outMasterKey, int outMasterKeyCap);
 
 bool
-MatrixHttpConnect(
+MatrixClientRequestDeviceKeys(
     MatrixClient * client);
 
 bool
-MatrixHttpDeinit(
+MatrixClientDeleteDevice(
     MatrixClient * client);
 
-bool
-MatrixHttpGet(
-    MatrixClient * client,
-    const char * url,
-    char * outResponseBuffer, int outResponseCap,
-    bool authenticated);
-
-bool
-MatrixHttpPost(
-    MatrixClient * client,
-    const char * url,
-    const char * requestBuffer,
-    char * outResponseBuffer, int outResponseCap,
-    bool authenticated);
-
-bool
-MatrixHttpPut(
-    MatrixClient * client,
-    const char * url,
-    const char * requestBuffer,
-    char * outResponseBuffer, int outResponseCap,
-    bool authenticated);
 
 // util