Commit Graph

1372 Commits

Author SHA1 Message Date
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
41b162eb18 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-09-12 19:26:37 -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
irungentoo
983d36f70b Merge pull request #575 from FullName/DHT_bootstrap
Patch to allow DHT_bootstrap to also do LAN discovery.
2013-09-12 11:51:47 -07:00
Coren[m]
d95df291f0 Merge remote-tracking branch 'upstream/master' into DHT_bootstrap
Conflicts:
	toxcore/Messenger.c
2013-09-12 19:39:21 +02:00
Coren[m]
b5db32585a Patch to allow DHT_bootstrap to also do LAN discovery.
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
2013-09-12 19:09:25 +02:00
irungentoo
b37b521cd5 Integration of group chats into messenger in progress. 2013-09-11 20:42:25 -04:00
irungentoo
9bd7e56db8 Some small work on group chats done. 2013-09-11 19:22:48 -04:00
irungentoo
55499933be Fixed building with NaCl. 2013-09-10 17:15:26 -04: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
irungentoo
9e80dd71ca Merge pull request #567 from kigu/patch-2
Update TODO
2013-09-10 04:44:35 -07: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
irungentoo
00c9c8ab57 More stuff done in group chats. 2013-09-09 13:52:03 -04:00
Alexander Huffman
0ef7daaa25 Update TODO 2013-09-09 11:01:04 -03: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
irungentoo
31f43799e1 Fixed small problem. 2013-09-04 07:26:30 -04:00
irungentoo
36ac8e461e Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-09-03 14:30:49 -04:00
irungentoo
01365342fc Possible bugs fixed, all received strings now force NULL terminate. 2013-09-03 14:28:14 -04:00
irungentoo
f59172d754 Merge pull request #555 from jin-eld/readme
Cleaned up bogus configure parameters and updated Win32 build instructions in INSTALL
2013-09-03 11:14:57 -07:00
irungentoo
53ea283fa1 Merge pull request #556 from jin-eld/no-printouts
Remove error printouts
2013-09-03 11:14:44 -07:00
Jin^eLD
c7c1b92724 Remove error printouts
A library should never print anything, so removing the perror()
printouts.
2013-09-03 20:25:18 +03:00
irungentoo
c59975dd7e Work in progress group chats.
Not done yet.
2013-09-03 08:53:07 -04:00
jin-eld
0fed441e80 Update INSTALL.md
Cleaned up bogus configure parameters and updated Win32 build instructions.
2013-09-03 13:23:40 +03:00
irungentoo
b73ba8244a Removed useless code, possibly fixed something. 2013-09-02 16:52:09 -04:00
irungentoo
7e8a34bee9 Fixed possible segfaults from bad input. 2013-09-02 16:35:23 -04:00
irungentoo
a4bf25801d Merge branch 'master' of https://github.com/JamoBox/ProjectTox-Core into JamoBox-master 2013-09-02 15:59:28 -04:00
JamoBox
61880ab938 last of the comment refactoring from toxcore 2013-09-02 17:25:28 +01:00