Merge branch 'master' of https://github.com/irungentoo/toxcore

1 files changed, 24 insertions, 134 deletions

diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index e6877002..4a5a5ae7 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -26,12 +26,9 @@
 #ifndef MESSENGER_H
 #define MESSENGER_H
 
-#include "net_crypto.h"
-#include "DHT.h"
 #include "friend_requests.h"
 #include "LAN_discovery.h"
-#include "group_chats.h"
-#include "onion_client.h"
+#include "friend_connection.h"
 
 #define MAX_NAME_LENGTH 128
 /* TODO: this must depend on other variable. */
@@ -42,8 +39,7 @@
 
 #define FRIEND_ADDRESS_SIZE (crypto_box_PUBLICKEYBYTES + sizeof(uint32_t) + sizeof(uint16_t))
 
-/* NOTE: Packet ids below 16 must never be used. */
-#define PACKET_ID_ALIVE 16
+/* NOTE: Packet ids below 17 must never be used. */
 #define PACKET_ID_SHARE_RELAYS 17
 #define PACKET_ID_NICKNAME 48
 #define PACKET_ID_STATUSMESSAGE 49
@@ -61,12 +57,9 @@
 #define PACKET_ID_FILE_SENDREQUEST 80
 #define PACKET_ID_FILE_CONTROL 81
 #define PACKET_ID_FILE_DATA 82
-#define PACKET_ID_INVITE_GROUPCHAT 144
-#define PACKET_ID_JOIN_GROUPCHAT 145
-#define PACKET_ID_ACCEPT_GROUPCHAT 146
+#define PACKET_ID_INVITE_GROUPCHAT 96
+#define PACKET_ID_MESSAGE_GROUPCHAT 97
 
-/* Max number of groups we can invite someone at the same time to. */
-#define MAX_INVITED_GROUPS 64
 
 /* Max number of tcp relays sent to friends */
 #define MAX_SHARED_RELAYS 16
@@ -108,15 +101,9 @@ enum {
 /* Default start timeout in seconds between friend requests. */
 #define FRIENDREQUEST_TIMEOUT 5;
 
-/* Interval between the sending of ping packets. */
-#define FRIEND_PING_INTERVAL 6
-
 /* Interval between the sending of tcp relay information */
 #define FRIEND_SHARE_RELAYS_INTERVAL (5 * 60)
 
-/* If no packets are received from friend in this time interval, kill the connection. */
-#define FRIEND_CONNECTION_TIMEOUT (FRIEND_PING_INTERVAL * 3)
-
 /* Must be < MAX_CRYPTO_DATA_SIZE */
 #define AVATAR_DATA_MAX_CHUNK_SIZE (MAX_CRYPTO_DATA_SIZE-1)
 
@@ -199,9 +186,9 @@ enum {
 };
 
 typedef struct {
-    uint8_t client_id[CLIENT_ID_SIZE];
-    uint32_t onion_friendnum;
-    int crypt_connection_id;
+    uint8_t client_id[crypto_box_PUBLICKEYBYTES];
+    int friendcon_id;
+
     uint64_t friendrequest_lastsent; // Time at which the last friend request was sent.
     uint32_t friendrequest_timeout; // The timeout between successful friendrequest sending attempts.
     uint8_t status; // 0 if no friend, 1 if added, 2 if friend request sent, 3 if confirmed friend, 4 if online.
@@ -222,13 +209,10 @@ typedef struct {
     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?
     uint32_t friendrequest_nospam; // The nospam number used in the friend request.
-    uint64_t ping_lastrecv;
-    uint64_t ping_lastsent;
+    uint64_t ping_lastrecv;//TODO remove
     uint64_t share_relays_lastsent;
     struct File_Transfers file_sending[MAX_CONCURRENT_FILE_PIPES];
     struct File_Transfers file_receiving[MAX_CONCURRENT_FILE_PIPES];
-    int invited_groups[MAX_INVITED_GROUPS];
-    uint16_t invited_groups_num;
 
     AVATAR_SENDDATA avatar_send_data;
     AVATAR_RECEIVEDATA *avatar_recv_data;    // We are receiving avatar data from this friend.
@@ -255,6 +239,8 @@ typedef struct Messenger {
     Onion_Announce *onion_a;
     Onion_Client *onion_c;
 
+    Friend_Connections *fr_c;
+
     Friend_Requests fr;
     uint8_t name[MAX_NAME_LENGTH];
     uint16_t name_length;
@@ -274,9 +260,6 @@ typedef struct Messenger {
 
     uint32_t numonline_friends;
 
-    Group_Chat **chats;
-    uint32_t numchats;
-
     uint64_t last_LANdiscovery;
 
 #define NUM_SAVED_TCP_RELAYS 8
@@ -308,14 +291,9 @@ typedef struct Messenger {
     void *avatar_data_recv_userdata;
     void (*avatar_data_recv)(struct Messenger *m, int32_t, uint8_t, uint8_t *, uint8_t *, uint32_t, void *);
 
-    void (*group_invite)(struct Messenger *m, int32_t, const uint8_t *, void *);
-    void *group_invite_userdata;
-    void (*group_message)(struct Messenger *m, int, int, const uint8_t *, uint16_t, void *);
-    void *group_message_userdata;
-    void (*group_action)(struct Messenger *m, int, int, const uint8_t *, uint16_t, void *);
-    void *group_action_userdata;
-    void (*group_namelistchange)(struct Messenger *m, int, int, uint8_t, void *);
-    void *group_namelistchange_userdata;
+    void *group_chat_object; /* Set by new_groupchats()*/
+    void (*group_invite)(struct Messenger *m, int32_t, const uint8_t *, uint16_t);
+    void (*group_message)(struct Messenger *m, int32_t, const uint8_t *, uint16_t);
 
     void (*file_sendrequest)(struct Messenger *m, int32_t, uint8_t, uint64_t, const uint8_t *, uint16_t, void *);
     void *file_sendrequest_userdata;
@@ -518,6 +496,11 @@ uint8_t m_get_self_userstatus(const Messenger *m);
  */
 int m_set_avatar(Messenger *m, uint8_t format, const uint8_t *data, uint32_t length);
 
+/* Unsets the user avatar.
+
+   returns 0 on success (currently always returns 0) */
+int m_unset_avatar(Messenger *m);
+
 /* Get avatar data from the current user.
  * Copies the current user avatar data to the destination buffer and sets the image format
  * accordingly.
@@ -747,97 +730,16 @@ void m_callback_avatar_data(Messenger *m, void (*function)(Messenger *m, int32_t
 
 /* Set the callback for group invites.
  *
- *  Function(Messenger *m, int32_t friendnumber, uint8_t *group_public_key, void *userdata)
- */
-void m_callback_group_invite(Messenger *m, void (*function)(Messenger *m, int32_t, const uint8_t *, void *),
-                             void *userdata);
-
-/* Set the callback for group messages.
- *
- *  Function(Tox *tox, int groupnumber, int friendgroupnumber, uint8_t * message, uint16_t length, void *userdata)
- */
-void m_callback_group_message(Messenger *m, void (*function)(Messenger *m, int, int, const uint8_t *, uint16_t, void *),
-                              void *userdata);
-
-/* Set the callback for group actions.
- *
- *  Function(Tox *tox, int groupnumber, int friendgroupnumber, uint8_t * message, uint16_t length, void *userdata)
- */
-void m_callback_group_action(Messenger *m, void (*function)(Messenger *m, int, int, const uint8_t *, uint16_t, void *),
-                             void *userdata);
-
-/* Set callback function for peer name list changes.
- *
- * It gets called every time the name list changes(new peer/name, deleted peer)
- *  Function(Tox *tox, int groupnumber, void *userdata)
- */
-void m_callback_group_namelistchange(Messenger *m, void (*function)(Messenger *m, int, int, uint8_t, void *),
-                                     void *userdata);
-
-/* Creates a new groupchat and puts it in the chats array.
- *
- * return group number on success.
- * return -1 on failure.
- */
-int add_groupchat(Messenger *m);
-
-/* Delete a groupchat from the chats array.
- *
- * return 0 on success.
- * return -1 if failure.
- */
-int del_groupchat(Messenger *m, int groupnumber);
-
-/* Copy the name of peernumber who is in groupnumber to name.
- * name must be at least MAX_NICK_BYTES long.
- *
- * return length of name if success
- * return -1 if failure
- */
-int m_group_peername(const Messenger *m, int groupnumber, int peernumber, uint8_t *name);
-
-/* invite friendnumber to groupnumber
- * return 0 on success
- * return -1 on failure
- */
-int invite_friend(Messenger *m, int32_t friendnumber, int groupnumber);
-
-/* Join a group (you need to have been invited first.)
- *
- * returns group number on success
- * returns -1 on failure.
- */
-int join_groupchat(Messenger *m, int32_t friendnumber, const uint8_t *friend_group_public_key);
-
-/* send a group message
- * return 0 on success
- * return -1 on failure
- */
-int group_message_send(const Messenger *m, int groupnumber, const uint8_t *message, uint32_t length);
-
-/* send a group action
- * return 0 on success
- * return -1 on failure
- */
-int group_action_send(const Messenger *m, int groupnumber, const uint8_t *action, uint32_t length);
-
-/* Return the number of peers in the group chat on success.
- * return -1 on failure
+ *  Function(Messenger *m, int32_t friendnumber, uint8_t *data, uint16_t length)
  */
-int group_number_peers(const Messenger *m, int groupnumber);
+void m_callback_group_invite(Messenger *m, void (*function)(Messenger *m, int32_t, const uint8_t *, uint16_t));
 
-/* List all the peers in the group chat.
+/* Send a group invite packet.
  *
- * Copies the names of the peers to the name[length][MAX_NICK_BYTES] array.
- *
- * Copies the lengths of the names to lengths[length]
- *
- * returns the number of peers on success.
- *
- * return -1 on failure.
+ *  return 1 on success
+ *  return 0 on failure
  */
-int group_names(const Messenger *m, int groupnumber, uint8_t names[][MAX_NICK_BYTES], uint16_t lengths[],
-                uint16_t length);
+int send_group_invite_packet(const Messenger *m, int32_t friendnumber, const uint8_t *data, uint16_t length);
 
 /****************FILE SENDING*****************/
 
@@ -1013,16 +915,4 @@ uint32_t copy_friendlist(const Messenger *m, int32_t *out_list, uint32_t list_si
  */
 int get_friendlist(const Messenger *m, int **out_list, uint32_t *out_list_length);
 
-/* Return the number of chats in the instance m.
- * You should use this to determine how much memory to allocate
- * for copy_chatlist. */
-uint32_t count_chatlist(const Messenger *m);
-
-/* Copy a list of valid chat IDs into the array out_list.
- * If out_list is NULL, returns 0.
- * Otherwise, returns the number of elements copied.
- * If the array was too small, the contents
- * of out_list will be truncated to list_size. */
-uint32_t copy_chatlist(const Messenger *m, int *out_list, uint32_t list_size);
-
 #endif