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
1,200 Commits 2 Branches 1 Tag 69 MiB
9eddeb0fd3
Commit Graph

375 Commits

Author SHA1 Message Date
irungentoo
cb4f67b37a Merge pull request #441 from slvr/timer 
Timer Subsystem
 2013-08-13 04:14:01 -07:00
slvr
471c148090 Portabily print out uint64_t using PRIu64 2013-08-13 09:55:49 +01:00
slvr
9e3f48c165 Removed core/Messenger.c.orig 
Cleanup from merge conflict.
 2013-08-13 09:51:18 +01:00
slvr
4bfeb2f483 timer_new -> new_timer and timer_delete -> delete_timer to avoid name conflict 2013-08-13 09:45:11 +01:00
Andreas Schneider
6b06431e9b core: Fix a possible buffer overflow using getself_name(). 
If the passed buffer is smaller than MAX_NAME_LENGTH then, you
will probably overflow it.
 2013-08-13 09:50:51 +02:00
slvr
a0c6296d6c Resolve Merge Conflict 2013-08-12 23:47:15 +01:00
slvr
be840b46b9 Merge remote-tracking branch 'upstream/master' into timer 
Conflicts:
	core/Messenger.c
 2013-08-12 23:08:48 +01:00
slvr
a56d87cd3f remember to call timer_poll 2013-08-12 14:54:40 +01:00
slvr
c6b496d85b Messenger Timer 2013-08-12 14:44:59 +01:00
slvr
f3511db29b Added LAN discovery timer 2013-08-12 14:19:25 +01:00
alek900
8d3e68b74d Added support for userdata in callbacks 2013-08-12 14:23:46 +02:00
slvr
1a39c397c5 Implemented Deadline Timer and timer_test 2013-08-12 13:08:03 +01:00
Chris Hall
4293c4b1e6 Messenger refactor - redid work from pull request 79 
Moves static state out of Messenger.c and into a Messenger struct
Purely stylistic, no functional changes were made.

This commit also changed all the callers of Messenger as they now have
to pass an instance of the Messenger struct to messenger functions.

Also removed some uses of the 'static' keyword at the beginning of
function definitions when the function was already declared static, as
these caused gcc to whine.
 2013-08-12 21:37:38 +12:00
alek900
ed3b036862 Send our current status and name to friend that just came online. 
Our username and status might have changed while our friend was offline.
 2013-08-11 23:10:12 +02:00
Maxim Biro
e427197580 Fixed a mistake 2013-08-11 16:56:02 -04:00
Maxim Biro
ee95bf08af Fixed a typo 2013-08-11 16:52:43 -04:00
Maxim Biro
eaa7d3e0a0 Replaced friendstatus with connectionstatus 2013-08-11 14:57:47 -04:00
Maxim Biro
440871bda1 Fixed warnings on Windows 2013-08-11 14:17:02 -04:00
irungentoo
3a2d453165 Merge pull request #429 from dparnell/pristine 
Fixed m_sendmessage to return the ID of the message sent
 2013-08-11 06:59:26 -07:00
irungentoo
31bf4aece7 Merge pull request #427 from Alek900/master 
m_addfriend triggerd m_callback_friendstatus with a friendid thats not yet returned from m_addfriend
 2013-08-11 06:28:35 -07:00
Daniel Parnell
6c0db66a01 Fixed m_sendmessage to return the ID of the message sent 2013-08-11 22:15:07 +10:00
alek900
851c52571f m_addfriend triggerd m_callback_friendstatus with a friendid thats not returned yet from m_addfriend 2013-08-11 13:02:02 +02:00
irungentoo
8e05bcb5f9 Merge pull request #422 from slvr/crypto-speed-boost 
Cryptography speed boost
 2013-08-10 16:20:54 -07:00
irungentoo
e37fd0c607 That define doesn't belong here. 2013-08-10 19:04:00 -04:00
slvr
5b6465528f handle_ping_response function signature correction 2013-08-10 19:55:54 +01:00
slvr
da8ef89e9d Merge remote-tracking branch 'upstream/master' into pr 2013-08-10 19:20:56 +01:00
slvr
a5f34764d2 Ensure encrypt_precompute is called when status == CONN_ESTABLISHED 2013-08-10 18:46:11 +01:00
slvr
021852d494 Implemented encrypt_data_fast, decrypt_data_fast and crypto tests 2013-08-10 17:41:32 +01:00
slvr
7f27fcaf37 tabs -> spaces 2013-08-10 11:27:36 +01:00
slvr
8f6f8e221d networking_poll: receivepacket(&ip_port, data, &length) == -1 2013-08-10 03:02:00 +01:00
irungentoo
341de59bb6 Fixed possible bug. 2013-08-09 20:32:51 -04:00
slvr
da01bafc83 core/substrate.h wasn't supposed to be here 2013-08-10 01:08:18 +01:00
slvr
75c2dd4cb9 fixed typo: handle_ping_request -> handle_ping_response 2013-08-10 01:03:30 +01:00
slvr
951dbc1258 Updated initMessenger 2013-08-10 00:54:43 +01:00
slvr
6052b1f119 network_registerhandler 2013-08-10 00:43:50 +01:00
irungentoo
1ec95162a0 Merge pull request #413 from nurupo/master 
Cleanup of Messenger.c
 2013-08-09 16:24:39 -07:00
Maxim Biro
f0786d1fcd Returned the length check 2013-08-09 19:20:23 -04:00
Maxim Biro
0f8eea89fa Introduced data pointer and data_length 2013-08-09 17:03:37 -04:00
Maxim Biro
9dd691d106 Changed the way statusmessage is allocated 2013-08-09 17:03:30 -04:00
Maxim Biro
c6d06ae6ee Moved some checks around 2013-08-09 16:28:12 -04:00
Maxim Biro
19bbed475d Extracted repeated code into a function 2013-08-09 16:17:56 -04:00
Christian Brueffer
0b9adb1f26 Kill EOF whitespace. 2013-08-09 20:46:17 +02:00
Christian Brueffer
0b8fa72914 Fix a recurring typo in code and comments. 2013-08-09 14:01:35 +02:00
irungentoo
cd730b532a Merge pull request #403 from jin-eld/fix-friend-status-callback 
Fix typo in function name which results in missing symbol
 2013-08-08 14:15:00 -07:00
jin-eld
24bebf57d0 Fix typo in function name which results in missing symbol 2013-08-09 00:03:14 +03:00
irungentoo
5024bab930 Merge pull request #400 from JFreegman/master 
Added actions/alternative type of messages
 2013-08-08 12:40:15 -07:00
Jfreegman
8719f46645 added actions/alternate messages 2013-08-08 15:00:30 -04:00
irungentoo
9634a23437 Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere into nurupo-master 
Conflicts:
	core/Messenger.c
 2013-08-08 14:39:27 -04:00
Maxim Biro
04c974962c Made name consistent with other 'on change' callbacks 2013-08-08 13:54:16 -04:00
Maxim Biro
23f55c101d Fixed a silly code ordering mistake 2013-08-08 13:42:27 -04:00
irungentoo
1fb2085c67 Fixed dynamic memory allocation. 2013-08-08 12:13:29 -04:00
irungentoo
cd22973d48 Merge pull request #396 from lukechampine/dynamicfriends 
make friendlist resize dynamically
 2013-08-08 08:50:06 -07:00
irungentoo
a3a0fb57cb Moved a define and fixed another. 2013-08-08 10:59:22 -04:00
Luke Champine
815628b76a make friendlist resize dynamically 2013-08-08 10:49:36 -04:00
Maxim Biro
f66b6ce50b Made a callback for Friend.status change 2013-08-08 02:12:19 -04:00
stal
0e03b049d8 Reinstate semicolon 2013-08-07 22:58:39 -07:00
stal
67c2b9fffd Re-export m_callback_userstatus 2013-08-07 22:05:23 -07:00
Maxim Biro
4779561ea3 Refactored an expression 2013-08-07 20:24:06 -04:00
Maxim Biro
b6a3f2b403 Added length checks 2013-08-07 20:23:48 -04:00
Maxim Biro
f669b28a6c Merge branch 'master' of http://github.com/irungentoo/ProjectTox-Core 
Conflicts:
	core/Messenger.c
	core/Messenger.h
 2013-08-07 19:18:40 -04:00
irungentoo
4dbcfdf05d Some cosmetic improvements. 2013-08-07 18:14:35 -04:00
Maxim Biro
9801eceaa4 Separated StatusMessage from UserStatus 2013-08-07 18:12:31 -04:00
irungentoo
59f873fd68 Merge branch 'read-receipt' of https://github.com/stal888/ProjectTox-Core into pull-requests 
Conflicts:
	testing/toxic/chat.c
	testing/toxic/prompt.c
 2013-08-07 13:51:58 -04:00
Sebastian Stal
c0828667e7 Document functions, and fix bug. 2013-08-07 10:06:07 -07:00
Sebastian Stal
105e2fa4a3 Add read receipts using packet ID 65. 2013-08-07 09:53:52 -07:00
Jfreegman
90524356a7 Fixed two bugs 2013-08-07 02:34:55 -04:00
Nick ODell
eb546db56b Fix segfault when no broadcast device is found 2013-08-06 18:11:13 -06:00
Nick ODell
7ddeb2bf6d Fix bug where we could run past the end of the friends list 2013-08-06 18:11:13 -06:00
irungentoo
29773d97fc Small bug fixed. 2013-08-06 17:25:32 -04:00
irungentoo
39a213a58c Merge pull request #361 from plutooo/master 
core: Moved handle ping packets to ping.c
 2013-08-06 13:41:04 -07:00
plutooo
9e0ee5b7df core: Moved handle ping packets to ping.c 2013-08-06 13:09:14 -07:00
irungentoo
fc5a2f53df Merge branch 'master' of https://github.com/plutooo/ProjectTox-Core into plutooo-master 
Conflicts:
	core/ping.c
	core/util.c
 2013-08-06 13:53:38 -04:00
plutooo
6e610749eb core: Move ping request/response into ping.c 2013-08-06 09:42:53 -07:00
plutooo
e71413d8f1 core: Move send ping packets functions to ping.c 2013-08-06 09:21:39 -07:00
irungentoo
1daf064621 Merge branch 'plutooo-master' 2013-08-05 20:36:20 -04:00
irungentoo
524cf18954 Fixed style and is_pinging(). 2013-08-05 20:35:47 -04:00
irungentoo
109fe7bd0a Merge pull request #341 from stal888/userstatus-ext 
An extension to user statuses.
 2013-08-05 17:24:04 -07:00
irungentoo
c9a597b794 Merge branch 'master' of https://github.com/plutooo/ProjectTox-Core into plutooo-master 2013-08-05 18:48:34 -04:00
Nick ODell
84607c8937 Fix bug where friendreq_handlepacket did not do bounds checking 2013-08-05 14:54:53 -06:00
Nick ODell
9364db9eff Fix bug where handle_NATping wouldn't perform bounds checking 2013-08-05 14:46:45 -06:00
plutooo
071ac46308 core: Rewrote ping-module, better performance and cleaner code. 2013-08-05 12:51:58 -07:00
Sebastian Stal
b7f989266d Add functions for dealing with userstatus kinds. 2013-08-05 12:30:07 -07:00
Luke Champine
d1f84efdd7 temporary fix to prevent m_addfriend from segfaulting 2013-08-05 11:22:47 -04:00
Florian Hahn
5617bf0bf1 Use void for functions with no parameters 2013-08-05 15:57:17 +02:00
Maxim Biro
03a2bac319 Improved cmake 2013-08-04 22:25:07 -04:00
Maxim Biro
f03dc44e97 Fixed Windows build 2013-08-04 21:20:48 -04:00
Florian Hahn
7567e0a1c4 Make private functions in core/DHT.c static 2013-08-04 23:05:43 +02:00
Florian Hahn
c387de52b2 Make private functions in core/LAN_discovery.c static 2013-08-04 23:05:35 +02:00
Florian Hahn
2a9fedc08f Make private functions in core/Lossless_UDP.c static 2013-08-04 23:05:27 +02:00
Florian Hahn
8680cf76bf Make private functions in core/net_crypto.c static 2013-08-04 23:05:20 +02:00
Jae Kwon
158751cb2d various fixes for first time user 
* added linking to libsodium
* fixed links to docs to point to wiki
 2013-08-03 14:46:52 -07:00
irungentoo
7b84aaaac8 Merge pull request #302 from ChlorideCull/master 
Changed CMake options to compile the core as a shared library instead of static
 2013-08-03 10:14:07 -07:00
irungentoo
fb14b3eccd Fixed compatibility with original NaCl. 2013-08-03 12:45:44 -04:00
Chloride Cull
add9c0b6dc Changed CMake options to compile the core shared 
It is now compiled under 'toxcore' instead of just 'core' to be able to be installed without conflicts.
 2013-08-03 18:25:12 +02:00
plutooo
e5d2c219af DHT: added id_equal(), ipport_equal(), is_timeout() 2013-08-03 08:32:09 -07:00
irungentoo
7d7c5faa09 Merge pull request #275 from nickodell/master 
Fix bug where memcpy could overrun buffer; Replace ZEROBYTES - BOXZEROBYTES with MACBYTES
 2013-08-02 17:30:44 -07:00
irungentoo
9e5800ab10 Fixed regression. 2013-08-02 20:21:49 -04:00
Nick ODell
9c039cfd2a Replace ZEROBYTES - BOXZEROBYTES with MACBYTES 2013-08-02 16:35:41 -06:00
irungentoo
802236272f Merge branch 'Jeffail-master' 2013-08-02 16:20:26 -04:00
irungentoo
7b46b04ce7 Time is better as an unsigned variable. 2013-08-02 15:57:53 -04:00