StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Wrote more new groupchats code.

Browse Source
This commit is contained in:
irungentoo 2014-09-26 16:05:10 -04:00
parent bb60c28b73
commit b308afd742
3 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
toxcore/group.c
View File

@ -337,21 +337,28 @@ static int add_friend_to_groupchat(Group_Chats *g_c, int32_t friendnumber, int g
if (!g)
return -1;
uint16_t i;
uint16_t i, ind = MAX_GROUP_CONNECTIONS;
for (i = 0; i < MAX_GROUP_CONNECTIONS; ++i) {
if (g->close[i].type != GROUPCHAT_CLOSE_NONE)
if (g->close[i].type == GROUPCHAT_CLOSE_NONE) {
ind = i;
continue;
}
if (g->close[i].type == GROUPCHAT_CLOSE_FRIEND && g->close[i].number == (uint32_t)friendnumber) {
g->close[i].group_number = other_groupnum; /* update groupnum. */
return 0; /* Already in list. */
}
break;
}
if (i == MAX_GROUP_CONNECTIONS)
if (ind == MAX_GROUP_CONNECTIONS)
return -1;
g->close[i].type = GROUPCHAT_CLOSE_FRIEND;
g->close[i].number = friendnumber;
g->close[i].group_number = other_groupnum;
g->close[ind].type = GROUPCHAT_CLOSE_FRIEND;
g->close[ind].number = friendnumber;
g->close[ind].group_number = other_groupnum;
return 0;
}
@ -376,6 +383,22 @@ int add_groupchat(Group_Chats *g_c)
return groupnumber;
}
/* Delete a groupchat from the chats array.
*
* return 0 on success.
* return -1 if failure.
*/
int del_groupchat(Group_Chats *g_c, int groupnumber)
{
Group_c *g = get_group_c(g_c, groupnumber);
if (!g)
return -1;
free(g->group);
return wipe_group_chat(g_c, groupnumber);
}
#define INVITE_PACKET_SIZE (1 + sizeof(uint16_t) + GROUP_IDENTIFIER_LENGTH)
#define INVITE_ID 0
@ -546,13 +569,10 @@ static int friend_in_close(Group_c *g, int32_t friendnumber)
if (g->close[i].number != (uint32_t)friendnumber)
continue;
break;
return i;
}
if (i == MAX_GROUP_CONNECTIONS)
return -1;
return i;
return -1;
}
#define MIN_MESSAGE_PACKET_LEN (sizeof(uint16_t) * 2 + sizeof(uint32_t) + 1)

3
toxcore/group.h
View File

@ -85,6 +85,9 @@ typedef struct {
typedef struct {
uint8_t status;
uint8_t real_public_key[crypto_box_PUBLICKEYBYTES];
uint8_t dht_public_key[crypto_box_PUBLICKEYBYTES];
} Group_Connection;
typedef struct {

3
toxcore/tox.c
View File

@ -608,8 +608,7 @@ int tox_add_groupchat(Tox *tox)
int tox_del_groupchat(Tox *tox, int groupnumber)
{
Messenger *m = tox;
//return del_groupchat(m, groupnumber);
return -1;
return del_groupchat(m->group_chat_object, groupnumber);
}
/* Copy the name of peernumber who is in groupnumber to name.