Merge the remainder of the new groupchats implementation

Commit history: https://github.com/jfreegman/toxcore/tree/ngc_jf Spec: https://toktok.ltd/spec.html#dht-group-chats
TokTok · Jul 7, 2022 · ee3236a · ee3236a
1 parent 9a26580
commit ee3236a
Show file tree

Hide file tree

Showing 69 changed files with 19,889 additions and 120 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -92,6 +92,7 @@ bazel-tsan_task:
         -//c-toxcore/auto_tests:conference_av_test
         -//c-toxcore/auto_tests:conference_test
         -//c-toxcore/auto_tests:file_transfer_test
+        -//c-toxcore/auto_tests:group_tcp_test
         -//c-toxcore/auto_tests:onion_test
         -//c-toxcore/auto_tests:tcp_relay_test
         -//c-toxcore/auto_tests:tox_many_test

diff --git a/.gitignore b/.gitignore
@@ -65,6 +65,8 @@ libtool
 .libs
 .dirstamp
 build/
+*.nvim*
+*.vim*
 
 #kdevelop
 .kdev/
@@ -88,3 +90,5 @@ cscope.files
 
 # rpm
 tox.spec
+
+.idea/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -113,6 +113,11 @@ if(NOT USE_IPV6)
   add_definitions(-DUSE_IPV6=0)
 endif()
 
+option(USE_TEST_NETWORK "Use a separate test network with different packet IDs" OFF)
+if(USE_TEST_NETWORK)
+  add_definitions(-DUSE_TEST_NETWORK=1)
+endif()
+
 option(BUILD_MISC_TESTS "Build additional tests and utilities" OFF)
 option(BUILD_FUN_UTILS "Build additional just for fun utilities" OFF)
 
@@ -241,11 +246,20 @@ set(toxcore_SOURCES
   toxcore/friend_requests.c
   toxcore/friend_requests.h
   toxcore/group.c
+  toxcore/group_chats.c
+  toxcore/group_chats.h
+  toxcore/group_common.h
+  toxcore/group_connection.c
+  toxcore/group_connection.h
   toxcore/group.h
   toxcore/group_announce.c
   toxcore/group_announce.h
   toxcore/group_moderation.c
   toxcore/group_moderation.h
+  toxcore/group_onion_announce.c
+  toxcore/group_onion_announce.h
+  toxcore/group_pack.c
+  toxcore/group_pack.h
   toxcore/LAN_discovery.c
   toxcore/LAN_discovery.h
   toxcore/list.c

diff --git a/auto_tests/BUILD.bazel b/auto_tests/BUILD.bazel
@@ -44,6 +44,7 @@ flaky_tests = {
         ":check_compat",
         "//c-toxcore/testing:misc_tools",
         "//c-toxcore/toxav",
+        "//c-toxcore/toxcore:Messenger",
         "//c-toxcore/toxcore:TCP_client",
         "//c-toxcore/toxcore:TCP_common",
         "//c-toxcore/toxcore:TCP_connection",

diff --git a/auto_tests/CMakeLists.txt b/auto_tests/CMakeLists.txt
@@ -36,6 +36,15 @@ auto_test(forwarding)
 auto_test(friend_connection)
 auto_test(friend_request)
 auto_test(friend_request_spam)
+auto_test(group_general)
+auto_test(group_invite)
+auto_test(group_message)
+auto_test(group_moderation)
+auto_test(group_save)
+auto_test(group_state)
+auto_test(group_sync)
+auto_test(group_tcp)
+auto_test(group_topic)
 auto_test(invalid_tcp_proxy)
 auto_test(invalid_udp_proxy)
 auto_test(lan_discovery)

diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc
@@ -17,6 +17,7 @@ TESTS = \
 	forwarding_test \
 	friend_connection_test \
 	friend_request_test \
+	group_state_test \
 	invalid_tcp_proxy_test \
 	invalid_udp_proxy_test \
 	lan_discovery_test \
@@ -126,6 +127,10 @@ friend_request_test_SOURCES = ../auto_tests/friend_request_test.c
 friend_request_test_CFLAGS = $(AUTOTEST_CFLAGS)
 friend_request_test_LDADD = $(AUTOTEST_LDADD)
 
+group_state_test_SOURCES = ../auto_tests/group_state_test.c
+group_state_test_CFLAGS = $(AUTOTEST_CFLAGS)
+group_state_test_LDADD = $(AUTOTEST_LDADD)
+
 invalid_tcp_proxy_test_SOURCES = ../auto_tests/invalid_tcp_proxy_test.c
 invalid_tcp_proxy_test_CFLAGS = $(AUTOTEST_CFLAGS)
 invalid_tcp_proxy_test_LDADD = $(AUTOTEST_LDADD)

diff --git a/auto_tests/auto_test_support.c b/auto_tests/auto_test_support.c
@@ -65,6 +65,13 @@ static const struct BootstrapNodes {
         0x65, 0x4A, 0x37, 0x58, 0xC5, 0x3E, 0x02, 0x73,
         0xEC, 0xFC, 0x4D, 0x12, 0xC2, 0x1D, 0xCA, 0x48,
     },
+    {
+        "tox.plastiras.org", 38445,
+        0x5E, 0x47, 0xBA, 0x1D, 0xC3, 0x91, 0x3E, 0xB2,
+        0xCB, 0xF2, 0xD6, 0x4C, 0xE4, 0xF2, 0x3D, 0x8B,
+        0xFE, 0x53, 0x91, 0xBF, 0xAB, 0xE5, 0xC4, 0x3C,
+        0x5B, 0xAD, 0x13, 0xF0, 0xA4, 0x14, 0xCD, 0x77,
+    },
 #endif  // USE_TEST_NETWORK
     { nullptr, 0, 0 },
 };