Age | Commit message (Collapse) | Author |
|
- LAN_ip(): use standard macro from IPv4-in-IPv6 test
|
|
- get_close_nodes()/sendnodes()/sendnodes_ipv6(): when selecting for SEND_NODES/SEND_NODES_IPV6, treat embedded IPv4-in-IPv6 addresses as being IPv4
Messenger.c:
- added a named constant for sixty seconds friend/client dump
- fix logging to convert client_id to printable before printing
|
|
65536) friends...
|
|
|
|
|
|
Primary rationale: The part that DHT saves changes if IP is expanded to IPv6. To let people keep their friends/name, change the datafile format now, while everybody is still on the same page.
Loading/Saving rewritten to allow a part of the file to be incomprehensible to the loading routine.
Added a magic cookie at the beginning to mark the file as tox's.
Changes in some part of the datafile can be skipped and the remaining parts still be consumed.
Allows a wide margin of forward compatibility (like the IP to IPv6 transition, but also e.g. a change in the key format).
As long as the file is not completely garbled, the routine will read as much as possible. Only the KEY section is considered mandatory: a malformed key section leads to a negative result.
util.*:
- holds the driving function which jumps from section to section and calls back with section length and tag (type)
Messenger.c,DHT.*:
- new loading functions call the util-function with a callback, which subsequently consumes the sections
- old routines are kept to fall back onto if the magic cookie at the beginning isn't present
- saving is still done in one local routine
|
|
Nonces don't need to be random, only different.
also random_int now gives same quality random numbers for both NaCl and
libsodium.
|
|
|
|
messages.
|
|
Group chats are not complete, they seem to work very well though.
This means that the functions will change.
|
|
|
|
Please wait until the tox.h API is updated before integrating it into
your clients.
nTox:
/g
creates a new group chat
/i friendnum groupnum
invite friendnum to groupnum
/z groupnum message
send message to groupnum
NOTE: group chats currenly might not handle packet loss well if there are less than 6 participants.
|
|
Conflicts resolved:
toxcore/Messenger.c
toxcore/network.h
|
|
Conflicts:
toxcore/Messenger.c
|
|
This patch inserts LAN discovery in DHT_bootstrap, allowing it to find clients even if it's run parameterless (and clients don't connect to it directly, e.g. because the port is already bound to a different client).
- moves the #define of LAN_DISCOVERY_INTERVAL from Messenger.c to LAN_discovery.h
- includes LAN_discovery.h into DHT_bootstrap.c
- DHT_bootstrap.c sends and accepts LAN_discovery packets
|
|
- addr_resolv(_or_parse_ip)(): added an optional parameter to return both an IPv6 and an IPv4 address if requested address family was AF_UNSPEC
- logging of unhandled packets
DHT.c:
- bootstrap_from_address(): use the additional return from addr_resolv_or_parse_ip() to bootstrap in both network types at once
Lossless_UDP_testclient.c:
- main(): adapt to signature change of addr_resolve()
Messenger.c. LAN_discovery.h:
- lost a htons(), readded
- moved LAN_DISCOVERY_INTERVAL #define into LAN_discovery.h
LAN_discovery.c:
- added IPv4-in-IPv6 local address test
|
|
- remove local PORT definition in favor of TOX_PORT_DEFAULT
|
|
- #define'd tox's network port (as range)
- finally killed tox_new_ex() in favor of changing tox_new()'s signature
- renamed tox_bootstrap() to tox_bootstrap_from_ip()
network.h:
- #define'd tox's network port (as range)
- renamed SEND_NODES_EX to SEND_NODES_IPV6
- bind() loop uses #define'd port range
DHT.c:
- renamed SEND_NODES_EX to SEND_NODES_IPV6
- sending ipv6 node addresses even if can't use them ourselves
nTox.c:
- adapted to changed tox_new()
|
|
|
|
|
|
- removed almost unused variable without further use
|
|
- unbroke Messenger_load(): lost a length adjustment
- addeditional check for enough data available
|
|
- tox_bootstrap_ex(), DHT_bootstrap_ex() renamed to tox_bootstrap_from_address(), DHT_bootstrap_from_address()
- (handle_)sendnodes_ex() renamed to (handle_)sendnodes_ipv6()
- only sending sendnodes_ipv6() if we're actually IPv6 enabled
- changed comments to conform better
nTox.c, Messenger_text.c, DHT_test.c, DHT_bootstrap.c:
- fallout from *_ex() to *_from_address()
DHT_bootstrap.c:
- corrected a potentially wrong info message
util.c:
- fixed logfile name: now (funcptr) => now() (number)
network.c:
- addead comment about the necessity of bind() to succeed
auto_test/messenger_test.c:
- defaulting ipv6enabled to TOX_ENABLE_IPV6_DEFAULT
LAN_discovery.c:
- slight cleanup and comments for clarity
|
|
|
|
- undo "fixing" the wrong variable
- fix the logging in receivepacket()
|
|
- moved cmdline_parsefor_ipv46() to testing/misc_tools.c
|
|
|
|
LAN_discovery.c: IPv6: send both v6 multicast and v4 broadcast if socket allows
|
|
- add missing includes (autobuild warnings)
|
|
- reset errno from failed bind() calls if the last one succeeds
DHT_bootstrap.c:
- move the perror() output next to where it belongs to
|
|
|
|
|
|
|
|
- return to the caller if the string could be resolved into an IP
other/DHT_bootstrap.c, testing/*_test.c, testing/nTox.c:
- parse cmdline for --ipv4/--ipv6 switch to allow user a choice
util.h:
- proper old-style C-comment
|
|
- client_in_list: split loop in two to avoid inserting a client_id duplicate
- final pieces for IPv6 expansion: (handle_)sendnodes_ex(), called from hande_getnodes() resp. handler callback
|
|
- added logging functions, default off
tox.h:
- added includes for sockaddr_in/6
network.c:
- added logging functions, default off (#define in util.h)
- IPv6: activating site-local all-nodes multicast address (i.e. IPv6 equivalent of broadcast)
|
|
|
|
|
|
- *->net->sock to *->net (like everywhere else :))
|
|
|
|
- initialisation: argument added to enable/disable ipv6 as socket
Messenger_test.c:
- initialisation: ipv4 hardcoded for now
- delegating IP resolution to DHT_bootstrap_ex()
|
|
|
|
|
|
- second set of *_bootstrap_ex() functions to allow addresses instead of IPs
network.h:
- new message ID for sending/receiving IPv6 nodes
DHT.*:
- get_close_nodes():
- additional parameter to select which kind of nodes: IPv4 or IPv6
- sendnodes()/handle_sendnodes():
- the IPv4 message must remain intact even when the Node_format structure (which embeds IP_Port) is expanded
- added Node4_format to keep the structure "alive"
- copying in/out of wider to smaller format required in sendnodes()/handle_sendnodes()
- switch of Node_format from Node4_format to Node46_format by define
|
|
|
|
|
|
- IPAny_Port: analogous to IP_Port
- ipport_equal: moved from DHT.c and adapted
DHTc.:
- ipport_equal renamed to ip4port_equal
|
|
- added ipany_ntoa()
network.c:
- added ipany_ntoa()
- fixed formatting
|
|
- IP4: changed in_addr_t to struct in_addr for compatibility reasons
- IP6: added
- IPAny: added
- addr_resolve_or_parse_ip(): converts a string into an IPAny
|
|
- IP: add in_addr_t as part of the union
- IP: rename IP to IP4
|