Commit Graph

1533 Commits

Author SHA1 Message Date
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
irungentoo
67da01fb06 Fixed build. 2013-09-16 16:18:35 -04:00
irungentoo
1d2f4465bf Toxcore should never print anything when built normally. 2013-09-16 11:22:01 -04:00
irungentoo
98fb06c1b7 Merge pull request #576 from FullName/MessengerLoadSave
State loading/saving: Instead of a blob, segment into sections marked with tags.
2013-09-16 08:11:56 -07:00
irungentoo
d17249a65d Merge pull request #582 from FullName/UnWallWextra
Fix warnings of -Wall -Wextra
2013-09-16 05:42:07 -07:00
Coren[m]
ab2805a23b Fix warnings of -Wall -Wextra 2013-09-16 10:37:22 +02:00
Coren[m]
a069f67ab3 additional length >= size checks
Messenger.c:
- additional size checks
- removed one pointless copying of data, instead using it directly

util.c:
- lost a newline vs. master
2013-09-16 09:40:47 +02:00
Coren[m]
57d10f0a80 Merge remote-tracking branch 'upstream/master' into MessengerLoadSave
Conflicts:
	toxcore/Messenger.c
	toxcore/util.c
	toxcore/util.h
2013-09-16 09:29:08 +02:00
irungentoo
7a69f2de28 Merge pull request #577 from FullName/nTox
nTox: Save data on friend operations/exit
2013-09-15 15:58:18 -07:00
irungentoo
b6377dfd25 Merge pull request #580 from FullName/networking_test
Fix in ip_equal, plus testing code which led to that fix...
2013-09-15 15:53:34 -07:00
Coren[m]
ee1cc34d55 Fix in ip_equal, plus testing code which led to that fix...
network.c:
- use the correct macro for IPv4-in-IPv6 test

network_test.c:
- bunch of tests for addr_resolve() and ip_equal()
2013-09-15 23:39:09 +02:00
irungentoo
6bb9f94ff1 Merge pull request #581 from stal888/csafixes
Fix leaks and null dereferences in net_crypto
2013-09-15 11:45:12 -07:00
Sebastian Stal
96d39de223 Fix leaks and null dereferences in net_crypto 2013-09-15 10:48:16 -07:00
Coren[m]
6d3ac937af Merge remote-tracking branch 'upstream/master' into nTox 2013-09-15 19:07:54 +02:00
irungentoo
decdb7aa8c more portability fixes. 2013-09-15 10:17:09 -04:00
irungentoo
bbeb6e15cd Fixed portability problems. 2013-09-15 09:47:17 -04:00
irungentoo
43b609d41c Fixed merge problems. 2013-09-15 09:35:46 -04:00
irungentoo
fca574a0e0 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-09-15 09:31:46 -04:00
irungentoo
8c41244627 Fixed portablity problems.
struct in6_addr member names can differ per platform.
2013-09-15 09:31:27 -04:00
irungentoo
f447027d9d Merge pull request #579 from FullName/Integration
IPv6: post-integration fixes
2013-09-15 05:06:55 -07:00
Coren[m]
16a6c9fb59 Merge remote-tracking branch 'upstream/master' into Integration 2013-09-15 08:54:14 +02:00
Coren[m]
1e1782a952 ip_equal(): handle embedded v4 vs. native v4 as equal
network.c:
- ip_equal(): on IPv4 vs. IPv6, check if the IPv6 is an embedded IPv4 and if true, compare that
2013-09-15 08:33:09 +02:00
Coren[m]
2092b5d936 addr_resolve() rewrite broke { (ipv6enabled == true) name => IPv4 address }
network.c:
- addr_resolve(): save AF_UNSPEC ip4 address into ip4, not into to->ip4
2013-09-15 08:20:37 +02:00
irungentoo
dde98eb345 DHT peer finding for new friends should now be slightly faster.
Also fixed the "[i] could not send message" bug in nTox.
2013-09-14 20:38:48 -04:00
irungentoo
20a8fb8a23 Fixed warnings. 2013-09-14 19:15:26 -04:00