Compare commits

..

6 Commits

Author SHA1 Message Date
3567aba4db change cd output name 2023-10-15 16:40:48 +02:00
9b07cb4dce compile fixes for toxcore and gcc12 2023-10-15 16:34:07 +02:00
c89bba25a3 update toxcore dep, so clone works again 2023-10-15 15:57:26 +02:00
f9bc83811c properly handle broken info 2023-08-10 01:32:24 +02:00
5c4bb1aa42 update packet ids 2023-08-06 18:36:21 +02:00
2a143a4c2e remove extra include 2023-06-17 15:47:59 +02:00
10 changed files with 12 additions and 10 deletions

1
.github/FUNDING.yml vendored Normal file
View File

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

View File

@ -36,7 +36,7 @@ jobs:
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: windows_msvc_x86-64 name: ${{ github.event.repository.name }}-windows-msvc-x86_64
# TODO: do propper packing # TODO: do propper packing
path: | path: |
${{github.workspace}}/build/bin/ ${{github.workspace}}/build/bin/

View File

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

View File

@ -91,6 +91,8 @@ add_library(toxcore STATIC
${TOX_DIR}toxcore/logger.h ${TOX_DIR}toxcore/logger.h
${TOX_DIR}toxcore/Messenger.c ${TOX_DIR}toxcore/Messenger.c
${TOX_DIR}toxcore/Messenger.h ${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.c
${TOX_DIR}toxcore/mono_time.h ${TOX_DIR}toxcore/mono_time.h
${TOX_DIR}toxcore/net_crypto.c ${TOX_DIR}toxcore/net_crypto.c

View File

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

View File

@ -176,12 +176,12 @@ void ReceiveStartSHA1::onFT1ReceiveDataSHA1Info(uint32_t group_number, uint32_t
std::cerr << "ReceiveStartSHA1 received info's hash does not match!, discarding\n"; std::cerr << "ReceiveStartSHA1 received info's hash does not match!, discarding\n";
_transfer.reset(); _transfer.reset();
_sha1_info_data.clear(); _sha1_info_data.clear();
} } else {
std::cout << "ReceiveStartSHA1 info tansfer finished " << group_number << ":" << peer_number << "." << int(transfer_id) << "\n"; std::cout << "ReceiveStartSHA1 info tansfer finished " << group_number << ":" << peer_number << "." << int(transfer_id) << "\n";
_done = true; _done = true;
} }
} }
}
void ReceiveStartSHA1::onFT1SendDataSHA1Info(uint32_t, uint32_t, uint8_t, size_t, uint8_t*, size_t) { void ReceiveStartSHA1::onFT1SendDataSHA1Info(uint32_t, uint32_t, uint8_t, size_t, uint8_t*, size_t) {
// we cant send what we dont have // we cant send what we dont have

View File

@ -5,7 +5,6 @@
#include "./states/send_start_sha1.hpp" #include "./states/send_start_sha1.hpp"
#include "./states/receive_start_sha1.hpp" #include "./states/receive_start_sha1.hpp"
#include "toxcore/tox.h"
#include <memory> #include <memory>
#include <sodium.h> #include <sodium.h>
@ -216,7 +215,6 @@ bool ToxClient::iterate(void) {
_rejoin_group_timer -= time_delta; _rejoin_group_timer -= time_delta;
if (_rejoin_group_timer <= 0.f) { if (_rejoin_group_timer <= 0.f) {
_rejoin_group_timer = 6.f * 60.f; _rejoin_group_timer = 6.f * 60.f;
std::cerr << "TCL rejoin timer!\n";
forEachGroup([this](const uint32_t group_number) { forEachGroup([this](const uint32_t group_number) {
// is connected or trying to connect // is connected or trying to connect