Commit Graph

1434 Commits

Author SHA1 Message Date
Coren[m]
8ba6a5ff5b Merge remote-tracking branch 'upstream/master' into Integration 2013-09-10 23:02:21 +02:00
Coren[m]
64ca4b5db2 tox.*, DHT.*:
- 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
2013-09-10 22:59:33 +02:00
irungentoo
261d78b862 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-09-10 16:33:26 -04:00
irungentoo
23d8d26d50 Commented out useless function. 2013-09-10 16:22:47 -04:00
Coren[m]
e89dda5cea DHT.c:
- 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
2013-09-10 21:36:58 +02:00
Coren[m]
5ed6fd04be Merge remote-tracking branch 'upstream/master' into Integration 2013-09-10 20:57:10 +02:00
Coren[m]
3ae7460853 util.*:
- 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)
2013-09-10 20:55:05 +02:00
Coren[m]
f267266bf6 fix: bad memset length in ip_init() 2013-09-10 17:38:53 +02:00
Coren[m]
bcb283cf45 big push, putting all the infrastructure in place behind TOX_ENABLE_IPV6 2013-09-10 16:36:20 +02:00
irungentoo
9e80dd71ca Merge pull request #567 from kigu/patch-2
Update TODO
2013-09-10 04:44:35 -07:00
Coren[m]
bcf251ac31 group_chats.c:
- *->net->sock to *->net (like everywhere else :))
2013-09-09 21:37:07 +02:00
Coren[m]
b91b87f285 Merge branch 'master' into Integration 2013-09-09 21:31:11 +02:00
Coren[m]
447fdc74ec Merge branch 'Integration' of https://github.com/FullName/ProjectTox-Core into Integration 2013-09-09 21:07:25 +02:00
Coren[m]
05d7b157c6 tox.*, Messenger.*:
- initialisation: argument added to enable/disable ipv6 as socket

Messenger_test.c:
- initialisation: ipv4 hardcoded for now
- delegating IP resolution to DHT_bootstrap_ex()
2013-09-09 21:03:31 +02:00
irungentoo
1f5bfab327 Start of group chats integration into the core. 2013-09-09 14:44:43 -04:00
irungentoo
c137ec9d4d move group chats to /toxcore 2013-09-09 14:16:53 -04:00
Coren[m]
f932fd400c tox.*, Messenger.*:
- initialisation: argument added to enable/disable ipv6 as socket

Messenger_test.c:
- initialisation: ipv4 hardcoded for now
- delegating IP resolution to DHT_bootstrap_ex()
2013-09-09 20:14:24 +02:00
irungentoo
00c9c8ab57 More stuff done in group chats. 2013-09-09 13:52:03 -04:00
Coren[m]
a77253c79b tox.*, DHT.*;
- 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
2013-09-09 19:17:21 +02:00
Coren[m]
9a8dc575b7 - added missing include (autobuild warning) 2013-09-09 16:35:39 +02:00
Coren[m]
9439d296f1 caught by autobuild, missing net->sock to net change 2013-09-09 16:27:24 +02:00
Coren[m]
dbd75e903e network.*:
- IPAny_Port: analogous to IP_Port
- ipport_equal: moved from DHT.c and adapted

DHTc.:
- ipport_equal renamed to ip4port_equal
2013-09-09 16:12:50 +02:00
Coren[m]
291fa8d5c5 fix autobuild (not built locally) 2013-09-09 16:11:33 +02:00
Alexander Huffman
0ef7daaa25 Update TODO 2013-09-09 11:01:04 -03:00
Coren[m]
180322293c network.h:
- added ipany_ntoa()

network.c:
- added ipany_ntoa()
- fixed formatting
2013-09-09 15:32:05 +02:00
Coren[m]
55214aa041 network.*:
- 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
2013-09-09 14:53:27 +02:00
Coren[m]
29d777ef67 network.h:
- IP: add in_addr_t as part of the union
- IP: rename IP to IP4
2013-09-09 14:16:40 +02:00
Coren[m]
a128e3ff8f network.h:
- global: added sock_t
- Networking_Core: added family (currently always AF_INET) and port
- sendpacket(): changed signature to require (Networking_Core *) instead of sock_t

*.c:
- sendpacket()-calls: replaced *->net->sock with *->net
2013-09-09 13:56:03 +02:00
irungentoo
7722d420e7 Merge pull request #565 from JFreegman/master
initialize name_length
2013-09-09 04:49:56 -07:00
Jfreegman
7e84ba4606 wrong type 2013-09-09 07:14:47 -04:00
Jfreegman
5a1897162b a better way 2013-09-09 07:11:30 -04:00
Jfreegman
3853a30acf initialize name_length 2013-09-09 06:41:33 -04:00
irungentoo
0d41d7f9c0 Messaging now works in group chats. 2013-09-08 20:48:52 -04:00
irungentoo
2e33ffeb8c Updated README. 2013-09-08 16:08:33 -04:00
irungentoo
49dd40797c Merge pull request #564 from nurupo/friendstatus-patch
Removed friendstatus from client-side API, replacing it with alternative functions
2013-09-07 14:27:58 -07:00
Maxim Biro
f7e14e5c6f Modified test 2013-09-07 16:05:48 -04:00
Maxim Biro
f5bf852400 Removed friendstatus from client API 2013-09-07 16:05:16 -04:00
irungentoo
eeec99723c Merge pull request #563 from kigu/patch-1
Update TODO
2013-09-07 11:30:09 -07:00
Alexander Huffman
1d75ed7342 Update TODO 2013-09-07 15:19:28 -03:00
irungentoo
220fb72121 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-09-07 13:28:33 -04:00
irungentoo
bdf31fc6b5 Added TODO list and made m_copy*_statusmessage functions return length of copied buffer on success. 2013-09-07 13:27:44 -04:00
irungentoo
4444494b65 Merge pull request #562 from jin-eld/nacl
Allow to build vs nacl instead of libsodium
2013-09-06 14:09:47 -07:00
Jin^eLD
e092eee869 Allow to build vs nacl instead of libsodium
By default libsodium is used. Only if --enable-nacl is specified, then
nacl will be used instead of libsodium.

Pass locations of nacl headers and libraries by using the following
options:

--with-nacl-headers=/home/me/somewhere/nacl-20110221/build/469/include/amd64/
--with-nacl-libs=/home/me/somewhere/nacl-20110221/build/469/lib/amd64/
2013-09-06 22:54:45 +03:00
irungentoo
64570a1b12 Fixed autotest, increased MAX_STATUSMESSAGE_LENGTH. 2013-09-06 09:56:56 -04:00
irungentoo
7ecd809a59 Added name lengths to friend names. 2013-09-06 09:45:39 -04:00
irungentoo
bb35305d94 Merge branch 'group-chats' 2013-09-05 17:02:23 -04:00
irungentoo
cc8a536cb0 Base of group chats seems to be working now. 2013-09-05 17:00:41 -04:00
irungentoo
c78b2352ab Merge pull request #559 from jin-eld/friendlist
Function for retreiving a list of friend numbers
2013-09-04 15:37:13 -07:00
Jin^eLD
b9455efd84 Function for retreiving a list of friend numbers
This should allow clients to sync the Tox friend list with their UI/etc.
lists.
2013-09-05 01:30:28 +03:00
irungentoo
efea6b9e82 Possibly fixed LAN discovery on some configurations. 2013-09-04 15:14:11 -04:00