Commit Graph

1771 Commits

Author SHA1 Message Date
irungentoo
7cd43ecc76 Merge branch 'master' into harden 2013-12-06 22:51:17 -05:00
irungentoo
4207b73ca9 Merge pull request #674 from FullName/RFC6598
Shared address space for stacking NAT (CGN) is LAN.
2013-12-05 16:43:03 -08:00
irungentoo
45785ffed0 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-12-05 19:40:32 -05:00
irungentoo
2aae893b6d All nodes returned must be good. 2013-12-05 19:28:13 -05:00
irungentoo
245a1511e6 Added a assoc test.
Changed default assoc so that it behaves correctly.
2013-12-05 19:25:56 -05:00
Coren[m]
c764fc16be
Shared address space for stacking NAT (CGN) is, just like 'regular' private address space, LAN. 2013-12-05 20:47:03 +01:00
irungentoo
3d2707748c Merge branch 'sendnodes-with-assoc' of https://github.com/FullName/ProjectTox-Core into FullName-sendnodes-with-assoc 2013-12-05 12:34:14 -05:00
irungentoo
94df395fab Merge pull request #671 from palistov/do-friends-cleanup
Clean up do_friends function
2013-12-04 14:55:25 -08:00
Paul Holden
bfce8a9d21 Messenger: Fix compile issue with check_friend_request_timed_out 2013-12-04 11:48:27 -08:00
irungentoo
e6a1754053 Merge pull request #672 from alexandervdm/master
fix naming inconsistency in tox.h
2013-12-03 14:59:49 -08:00
Coren[m]
110a8e889c
get_close_nodes(): make use of assoc to find some really close nodes
DHT.c:
- get_close_nodes(): use assoc to find nodes for the requested reference id
- handle_sendnodes*(): set a proper timestamp for "heard" nodes

assoc.*:
- expand Assoc_close_entries by flags for additional restrictions for search
- Assoc_get_close_entries(): honor the new flags
- new_Assoc() prime handling: min. prime is now 5 instead of 3, and up to 25 is handled directly
- Assoc_status(): added address family for seen/heard, print of hash is now fixed width
2013-12-03 22:36:02 +01:00
alexandervdm
3f2d815fab fix naming inconsistency in tox.h 2013-12-03 14:54:46 +01:00
irungentoo
632e692577 Merge pull request #670 from FullName/log-match-m_friend-and-dht_friend
Logging: Messenger's "Friend" and DHT's "DHT_Friend" don't necessarily use the same indices.
2013-12-02 11:23:45 -08:00
irungentoo
b3d55442b6 Don't hole punch when we are connected. 2013-12-02 13:07:11 -05:00
irungentoo
d87a13ce94 Fixed bug with hole punching. 2013-12-02 12:41:56 -05:00
Coren[m]
222a28e068
Logging: Messenger's "Friend" and DHT's "DHT_Friend" don't necessarily use the same indices.
Match the indices beforehand and then log the matched up data.
Also log unmatched "DHT_Friend"s minimally.
2013-12-02 18:21:02 +01:00
irungentoo
b6a5aa38c6 Merge pull request #669 from alexandervdm/master
fix 'typedef redefinition' build errors on older gcc versions
2013-12-02 07:03:27 -08:00
Paul Holden
c00970eaf7 Messenger: New function to check & handle timed-out friend requests 2013-12-02 03:31:48 -08:00
alexandervdm
a93d76a958 fix 'typedef redefinition' build errors on older gcc versions
building toxcore
2013-12-01 21:06:20 +01:00
irungentoo
3c16b0c035 Tweaked hole punching a bit. 2013-12-01 09:47:27 -05:00
irungentoo
fcc1463fe1 The stuff in do_DHT only need to be run once per second.
Should lower CPU usage by a bit.
2013-11-30 21:52:50 -05:00
irungentoo
2a75abb494 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-11-29 12:58:41 -05:00
irungentoo
5e4f3ce07f Add sodium_init() function to startup. 2013-11-29 12:57:31 -05:00
irungentoo
c8985d9d47 Merge pull request #668 from aitjcize/api-name
Fix API name consistency.
2013-11-29 07:47:09 -08:00
AZ Huang
2cb7f24132 Fix typo. 2013-11-29 23:38:06 +08:00
AZ Huang
8419d3469a Fix API name consistency. 2013-11-29 23:12:07 +08:00
irungentoo
6e691a3c34 Fixed possible issue. 2013-11-29 10:03:05 -05:00
irungentoo
4eeca8971f Merge pull request #667 from aitjcize/ret-code-inconsistency
Fix return code inconsistency.
2013-11-29 07:03:08 -08:00
AZ Huang
1df2d5880d Should return 0 for tox_file_dataremaining since it returns unsigned 2013-11-29 22:26:29 +08:00
AZ Huang
eec31edb1c Fix return code inconsistency. 2013-11-29 18:26:09 +08:00
irungentoo
3d5a1d9618 Merge pull request #666 from FullName/nTox-various
Various changes to nTox including a potential crash (also possible from remote!)...
2013-11-27 17:43:51 -08:00
irungentoo
8dd33bb306 30 seconds is way too long. 2013-11-27 16:48:48 -05:00
irungentoo
82c60d6f34 Fixed ghost peer problem. 2013-11-27 16:41:07 -05:00
Coren[m]
26fef7cf9a
Various changes to nTox including a potential crash (also possible from remote!), and a tiny change to toxcore.
Crash stuff:

nTox.c:
- do_refresh(): avoid crashes (input a "%" and the client goes "boom!", send someone a string with embedded "%" and see him blow up...)

Other stuff:

toxcore: tox.h (doc.)/network.c (code):
- networking_wait_prepare(): return -1 if lenptr was NULL and therefore not settable

nTox.c:
- fraddr_to_str(): function to convert a TOX_FRIEND_ADDRESS into a segmented (and therefore line-breakable) string
- print_friendlist(): print index of friend on name line, print id on 2nd line
- command /f: skip spaces (and +) inside a friend id
- command /r (new): "/r #" to remove a friend
- main(): reduce cpu consumption if we're not currently sending files
2013-11-27 21:00:23 +01:00
irungentoo
74b13a9fcf Friend requests from friends are now discarded. 2013-11-27 14:18:39 -05:00
irungentoo
3fe7e08791 Merge pull request #665 from FullName/peerdel-ntox-feedback
Print a more detailed message on CHAT_CHANGE_PEER_DEL, so a user isn't confounded...
2013-11-26 17:20:13 -08:00
Coren[m]
a204b95c51
Print a more detailed message on CHAT_CHANGE_PEER_DEL, so a user isn't confounded by the change of peer numbers.
On deleting the last peer, it's just a delete.
On deleting any other peer, the last peer is moved into that space, gaining a different number.
Print that detail where appropriate.
2013-11-26 18:55:11 +01:00
irungentoo
bc06c7b2b0 Behaviour changes for the group chat callback. 2013-11-25 19:45:04 -05:00
irungentoo
2967b67b7f Merge pull request #663 from FullName/peerchange-detail
group_namelistchange(): for gui reasons, divulge peernumber and change type
2013-11-25 11:23:52 -08:00
Coren[m]
0b0848d9ac
setnick(): don't callback when an identical nickname is set again 2013-11-25 19:18:40 +01:00
Coren[m]
56079c92c3 Mimic more exactly what delpeer() does in the callback.
If the deleted peer wasn't last, send a name-change update for the overwritten peer.
2013-11-25 19:01:13 +01:00
irungentoo
6374093254 Fixed possible build problem. 2013-11-24 15:26:10 -05:00
Coren[m]
e85e9dbb99
group_namelistchange(): for ui reasons, divulge the peernumber and the nature of the change (add, del, name change).
tox.*, Messenger.*, group_chats.*:
- expand interface of callback by peernumber/change

groupchats.c:
- call callback in addpeer/delpeer/setnick with peernumber and flag

nTox.c:
- print_groupchatpeers(): print as many names on a line as possible, not one peer per line
- print_groupnamelistchange(): only print the change, if possible (i.e. "new peer", "peer's new name")
- added command "/p" to print the list of peers
2013-11-24 21:12:26 +01:00
irungentoo
0a84c61c39 Fixed bug with group chats. 2013-11-24 14:35:47 -05:00
irungentoo
2b94408adc Kill_messenger now kills group chats. 2013-11-23 22:17:36 -05:00
irungentoo
f21a9a7666 Added callback that tells you when the peer name list of a group chat changes. 2013-11-23 17:19:02 -05:00
irungentoo
d2b56faded Added function to get the number of peers and list of names for group chats. 2013-11-22 23:31:55 -05:00
irungentoo
2079cbc2db Speed up group chat bootstrapping by a bit. 2013-11-21 19:33:02 -05:00
irungentoo
ee3f91a802 Group chat peers now tell others when they quit.
Also increased ping timeout.
2013-11-21 19:23:12 -05:00
irungentoo
59757aa905 Merge pull request #659 from stqism/master
De-clusterfucks travis logs.
2013-11-20 15:55:17 -08:00