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

retain old data file friendlists on load

Browse Source
This commit is contained in:
Jfreegman 2014-03-16 05:09:36 -04:00
parent 7d1060abc2
commit 419a2fb2e3
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
toxcore/Messenger.c
View File

@ -2364,6 +2364,21 @@ struct SAVED_FRIEND {
uint64_t ping_lastrecv; uint64_t ping_lastrecv;
}; };
/* for backwards compatibility with last version of SAVED_FRIEND.
must never be bigger than SAVED_FRIEND. */
struct SAVED_FRIEND_OLD {
uint8_t status;
uint8_t client_id[CLIENT_ID_SIZE];
uint8_t info[MAX_DATA_SIZE];
uint16_t info_size;
uint8_t name[MAX_NAME_LENGTH];
uint16_t name_length;
uint8_t statusmessage[MAX_STATUSMESSAGE_LENGTH];
uint16_t statusmessage_length;
uint8_t userstatus;
uint32_t friendrequest_nospam;
};
static uint32_t saved_friendslist_size(Messenger *m) static uint32_t saved_friendslist_size(Messenger *m)
{ {
return count_friendlist(m) * sizeof(struct SAVED_FRIEND); return count_friendlist(m) * sizeof(struct SAVED_FRIEND);
@ -2408,15 +2423,24 @@ static uint32_t friends_list_save(Messenger *m, uint8_t *data)
static int friends_list_load(Messenger *m, uint8_t *data, uint32_t length) static int friends_list_load(Messenger *m, uint8_t *data, uint32_t length)
{ {
if (length % sizeof(struct SAVED_FRIEND) != 0) int old_data = 0;
return -1;
uint32_t num = length / sizeof(struct SAVED_FRIEND); if (length % sizeof(struct SAVED_FRIEND) != 0) {
if (length % sizeof(struct SAVED_FRIEND_OLD) != 0)
return -1;
old_data = 1;
}
/* if old data file is being used, offset size of current SAVED_FRIEND struct with size of old one */
uint32_t diff = old_data ? sizeof(struct SAVED_FRIEND) - sizeof(struct SAVED_FRIEND_OLD) : 0;
uint32_t struct_size = sizeof(struct SAVED_FRIEND) - diff;
uint32_t num = length / struct_size;
uint32_t i; uint32_t i;
for (i = 0; i < num; ++i) { for (i = 0; i < num; ++i) {
struct SAVED_FRIEND temp; struct SAVED_FRIEND temp;
memcpy(&temp, data + i * sizeof(struct SAVED_FRIEND), sizeof(struct SAVED_FRIEND)); memcpy(&temp, data + i * struct_size, struct_size);
if (temp.status >= 3) { if (temp.status >= 3) {
int fnum = m_addfriend_norequest(m, temp.client_id); int fnum = m_addfriend_norequest(m, temp.client_id);
@ -2424,10 +2448,12 @@ static int friends_list_load(Messenger *m, uint8_t *data, uint32_t length)
set_friend_statusmessage(m, fnum, temp.statusmessage, ntohs(temp.statusmessage_length)); set_friend_statusmessage(m, fnum, temp.statusmessage, ntohs(temp.statusmessage_length));
set_friend_userstatus(m, fnum, temp.userstatus); set_friend_userstatus(m, fnum, temp.userstatus);
uint8_t lastonline[sizeof(uint64_t)]; if (!old_data) {
memcpy(lastonline, &temp.ping_lastrecv, sizeof(uint64_t)); uint8_t lastonline[sizeof(uint64_t)];
net_to_host(lastonline, sizeof(uint64_t)); memcpy(lastonline, &temp.ping_lastrecv, sizeof(uint64_t));
memcpy(&m->friendlist[fnum].ping_lastrecv, lastonline, sizeof(uint64_t)); net_to_host(lastonline, sizeof(uint64_t));
memcpy(&m->friendlist[fnum].ping_lastrecv, lastonline, sizeof(uint64_t));
}
} else if (temp.status != 0) { } else if (temp.status != 0) {
/* TODO: This is not a good way to do this. */ /* TODO: This is not a good way to do this. */
uint8_t address[FRIEND_ADDRESS_SIZE]; uint8_t address[FRIEND_ADDRESS_SIZE];