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
irungentoo
f9bfb42504
Merge pull request #439 from Alek900/master
...
Added support for userdata in callbacks
2013-08-12 13:33:20 -07:00
irungentoo
107e4b8a5e
Merge pull request #437 from JFreegman/master
...
make connection more robust for toxic
2013-08-12 08:13:33 -07: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
irungentoo
33e104f32f
Merge pull request #438 from mkfifo/master
...
Messenger refactor - redid work from pull request 79
2013-08-12 03:39:18 -07:00
Jfreegman
d87b79d368
a little overkill
2013-08-12 05:59:08 -04: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
Jfreegman
46209d958f
make connection more robust
2013-08-12 03:10:47 -04:00
irungentoo
139d915482
Merge pull request #436 from Alek900/master
...
Send our current status and name to friend that just came online.
2013-08-11 14:48:36 -07: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
irungentoo
b5d6c22b7b
Merge pull request #435 from nurupo/master
...
Fixes of my previous pull request
2013-08-11 13:59:56 -07: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
irungentoo
7f3cbfdc2f
Merge pull request #434 from nurupo/master
...
Replaced friendstatus with connectionstatus
2013-08-11 13:44:20 -07:00
Maxim Biro
eaa7d3e0a0
Replaced friendstatus with connectionstatus
2013-08-11 14:57:47 -04:00
irungentoo
f377567b5d
Merge pull request #433 from nurupo/master
...
Fixed warnings on Windows
2013-08-11 11:29:27 -07:00
Maxim Biro
440871bda1
Fixed warnings on Windows
2013-08-11 14:17:02 -04:00
irungentoo
c009245118
Merge pull request #432 from stal888/patch-2
...
Update readme to reflect site repo move
2013-08-11 09:47:05 -07:00
stal
d741c49db7
How did I manage to fuck this up?
2013-08-11 09:39:10 -07:00
stal
48e32e875e
Update readme to reflect site repo move
2013-08-11 09:38:13 -07:00
irungentoo
1170fe153c
Merge pull request #431 from leeroy2098/merge
...
Fix a possible memory leak
2013-08-11 09:11:39 -07:00
Simon Levermann
a34403e33b
Fix a possible memory leak
2013-08-11 17:51:10 +02:00
irungentoo
c0d5fe9b5b
Merge pull request #423 from JFreegman/master
...
Auto-connect toxic to DHT on startup
2013-08-11 07:40:07 -07: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
Jfreegman
2c2d608e29
potential seg fault
2013-08-11 00:55:09 -04:00
irungentoo
e5e5ec6f57
Merge pull request #425 from lukechampine/betterprompt
...
fix toxic argument handling
2013-08-10 18:28:12 -07:00
lukechampine
1139ca57a5
make argument handling (esp. of strings) more robust
2013-08-10 20:10:03 -04: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
Jfreegman
56df7e556e
was making the ID change on every startup
2013-08-10 18:00:54 -04:00
irungentoo
6c2b2806d1
Merge pull request #415 from slvr/pr
...
Beginning to centralise packet handling
2013-08-10 14:21:06 -07:00
Jfreegman
401cbeff37
fix memory leak
2013-08-10 16:28:40 -04:00
Jfreegman
216efc91a5
don't need that
2013-08-10 15:50:49 -04:00
Jfreegman
2694fc8d13
auto-connect to DHT on startup
2013-08-10 15:46:29 -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
acca5c8e8f
Added crypto_speed_test
2013-08-10 18:06:51 +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
