diff options
author | irungentoo <irungentoo@gmail.com> | 2013-10-02 20:20:33 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-10-02 20:20:33 -0400 |
commit | 8a77211b434460cc22cb8c4d3382bbfe137336fb (patch) | |
tree | f5cfb5cd6424fee29493706cba82d83c14d37d60 /toxcore/Messenger.c | |
parent | 6425cf3b53d6e095b4dc97bd08ec39b31fd1e786 (diff) | |
parent | 0fb3c9eeede6da300cd4bb94540af09ee9a3327e (diff) |
Merge branch 'file-transfers' of https://github.com/irungentoo/ProjectTox-Core into file-transfers
Diffstat (limited to 'toxcore/Messenger.c')
-rw-r--r-- | toxcore/Messenger.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index 6ad3fd00..ac79cde1 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c | |||
@@ -971,10 +971,10 @@ void callback_file_data(Messenger *m, void (*function)(Messenger *m, int, uint8_ | |||
971 | m->file_filedata_userdata = userdata; | 971 | m->file_filedata_userdata = userdata; |
972 | } | 972 | } |
973 | 973 | ||
974 | #define MAX_FILENAME_LENGTH 256 | 974 | #define MAX_FILENAME_LENGTH 255 |
975 | 975 | ||
976 | /* Send a file send request. | 976 | /* Send a file send request. |
977 | * Maximum filename length is 256 bytes. | 977 | * Maximum filename length is 255 bytes. |
978 | * return 1 on success | 978 | * return 1 on success |
979 | * return 0 on failure | 979 | * return 0 on failure |
980 | */ | 980 | */ |
@@ -998,7 +998,7 @@ int file_sendrequest(Messenger *m, int friendnumber, uint8_t filenumber, uint64_ | |||
998 | } | 998 | } |
999 | 999 | ||
1000 | /* Send a file send request. | 1000 | /* Send a file send request. |
1001 | * Maximum filename length is 256 bytes. | 1001 | * Maximum filename length is 255 bytes. |
1002 | * return file number on success | 1002 | * return file number on success |
1003 | * return -1 on failure | 1003 | * return -1 on failure |
1004 | */ | 1004 | */ |
@@ -1518,7 +1518,7 @@ void doFriends(Messenger *m) | |||
1518 | //filesize = ntohll(filesize); | 1518 | //filesize = ntohll(filesize); |
1519 | m->friendlist[i].file_receiving[filenumber].status = 1; | 1519 | m->friendlist[i].file_receiving[filenumber].status = 1; |
1520 | m->friendlist[i].file_receiving[filenumber].size = filesize; | 1520 | m->friendlist[i].file_receiving[filenumber].size = filesize; |
1521 | 1521 | m->friendlist[i].file_receiving[filenumber].transferred = 0; | |
1522 | if (m->file_sendrequest) | 1522 | if (m->file_sendrequest) |
1523 | (*m->file_sendrequest)(m, i, filenumber, filesize, data + 1 + sizeof(uint64_t), data_length - 1 - sizeof(uint64_t), | 1523 | (*m->file_sendrequest)(m, i, filenumber, filesize, data + 1 + sizeof(uint64_t), data_length - 1 - sizeof(uint64_t), |
1524 | m->file_sendrequest_userdata); | 1524 | m->file_sendrequest_userdata); |