StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity
2,828 Commits 2 Branches 1 Tag 69 MiB
eaf15bfb89
Commit Graph

159 Commits

Author SHA1 Message Date
irungentoo
12d1c5199b astyled everything. 2013-09-14 12:42:17 -04:00
Coren[m]
0db05eca49 Save datafile when adding a friend/accepting a friend request. 
(Note to self: make clean is your friend. Those extra seconds are well spent.)
 2013-09-14 18:39:59 +02:00
Coren[m]
f2ad7fd4ea Rename load_old_key_or_save_new_one() to load_data_or_init(). 2013-09-13 09:20:03 +02:00
Coren[m]
484615e67d Made (load_/save_)data() functions static. 2013-09-13 09:16:48 +02:00
Coren[m]
cbd575f7a0 Merge remote-tracking branch 'upstream/master' into nTox 2013-09-13 09:14:21 +02:00
Coren[m]
e67a11dd04 Merge remote-tracking branch 'upstream/master' into Integration 2013-09-13 09:06:52 +02:00
irungentoo
f8b979a92a Put group chat functions in the public API. 
Group chats are not complete, they seem to work very well though.

This means that the functions will change.
 2013-09-12 20:29:30 -04:00
irungentoo
91d7f4857f Very basic group chats, tested and working with nTox. 
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.
 2013-09-12 19:26:30 -04:00
Coren[m]
a74cfaea81 tox.h: 
- #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()
 2013-09-12 15:42:03 +02:00
Coren[m]
20f865521a nTox.c: 
- correct a message who claims we're going to exit when we actually aren't
- don't treat a failed close on reading the data file as failure of the reading
 2013-09-12 14:19:22 +02:00
Coren[m]
d017189bb6 nTox.c: 
- don't claim "Added friend" per default, check for returned ID first
- on '/q' SAVE... else everything but the keys is lost on each restart
- for that, split load_key() into load_data() and save_data()
- announce own nickname on startup
 2013-09-12 00:01:46 +02:00
Coren[m]
513e37815d tox.h, DHT.h: 
- 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
 2013-09-11 20:50:15 +02:00
Coren[m]
4cf0d857bc cmdline parsing of --ipv4/6 plucked into util 2013-09-11 00:14:20 +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
Coren[m]
bcb283cf45 big push, putting all the infrastructure in place behind TOX_ENABLE_IPV6 2013-09-10 16:36:20 +02:00
irungentoo
8f0bef5f20 Fixed warnings and moved hex_string_to_bin to testing/ 2013-08-30 08:16:34 -04:00
irungentoo
7441a234b7 Merge branch 'udp_connections' of https://github.com/vx-k/ProjectTox-Core into vx-k-udp_connections 2013-08-30 07:53:51 -04:00
Anony Moose
eb33796e58 Moved misc_tools from testing to toxcore. 2013-08-29 22:54:54 +00:00
jin-eld
14a8ee4e0d Make nTox work on MinGW/Win32 2013-08-27 14:25:09 +03:00
irungentoo
0f77a2d131 Added tox_ to 2 typedefs. 2013-08-23 10:34:10 -04:00
irungentoo
9d3a8d94f2 New API done and tested. 
Some stuff needs to be cleaned a bit though.
 2013-08-23 10:26:52 -04:00
irungentoo
2f66b31244 nTox and cmake fixed. 2013-08-20 15:28:16 -04:00
irungentoo
88ff81d9de Passed everything through astyle. 2013-08-16 13:11:09 -04:00
naxuroqa
72ee99e848 rewrite of get_id function 2013-08-14 10:44:57 +02:00
irungentoo
f93e23e411 Updated some files. 2013-08-13 11:50:33 -04:00
Andreas Schneider
6b06431e9b core: Fix a possible buffer overflow using getself_name(). 
If the passed buffer is smaller than MAX_NAME_LENGTH then, you
will probably overflow it.
 2013-08-13 09:50:51 +02:00
alek900
8d3e68b74d Added support for userdata in callbacks 2013-08-12 14:23:46 +02:00
Chris Hall
4293c4b1e6 Messenger refactor - redid work from pull request 79 
Moves static state out of Messenger.c and into a Messenger struct
Purely stylistic, no functional changes were made.

This commit also changed all the callers of Messenger as they now have
to pass an instance of the Messenger struct to messenger functions.

Also removed some uses of the 'static' keyword at the beginning of
function definitions when the function was already declared static, as
these caused gcc to whine.
 2013-08-12 21:37:38 +12:00
Maxim Biro
b1a2af23e5 Modified clients to properly work with the changes 2013-08-07 18:12:59 -04:00
Nick ODell
34f531553a Fix bug where file handle wasn't closed on success 2013-08-06 18:11:13 -06:00
Sebastian Stal
5ec3b2330e Make test clients compatible with userstatus kinds 
No features were added, just fixed callbacks.
 2013-08-05 12:30:40 -07:00
irungentoo
519e22677a Merge pull request #312 from Niautanor/master 
fix for Issue #288
 2013-08-05 07:19:50 -07:00
Sean Qureshi
a8f752130b Fixed 2 Null pointer derefrences in both nTox and toxic 2013-08-04 14:36:09 -07:00
irungentoo
b9f387b3b7 Merge pull request #311 from CharmlessCoin/nTox 
nTox Cleaning
 2013-08-04 08:27:15 -07:00
Tim Malte Gräfje
0259cb0194 added fix in nTox_win32.c 2013-08-04 13:01:20 +02:00
charmlesscoin
ae8367dc3e whoops, returning a free'd variable is really not what I meant... 2013-08-04 05:09:12 -04:00
charmlesscoin
b36bca295c fixed bug that would cause this to always exit 2013-08-03 21:59:17 -04:00
Tim Malte Gräfje
5817c2c888 fix for #288 
nTox will now display a message if you try to accept a not yet received
or already accepted friend request
 2013-08-04 01:46:54 +02:00
charmlesscoin
175a434de3 removed some magic numbers from line_eval() 2013-08-03 18:06:28 -04:00
charmlesscoin
6222e32848 added some better error checking for print_nickname() anr print_statuschange() 2013-08-03 18:02:09 -04:00
charmlesscoin
43f6608530 cleaned up load_key() and added more error checking 2013-08-03 17:57:44 -04:00
irungentoo
09a6d2d351 Merge branch 'nTox' of https://github.com/CharmlessCoin/ProjectTox-Core into CharmlessCoin-nTox 
Conflicts:
	testing/nTox.c
 2013-08-03 16:46:58 -04:00
Michael Kress
d5493bb24f added backspace to nTox; removed trailing spaces 2013-08-03 13:27:52 +02:00
charmlesscoin
9b6283c084 whoops, removed part of a string by accident. 2013-08-03 01:27:20 -04:00
charmlesscoin
bb2ea0e5b4 Fixed the printing of a few strings, moved some code around. 2013-08-03 01:14:30 -04:00
charmlesscoin
6b8f12e33c added a getopt system, with -f and -h flags 2013-08-03 00:45:34 -04:00
charmlesscoin
b9e3bf1fa6 changed some formatting, fixed the removal of x and y 2013-08-02 22:34:45 -04:00
charmlesscoin
3678b302db cleaned up print_friendlist(), it now prints a message if you have _no_ friends 2013-08-02 21:22:02 -04:00
charmlesscoin
f906fd628f cleaned up my changes 2013-08-02 19:54:57 -04:00
charmlesscoin
809ee9af75 new_lines should use strncpy, and wrote get_id() to declutter code 2013-08-02 19:51:08 -04:00
irungentoo
af8e843451 Merge pull request #229 from JFreegman/master 
fixed friend add bugs and gave no message its own error
 2013-08-01 17:38:29 -07:00
irungentoo
4c949c5b13 Merge pull request #252 from nickodell/master 
Fix a bug and remove useless code.
 2013-08-01 16:52:25 -07:00
Nick ODell
67b7523b18 Remove code that did nothing. 2013-08-01 16:19:01 -06:00
Nick ODell
ff2e04b107 Fix bug where messages from yourself were preceeded by [-1] 2013-08-01 16:15:56 -06:00
plutooo
9fbff0c758 nTox: fixed 2 possible crashes, 3 incorrect packet lengths 2013-08-01 16:28:48 -04:00
Jfreegman
8abc0a3462 added error code for no message on friend add & updated nTox.c/nTox_win32.c 2013-08-01 15:27:08 -04:00
plutooo
3d916b35f2 core: getaddrinfo() lookup error handling 2013-08-01 11:54:06 -07:00
Jfreegman
44d9e24855 small fix 2013-07-31 17:38:39 -04:00
Jfreegman
8f6e1d8fbf partially fixed friend add bug (key length test still broken) 2013-07-31 17:30:16 -04:00
Jfreegman
3eafbc900e remove debugging printf statement 2013-07-31 15:34:34 -04:00
Nick ODell
ccbe4c6799 Show error message instead of "added friendnumber -1" 2013-07-31 10:38:13 -06:00
irungentoo
bdd13d1954 Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master 
Conflicts:
	testing/nTox.c
 2013-07-31 10:25:29 -04:00
irungentoo
f2d310b91a Merge pull request #191 from theshadowfog/patch-6 
Update nTox.c
 2013-07-31 04:42:48 -07:00
Jfreegman
17e64b3ee5 initialize num_requests 2013-07-31 05:52:08 -04:00
Marco Hinz
439de6fa3a Fix space/tab indentation 2013-07-31 10:36:02 +02:00
Stuart Banks
207c067cf2 Clean up/format code 2013-07-31 02:15:01 -04:00
Greg
2d7143e850 Update nTox.c 
Made the help message a string type.
 2013-07-30 21:36:22 -04:00
Greg
20e4cd0a17 Update nTox.c 
Edited help message.
 2013-07-30 17:51:16 -04:00
Greg
3edb2f1f12 Update nTox.c 
Gives the user his ID.
 2013-07-30 17:36:25 -04:00
irungentoo
87388b302e Merge branch 'master' of https://github.com/blackwolf12333/ProjectTox-Core into blackwolf12333-master 
Also fixed his pull request.
 2013-07-30 14:30:33 -04:00
Greg
915ffaa888 Update nTox.c 
Added help command to nTox.c
 2013-07-30 11:58:51 -04:00
Peter Maatman
dc57b779d2 added utility function format_message 2013-07-30 17:43:17 +02:00
Peter Maatman
2c756f1c53 changing testing clients to reflect changes made in core/Messenger.h 2013-07-30 17:10:20 +02:00
irungentoo
0c251d4b1d Merge pull request #154 from xistance21/master 
Add invalid command
 2013-07-30 04:23:11 -07:00
Emir Unluturk
1c345e7f6b Add invalid command 2013-07-30 12:31:02 +03:00
Ryan Lewon
20aad9c73b Removed unneeded include. 
Fixed formatting and cleaned up output.
 2013-07-30 07:26:58 +00:00
Ryan Lewon
09a71f37ec New friend list function for nTox client. 2013-07-30 07:19:54 +00:00
notadecent
200e704be5 Minor formatting edits 2013-07-29 20:17:30 +02:00
irungentoo
caaa1ff888 nTox now tells you if it could not send the message. 2013-07-27 21:33:01 -04:00
irungentoo
b83359cd05 Added friend request accepting to nTox and fixed a bug. 
Fixed a bug in Lossless UDP that prevented 2 clients from sometimes
connecting when they connected at the same time to each other.
 2013-07-27 20:04:56 -04:00
Konstantin Kowalski
ecab4c8777 Fixing broken commit 2013-07-27 12:17:31 -04:00
Konstantin Kowalski
b3fa1fc8f4 [fixed]created new files misc_tools.(c|h) and moved hex_string_to_bin() there. 2013-07-27 12:10:41 -04:00
Konstantin Kowalski
77ebbed91b created new files misc_tools.(c|h) and moved hex_string_to_bin() there. 2013-07-27 10:53:01 -04:00
Konstantin Kowalski
241aca98bd A *lot* of style changes. 2013-07-26 23:07:25 -04:00
Konstantin Kowalski
a1b93c397c took out several strlen() calls out of the loop; replaced int's with size_t where needed 2013-07-26 16:16:58 -04:00
SilentSand
59b34e423b Formatting. 
Many stylistic changes, mostly formatting code more closely to the
coding style.
 2013-07-26 04:02:17 -04:00
SilentSand
f377eb9ca2 Licensing 
Added the GPLv3 license to some files in addition to fixing some
comments at the beginning of the files.
 2013-07-25 21:45:56 -04:00
Maxim Biro
ea550d4c86 Some cleanup 2013-07-23 12:23:17 -04:00
irungentoo
37b7e4c12e Merge stuff from notadecent. 2013-07-22 15:30:59 -04:00
irungentoo
55361eac6f Modified the way friend requests worked. 
Added routing of friend requests.
 2013-07-22 14:52:42 -04:00
TrevorDorl
488c8af0c9 Adds the option 'nokey' to disable loading and saving keys, for debugging purposes 2013-07-22 12:09:30 -05:00
irungentoo
635e921c14 Fixed warnings. 2013-07-22 07:26:25 -04:00
Oliver Hunt
1dbd121ea8 moved saving to nTox.c 2013-07-22 02:11:19 +01:00
notadecent
7863a552aa Updated nTox.c (added timestamp) 
It's very glitchy. But it works.
 2013-07-21 22:54:09 +02:00
notadecent
2cf96814ba Update nTox.c 
Formatting
 2013-07-21 15:52:43 +02:00
Sebastian Stal
d88cdf7307 Don't exit on arrow keys 2013-07-20 19:08:10 -07:00
Maxim Biro
a1078ef9b3 Updated nTox 2013-07-20 17:56:18 -04:00
Sebastian Stal
e0b6e7c8bb Fix sign on function 2013-07-20 12:01:19 -07:00
Sebastian Stal
497329aeab Make nTox resolve DNS addresses. 2013-07-20 11:50:54 -07:00
irungentoo
d792247dd8 Fixed bug that sometimes prevented two clients from connecting. 2013-07-19 10:57:05 -04:00