msvc fixes

.github/FUNDING.yml

@@ -1 +0,0 @@
-github: Green-Sky

.github/workflows/cd.yml

@@ -21,7 +21,7 @@ jobs:
         submodules: recursive
 
     - name: Install Dependencies
-      run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static
+      run: vcpkg install libsodium:x64-windows pthreads:x64-windows
 
     # setup vs env
     - uses: ilammy/msvc-dev-cmd@v1
@@ -29,14 +29,14 @@ jobs:
         arch: amd64
 
     - name: Configure CMake
-      run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
+      run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
 
     - uses: actions/upload-artifact@v3
       with:
-        name: ${{ github.event.repository.name }}-windows-msvc-x86_64
+        name: windows_msvc_x86-64
         # TODO: do propper packing
         path: |
           ${{github.workspace}}/build/bin/

CMakeLists.txt

@@ -36,7 +36,7 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL
 	)
 
 	if (NOT WIN32)
-		#link_libraries(-fsanitize=address,undefined)
+		link_libraries(-fsanitize=address,undefined)
 		#link_libraries(-fsanitize=undefined)
 	endif()
 elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")

external/toxcore/CMakeLists.txt

@@ -91,8 +91,6 @@ add_library(toxcore STATIC
 	${TOX_DIR}toxcore/logger.h
 	${TOX_DIR}toxcore/Messenger.c
 	${TOX_DIR}toxcore/Messenger.h
-	${TOX_DIR}toxcore/mem.c
-	${TOX_DIR}toxcore/mem.h
 	${TOX_DIR}toxcore/mono_time.c
 	${TOX_DIR}toxcore/mono_time.h
 	${TOX_DIR}toxcore/net_crypto.c

src/hash_utils.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <cstdint>
-#include <cstddef>
 #include <vector>
 
 // returns the 20bytes sha1 hash

src/states/receive_start_sha1.cpp

@@ -176,10 +176,10 @@ void ReceiveStartSHA1::onFT1ReceiveDataSHA1Info(uint32_t group_number, uint32_t
 			std::cerr << "ReceiveStartSHA1 received info's hash does not match!, discarding\n";
 			_transfer.reset();
 			_sha1_info_data.clear();
-		} else {
-			std::cout << "ReceiveStartSHA1 info tansfer finished " << group_number << ":" << peer_number << "." << int(transfer_id) << "\n";
-			_done = true;
 		}
+
+		std::cout << "ReceiveStartSHA1 info tansfer finished " << group_number << ":" << peer_number << "." << int(transfer_id) << "\n";
+		_done = true;
 	}
 }
 

src/tox_client.cpp

@@ -212,25 +212,6 @@ bool ToxClient::iterate(void) {
 		}
 	}
 
-	_rejoin_group_timer -= time_delta;
-	if (_rejoin_group_timer <= 0.f) {
-		_rejoin_group_timer = 6.f * 60.f;
-
-		forEachGroup([this](const uint32_t group_number) {
-			// is connected or trying to connect
-			if (!tox_group_is_connected(_tox, group_number, nullptr)) {
-				std::cerr << "TCL disconnected group " << group_number << "\n";
-				return;
-			}
-
-			// never seen another peer
-			if (_groups.at(group_number).empty()) {
-				tox_group_reconnect(_tox, group_number, nullptr);
-				std::cerr << "TCL reconnecting empty group " << group_number << "\n";
-			}
-		});
-	}
-
 	if (_tox_profile_dirty) {
 		saveToxProfile();
 	}
@@ -268,20 +249,9 @@ void ToxClient::onToxSelfConnectionStatus(TOX_CONNECTION connection_status) {
 	}
 
 	if (connection_status != TOX_CONNECTION::TOX_CONNECTION_NONE && !_join_group_after_dht_connect.empty()) {
-		Tox_Err_Group_Join err;
+		// TODO: error checking
-		uint32_t new_group_number = tox_group_join(
+		tox_group_join(_tox, _join_group_after_dht_connect.data(), nullptr, 0, nullptr, 0, nullptr);
-			_tox,
+		std::cout << "TCL joining group " << bin2hex(_join_group_after_dht_connect) << "\n";
-			_join_group_after_dht_connect.data(),
-			reinterpret_cast<const uint8_t*>(_self_name.data()), _self_name.size(),
-			nullptr, 0,
-			&err
-		);
-		if (err == TOX_ERR_GROUP_JOIN_OK) {
-			std::cout << "TCL joining group " << bin2hex(_join_group_after_dht_connect) << "\n";
-			_groups[new_group_number] = {};
-		} else {
-			std::cerr << "TCL error joining group failed " << err << "\n";
-		}
 		_join_group_after_dht_connect.clear();
 	}
 

src/tox_client.hpp

@@ -87,7 +87,6 @@ struct ToxClient {
 		bool _tox_profile_dirty {false}; // set in callbacks
 
 		std::vector<uint8_t> _join_group_after_dht_connect;
-		float _rejoin_group_timer {4.f * 60.f};
 
 		std::unique_ptr<StateI> _state;