1 files changed, 91 insertions, 35 deletions

diff --git a/core/Messenger.h b/core/Messenger.h
index 9352cfbb..36e24596 100644
--- a/core/Messenger.h
+++ b/core/Messenger.h
@@ -73,6 +73,58 @@ typedef enum {
     USERSTATUS_INVALID
 } USERSTATUS;
 
+typedef struct {
+    uint8_t client_id[CLIENT_ID_SIZE];
+    int crypt_connection_id;
+    uint64_t friend_request_id; /* id of the friend request corresponding to the current friend request to the current friend. */
+    uint8_t status; /* 0 if no friend, 1 if added, 2 if friend request sent, 3 if confirmed friend, 4 if online. */
+    uint8_t info[MAX_DATA_SIZE]; /* the data that is sent during the friend requests we do */
+    uint8_t name[MAX_NAME_LENGTH];
+    uint8_t name_sent; /* 0 if we didn't send our name to this friend 1 if we have. */
+    uint8_t *statusmessage;
+    uint16_t statusmessage_length;
+    uint8_t statusmessage_sent;
+    USERSTATUS userstatus;
+    uint8_t userstatus_sent;
+    uint16_t info_size; /* length of the info */
+    uint32_t message_id; /* a semi-unique id used in read receipts */
+    uint8_t receives_read_receipts; /* shall we send read receipts to this person? */
+} Friend;
+
+typedef struct Messenger {
+    uint8_t public_key[crypto_box_PUBLICKEYBYTES];
+
+    uint8_t name[MAX_NAME_LENGTH];
+    uint16_t name_length;
+
+    uint8_t statusmessage[MAX_STATUSMESSAGE_LENGTH];
+    uint16_t statusmessage_length;
+
+    USERSTATUS userstatus;
+
+    Friend *friendlist;
+    uint32_t numfriends;
+
+    void (*friend_message)(struct Messenger *m, int, uint8_t *, uint16_t);
+    uint8_t friend_message_isset;
+    void (*friend_action)(struct Messenger *m, int, uint8_t *, uint16_t);
+    uint8_t friend_action_isset;
+    void (*friend_namechange)(struct Messenger *m, int, uint8_t *, uint16_t);
+    uint8_t friend_namechange_isset;
+    void (*friend_statusmessagechange)(struct Messenger *m, int, uint8_t *, uint16_t);
+    uint8_t friend_statusmessagechange_isset;
+    void (*friend_userstatuschange)(struct Messenger *m, int, USERSTATUS);
+    uint8_t friend_userstatuschange_isset;
+    void (*read_receipt)(struct Messenger *m, int, uint32_t);
+    uint8_t read_receipt_isset;
+    void (*friend_statuschange)(struct Messenger *m, int, uint8_t);
+    uint8_t friend_statuschange_isset;
+    void (*friend_connectionstatuschange)(struct Messenger *m, int, uint8_t);
+    uint8_t friend_connectionstatuschange_isset;
+
+
+} Messenger;
+
 /*
  * add a friend
  * set the data that will be sent along with friend request
@@ -85,33 +137,33 @@ typedef enum {
  * return -4 if friend request already sent or already a friend
  * return -5 for unknown error
  */
-int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length);
+int m_addfriend(Messenger *m, uint8_t *client_id, uint8_t *data, uint16_t length);
 
 
 /* add a friend without sending a friendrequest.
     returns the friend number if success
     return -1 if failure. */
-int m_addfriend_norequest(uint8_t *client_id);
+int m_addfriend_norequest(Messenger *m, uint8_t *client_id);
 
 /* return the friend id associated to that client id.
     return -1 if no such friend */
-int getfriend_id(uint8_t *client_id);
+int getfriend_id(Messenger *m, uint8_t *client_id);
 
 /* copies the public key associated to that friend id into client_id buffer.
     make sure that client_id is of size CLIENT_ID_SIZE.
     return 0 if success
     return -1 if failure */
-int getclient_id(int friend_id, uint8_t *client_id);
+int getclient_id(Messenger *m, int friend_id, uint8_t *client_id);
 
 /* remove a friend */
-int m_delfriend(int friendnumber);
+int m_delfriend(Messenger *m, int friendnumber);
 
 /* return 4 if friend is online
     return 3 if friend is confirmed
     return 2 if the friend request was sent
     return 1 if the friend was added
     return 0 if there is no friend with that number */
-int m_friendstatus(int friendnumber);
+int m_friendstatus(Messenger *m, int friendnumber);
 
 /* send a text chat message to an online friend
     returns the message id if packet was successfully put into the send queue
@@ -120,13 +172,13 @@ int m_friendstatus(int friendnumber);
     if one is received.
     m_sendmessage_withid will send a message with the id of your choosing,
     however we can generate an id for you by calling plain m_sendmessage. */
-uint32_t m_sendmessage(int friendnumber, uint8_t *message, uint32_t length);
-uint32_t m_sendmessage_withid(int friendnumber, uint32_t theid, uint8_t *message, uint32_t length);
+uint32_t m_sendmessage(Messenger *m, int friendnumber, uint8_t *message, uint32_t length);
+uint32_t m_sendmessage_withid(Messenger *m, int friendnumber, uint32_t theid, uint8_t *message, uint32_t length);
 
 /* send an action to an online friend
     returns 1 if packet was successfully put into the send queue
     return 0 if it was not */
-int m_sendaction(int friendnumber, uint8_t *action, uint32_t length);
+int m_sendaction(Messenger *m, int friendnumber, uint8_t *action, uint32_t length);
 
 /* Set our nickname
    name must be a string of maximum MAX_NAME_LENGTH length.
@@ -134,73 +186,73 @@ int m_sendaction(int friendnumber, uint8_t *action, uint32_t length);
    length is the length of name with the NULL terminator
    return 0 if success
    return -1 if failure */
-int setname(uint8_t *name, uint16_t length);
+int setname(Messenger *m, uint8_t *name, uint16_t length);
 
 /* get our nickname
    put it in name
    return the length of the name*/
-uint16_t getself_name(uint8_t *name);
+uint16_t getself_name(Messenger *m, uint8_t *name);
 
 /* get name of friendnumber
     put it in name
     name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH (128) bytes.
     return 0 if success
     return -1 if failure */
-int getname(int friendnumber, uint8_t *name);
+int getname(Messenger *m, int friendnumber, uint8_t *name);
 
 /* set our user status
     you are responsible for freeing status after
     returns 0 on success, -1 on failure */
-int m_set_statusmessage(uint8_t *status, uint16_t length);
-int m_set_userstatus(USERSTATUS status);
+int m_set_statusmessage(Messenger *m, uint8_t *status, uint16_t length);
+int m_set_userstatus(Messenger *m, USERSTATUS status);
 
 /* return the length of friendnumber's status message,
     including null
     pass it into malloc */
-int m_get_statusmessage_size(int friendnumber);
+int m_get_statusmessage_size(Messenger *m, int friendnumber);
 
 /* copy friendnumber's status message into buf, truncating if size is over maxlen
     get the size you need to allocate from m_get_statusmessage_size
     The self variant will copy our own status message. */
-int m_copy_statusmessage(int friendnumber, uint8_t *buf, uint32_t maxlen);
-int m_copy_self_statusmessage(uint8_t *buf, uint32_t maxlen);
+int m_copy_statusmessage(Messenger *m, int friendnumber, uint8_t *buf, uint32_t maxlen);
+int m_copy_self_statusmessage(Messenger *m, uint8_t *buf, uint32_t maxlen);
 
 /* Return one of USERSTATUS values.
  * Values unknown to your application should be represented as USERSTATUS_NONE.
  * As above, the self variant will return our own USERSTATUS.
  * If friendnumber is invalid, this shall return USERSTATUS_INVALID. */
-USERSTATUS m_get_userstatus(int friendnumber);
-USERSTATUS m_get_self_userstatus(void);
+USERSTATUS m_get_userstatus(Messenger *m, int friendnumber);
+USERSTATUS m_get_self_userstatus(Messenger *m);
 
 /* Sets whether we send read receipts for friendnumber.
  * This function is not lazy, and it will fail if yesno is not (0 or 1).*/
-void m_set_sends_receipts(int friendnumber, int yesno);
+void m_set_sends_receipts(Messenger *m, int friendnumber, int yesno);
 
 /* set the function that will be executed when a friend request is received.
     function format is function(uint8_t * public_key, uint8_t * data, uint16_t length) */
-void m_callback_friendrequest(void (*function)(uint8_t *, uint8_t *, uint16_t));
+void m_callback_friendrequest(Messenger *m, void (*function)(uint8_t *, uint8_t *, uint16_t));
 
 /* set the function that will be executed when a message from a friend is received.
     function format is: function(int friendnumber, uint8_t * message, uint32_t length) */
-void m_callback_friendmessage(void (*function)(int, uint8_t *, uint16_t));
+void m_callback_friendmessage(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t));
 
 /* set the function that will be executed when an action from a friend is received.
     function format is: function(int friendnumber, uint8_t * action, uint32_t length) */
-void m_callback_action(void (*function)(int, uint8_t *, uint16_t));
+void m_callback_action(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t));
 
 /* set the callback for name changes
     function(int friendnumber, uint8_t *newname, uint16_t length)
     you are not responsible for freeing newname */
-void m_callback_namechange(void (*function)(int, uint8_t *, uint16_t));
+void m_callback_namechange(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t));
 
 /* set the callback for status message changes
     function(int friendnumber, uint8_t *newstatus, uint16_t length)
     you are not responsible for freeing newstatus */
-void m_callback_statusmessage(void (*function)(int, uint8_t *, uint16_t));
+void m_callback_statusmessage(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t));
 
 /* set the callback for status type changes
     function(int friendnumber, USERSTATUS kind) */
-void m_callback_userstatus(void (*function)(int, USERSTATUS));
+void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, int, USERSTATUS));
 
 /* set the callback for read receipts
     function(int friendnumber, uint32_t receipt)
@@ -209,7 +261,7 @@ void m_callback_userstatus(void (*function)(int, USERSTATUS));
     has been received on the other side. since core doesn't
     track ids for you, receipt may not correspond to any message
     in that case, you should discard it. */
-void m_callback_read_receipt(void (*function)(int, uint32_t));
+void m_callback_read_receipt(Messenger *m, void (*function)(Messenger *m, int, uint32_t));
 
 /* set the callback for connection status changes
     function(int friendnumber, uint8_t status)
@@ -219,26 +271,30 @@ void m_callback_read_receipt(void (*function)(int, uint32_t));
     note that this callback is not called when adding friends, thus the "after
     being previously online" part. it's assumed that when adding friends,
     their connection status is offline. */
-void m_callback_connectionstatus(void (*function)(int, uint8_t));
+void m_callback_connectionstatus(Messenger *m, void (*function)(Messenger *m, int, uint8_t));
 
 /* run this at startup
-    returns 0 if no connection problems
-    returns -1 if there are problems */
-int initMessenger(void);
+ *  returns allocated instance of Messenger on success
+ *  returns 0 if there are problems */
+Messenger * initMessenger(void);
+
+/* run this before closing shop
+ * free all datastructures */
+void cleanupMessenger(Messenger *M);
 
 /* the main loop that needs to be run at least 200 times per second */
-void doMessenger(void);
+void doMessenger(Messenger *m);
 
 /* SAVING AND LOADING FUNCTIONS: */
 
 /* returns the size of the messenger data (for saving) */
-uint32_t Messenger_size(void);
+uint32_t Messenger_size(Messenger *m);
 
 /* save the messenger in data (must be allocated memory of size Messenger_size()) */
-void Messenger_save(uint8_t *data);
+void Messenger_save(Messenger *m, uint8_t *data);
 
 /* load the messenger from data of size length */
-int Messenger_load(uint8_t *data, uint32_t length);
+int Messenger_load(Messenger *m, uint8_t *data, uint32_t length);
 
 #ifdef __cplusplus
 }