Commit Graph

1507 Commits

Author SHA1 Message Date
irungentoo
c43ad78ce7 Merge pull request #601 from maksqwe/master
Fix typo. "if (yesno != 0 || yesno != 1)" always true
2013-09-22 13:16:16 -07:00
Maks
f4163e324b Fix typo. "if (yesno != 0 || yesno != 1)" always true 2013-09-22 22:36:45 +03:00
irungentoo
bb6566e436 Astyled network.c 2013-09-22 14:37:04 -04:00
irungentoo
ed0071bcbc Merge branch 'win_inetpton' of https://github.com/BtbN/ProjectTox-Core 2013-09-22 14:29:37 -04:00
BtbN
a7eb9b2c34 Fix inet_pton/ntop on win32 2013-09-22 20:26:39 +02:00
irungentoo
757c958132 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-09-22 14:26:24 -04:00
irungentoo
0d54a675ec Removed unused variables. 2013-09-22 14:25:52 -04:00
irungentoo
ba169b7c21 Keep the code consistent. 2013-09-22 14:24:38 -04:00
irungentoo
8b5d9dc13e Merge branch 'patch-9001' of https://github.com/stal888/ProjectTox-Core into stal888-patch-9001 2013-09-22 14:14:53 -04:00
irungentoo
115cb8af02 Merge pull request #600 from Jman012/master
Fixed a bug or two.
2013-09-22 10:53:00 -07:00
irungentoo
64150f4bde Merge pull request #590 from FullName/ipv6.yield50%toipv4
reserve half of client lists for ipv4 (take #2)
2013-09-22 09:17:16 -07:00
irungentoo
83c6e9dd35 Fixed the connection bug and cleaned up some stuff. 2013-09-22 11:08:23 -04:00
Jman012
bb0cd7da0c Fixed a bug or two.
Added breaks on the new packet handlers in doFriends for the switch statement, and added a default.
2013-09-21 23:50:14 -07:00
irungentoo
1cc47101fe Fix bug. 2013-09-21 23:15:40 -04:00
irungentoo
05477f77d3 Fixed bug. 2013-09-21 22:57:28 -04:00
irungentoo
e36f6c46d1 Fixed bug. 2013-09-21 19:27:53 -04:00
Sebastian Stal
cb68be00b0 Change tox_get_friendlist API.
tox_get_friendlist() -> tox_copy_friendlist().
You now have to allocate your own memory to pass into tox_copy_friendlist.
To help with this, tox_count_friendlist() has been added to get the length
of the friend list.
2013-09-21 14:47:30 -07:00
irungentoo
a6abf007cb Connection speed ups. 2013-09-21 09:33:44 -04:00
irungentoo
3e4599e33a Lossless UDP is now suitable for sending files.
Added some actual flow control and made send/recieve buffers grow when
necessary.
2013-09-21 09:03:54 -04:00
irungentoo
112c8dadf9 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-09-21 08:55:14 -04:00
irungentoo
a07162bf92 Merge pull request #595 from FullName/MessengerLoadSave
Thou shalt not take singular commands after an if into #ifdef DEBUG...
2013-09-21 04:24:40 -07:00
Coren[m]
f56a8529a3 Thou shalt not take singular commands after an if into #ifdef DEBUG...
toxcore/Messenger.c:
- Messenger_load_old(): brackets around an #ifdef'ed line to avoid data pointer being only pushed forward properly in the error case
2013-09-21 10:07:16 +02:00
irungentoo
63126241eb Small fix in Lossless UDP. 2013-09-20 22:13:59 -04:00
Coren[m]
4e76ca432f honor the claim of sort_list(), that the result is in anti-intuitive order, and treat element zero as the furthest 2013-09-21 03:13:44 +02:00
irungentoo
892c7aa266 Merge pull request #594 from FullName/nTox.KeepBootstrappingUntilConnected
nTox: keep bootstrap()ping every 10 seconds, until we get a connection...
2013-09-20 17:28:46 -07:00
Coren[m]
330c1bee5c nTox: keep bootstrap()ping every 10 seconds, until we get a connection running (the initial one might get lost, it IS done via UDP after all)
nTox.c:
- main(): keep calling tox_bootstrap_from_address() every 10 seconds, until the connection is established
2013-09-21 02:02:27 +02:00
Coren[m]
89005f1701 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core.git into ipv6.yield50%toipv4 2013-09-21 01:27:53 +02:00
irungentoo
01ec9d6e7b Merge pull request #593 from BtbN/win_fixes
Fix compilation on windows for ipv6 code
2013-09-20 16:27:24 -07:00
Coren[m]
13bd6aab18 reserving 50%+ for ipv4, take 2
DHT.c:
- we have to actually count the number of addresses in the field, because sort_list() will move the stuff around
- improved replace_good() substantially by throwing away the "furthest" client_id, not the one just a bit worse than the new one (but better than all the later ones in the field!)
2013-09-21 01:22:42 +02:00
BtbN
b9306d6d06 Fix compilation on windows for ipv6 code 2013-09-21 01:10:23 +02:00
irungentoo
20b6900fb1 Fixed bug. 2013-09-20 11:33:53 -04:00
irungentoo
53397f6077 Small fix in Lossless UDP. 2013-09-20 10:02:16 -04:00
irungentoo
524af7ef07 Increased the size of the UDP buffers. 2013-09-20 08:25:01 -04:00
irungentoo
7e5da03637 Fixed bug in Lossless UDP. 2013-09-19 10:18:43 -04:00
irungentoo
993554bdf6 Fixed bug in Lossless UDP. 2013-09-19 09:46:55 -04:00
Coren[m]
f10c94a17a reserve lower half of client lists for ipv4 for now
also rename client_in_list() to client_or_ip_port_in_list(), it also checks for an identical ip/port and replaces the client_id, recycling the entry

DHT.c:
- rename client_in_list() to client_or_ip_port_in_list()
- replace_bad(), replace_good(): if IPv6, only insert into the upper half of the given list
- addto_lists(): convert ipv4-in-ipv6 mapped to ipv4
2013-09-19 11:06:04 +02:00
irungentoo
e2e2719439 Merge pull request #588 from FullName/LoggingPreInitStoring
Allow loginit() to be delayed, store loglog() data in intermediate buffer...
2013-09-18 15:44:25 -07:00
irungentoo
d2b9b059ba Forgot an else. 2013-09-18 11:19:32 -04:00
irungentoo
1a9ee5c95f Fixed bad code in nTox. 2013-09-18 11:11:10 -04:00
Coren[m]
88e80dc88f Allow loginit() to be delayed, store loglog() data in intermediate buffer and flush it out when loginit() is called
util.c:
- handle loglog() before loginit() by storing the lines into an expanding buffer
- when loginit() is called, write out and kill the buffer

network.c:
- push loginit() to the point where we know the actually used port
2013-09-18 16:25:55 +02:00
irungentoo
7c5b98397a Merge branch 'group-chat' 2013-09-17 20:06:33 -04:00
irungentoo
5a83c1296c astyled everything. 2013-09-17 16:28:39 -04:00
irungentoo
9ce1828fac Merge pull request #585 from JFreegman/master
numchats needs to be decremented
2013-09-17 04:34:51 -07:00
Jfreegman
d4e135d763 numchats needs to be decremented 2013-09-17 06:52:02 -04:00
irungentoo
dd12d464de Functions to get name of peer in group chat added.
Group message callback modified.
2013-09-16 20:59:53 -04:00
irungentoo
0b7479e758 Merge pull request #583 from FullName/TestCryptoSlow
Make test "endtoend" pass on 'slow' systems
2013-09-16 17:09:59 -07:00
irungentoo
d0168f473e Merge pull request #584 from FullName/MessengerLoadSave
Tests of state loading/saving lead to two fixes for DHT.c and util.c
2013-09-16 17:09:32 -07:00
Coren[m]
aa71dea96d Merge remote-tracking branch 'upstream/master' into MessengerLoadSave 2013-09-17 01:15:57 +02:00
Coren[m]
1c57a3a3de Tests of state loading/saving lead to two fixes for DHT.c and util.c
util.c:
- fix in empty section at the end of the state, showed as bug when having an empty name

DHT.c:
- fix in saving less data than originally announced, showed as bug when not having reached any clients ever (no clients or only with timestamp of zero)
2013-09-17 01:08:57 +02:00
Coren[m]
0de40d01cb Make test "endtoend" pass on 'slow' systems
auto_test/crypto_test.c:
- test "endtoend": increased timeout from default ~5s to 15s, making it pass on slower systems
- signed/unsiged warning fixed by cast
2013-09-16 23:02:38 +02:00