Skip to content

Commit 6d03c34

Browse files
sam-astrosam-astro
committed
re-add socket receive timeout
1 parent d898207 commit 6d03c34

File tree

4 files changed

+140
-2
lines changed

4 files changed

+140
-2
lines changed

‎dcc_client/dcc_client/P2PClient.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ void P2P::ListenerThread(int update_interval)
256256

257257
remoteAddrLen = sizeof(remoteAddr);
258258

259-
//if (setsockopt(localSocket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0)
260-
// ERRORMSG("Failed to set socket options");
259+
if (setsockopt(localSocket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0)
260+
ERRORMSG("Failed to set socket options");
261261
int iResult = recvfrom(localSocket, buffer, BUFFERLENGTH, 0, (sockaddr*)&remoteAddr, &remoteAddrLen);
262262

263263
if (WalletSettingValues::verbose >= 9)

‎dcc_client/out-linux/_deps/curl-build/libcurl-target.cmake‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2323,6 +2323,144 @@ unset(_cmake_targets_not_defined)
23232323
unset(_cmake_expected_targets)
23242324

23252325

2326+
# Create imported target CURL::libcurl
2327+
add_library(CURL::libcurl SHARED IMPORTED)
2328+
2329+
set_target_properties(CURL::libcurl PROPERTIES
2330+
INTERFACE_INCLUDE_DIRECTORIES "/home/sam/Code/Distributed-Compute-Coin/dcc_client/out-linux/_deps/curl-src/include"
2331+
INTERFACE_LINK_LIBRARIES "dl;OpenSSL::SSL;OpenSSL::Crypto;ZLIB::ZLIB"
2332+
)
2333+
2334+
# Import target "CURL::libcurl" for configuration "Release"
2335+
set_property(TARGET CURL::libcurl APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
2336+
set_target_properties(CURL::libcurl PROPERTIES
2337+
IMPORTED_LOCATION_RELEASE "/home/sam/Code/Distributed-Compute-Coin/dcc_client/out-linux/_deps/curl-build/lib/libcurl.so"
2338+
IMPORTED_SONAME_RELEASE "libcurl.so"
2339+
)
2340+
2341+
# This file does not depend on other imported targets which have
2342+
# been exported from the same project but in a separate export set.
2343+
2344+
# Commands beyond this point should not need to know the version.
2345+
set(CMAKE_IMPORT_FILE_VERSION)
2346+
cmake_policy(POP)
2347+
# Generated by CMake
2348+
2349+
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
2350+
message(FATAL_ERROR "CMake >= 2.8.0 required")
2351+
endif()
2352+
if(CMAKE_VERSION VERSION_LESS "2.8.3")
2353+
message(FATAL_ERROR "CMake >= 2.8.3 required")
2354+
endif()
2355+
cmake_policy(PUSH)
2356+
cmake_policy(VERSION 2.8.3...3.23)
2357+
#----------------------------------------------------------------
2358+
# Generated CMake target import file.
2359+
#----------------------------------------------------------------
2360+
2361+
# Commands may need to know the format version.
2362+
set(CMAKE_IMPORT_FILE_VERSION 1)
2363+
2364+
# Protect against multiple inclusion, which would fail when already imported targets are added once more.
2365+
set(_cmake_targets_defined "")
2366+
set(_cmake_targets_not_defined "")
2367+
set(_cmake_expected_targets "")
2368+
foreach(_cmake_expected_target IN ITEMS CURL::libcurl)
2369+
list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
2370+
if(TARGET "${_cmake_expected_target}")
2371+
list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
2372+
else()
2373+
list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
2374+
endif()
2375+
endforeach()
2376+
unset(_cmake_expected_target)
2377+
if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
2378+
unset(_cmake_targets_defined)
2379+
unset(_cmake_targets_not_defined)
2380+
unset(_cmake_expected_targets)
2381+
unset(CMAKE_IMPORT_FILE_VERSION)
2382+
cmake_policy(POP)
2383+
return()
2384+
endif()
2385+
if(NOT _cmake_targets_defined STREQUAL "")
2386+
string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
2387+
string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
2388+
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
2389+
endif()
2390+
unset(_cmake_targets_defined)
2391+
unset(_cmake_targets_not_defined)
2392+
unset(_cmake_expected_targets)
2393+
2394+
2395+
# Create imported target CURL::libcurl
2396+
add_library(CURL::libcurl SHARED IMPORTED)
2397+
2398+
set_target_properties(CURL::libcurl PROPERTIES
2399+
INTERFACE_INCLUDE_DIRECTORIES "/home/sam/Code/Distributed-Compute-Coin/dcc_client/out-linux/_deps/curl-src/include"
2400+
INTERFACE_LINK_LIBRARIES "dl;OpenSSL::SSL;OpenSSL::Crypto;ZLIB::ZLIB"
2401+
)
2402+
2403+
# Import target "CURL::libcurl" for configuration "Release"
2404+
set_property(TARGET CURL::libcurl APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
2405+
set_target_properties(CURL::libcurl PROPERTIES
2406+
IMPORTED_LOCATION_RELEASE "/home/sam/Code/Distributed-Compute-Coin/dcc_client/out-linux/_deps/curl-build/lib/libcurl.so"
2407+
IMPORTED_SONAME_RELEASE "libcurl.so"
2408+
)
2409+
2410+
# This file does not depend on other imported targets which have
2411+
# been exported from the same project but in a separate export set.
2412+
2413+
# Commands beyond this point should not need to know the version.
2414+
set(CMAKE_IMPORT_FILE_VERSION)
2415+
cmake_policy(POP)
2416+
# Generated by CMake
2417+
2418+
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
2419+
message(FATAL_ERROR "CMake >= 2.8.0 required")
2420+
endif()
2421+
if(CMAKE_VERSION VERSION_LESS "2.8.3")
2422+
message(FATAL_ERROR "CMake >= 2.8.3 required")
2423+
endif()
2424+
cmake_policy(PUSH)
2425+
cmake_policy(VERSION 2.8.3...3.23)
2426+
#----------------------------------------------------------------
2427+
# Generated CMake target import file.
2428+
#----------------------------------------------------------------
2429+
2430+
# Commands may need to know the format version.
2431+
set(CMAKE_IMPORT_FILE_VERSION 1)
2432+
2433+
# Protect against multiple inclusion, which would fail when already imported targets are added once more.
2434+
set(_cmake_targets_defined "")
2435+
set(_cmake_targets_not_defined "")
2436+
set(_cmake_expected_targets "")
2437+
foreach(_cmake_expected_target IN ITEMS CURL::libcurl)
2438+
list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
2439+
if(TARGET "${_cmake_expected_target}")
2440+
list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
2441+
else()
2442+
list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
2443+
endif()
2444+
endforeach()
2445+
unset(_cmake_expected_target)
2446+
if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
2447+
unset(_cmake_targets_defined)
2448+
unset(_cmake_targets_not_defined)
2449+
unset(_cmake_expected_targets)
2450+
unset(CMAKE_IMPORT_FILE_VERSION)
2451+
cmake_policy(POP)
2452+
return()
2453+
endif()
2454+
if(NOT _cmake_targets_defined STREQUAL "")
2455+
string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
2456+
string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
2457+
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
2458+
endif()
2459+
unset(_cmake_targets_defined)
2460+
unset(_cmake_targets_not_defined)
2461+
unset(_cmake_expected_targets)
2462+
2463+
23262464
# Create imported target CURL::libcurl
23272465
add_library(CURL::libcurl SHARED IMPORTED)
23282466

‎dcc_client/out-linux/dcc_client/CMakeFiles/dcc_client.dir/P2PClient.cpp.o‎

904 Bytes
Binary file not shown.

‎dcc_client/out-linux/dcc_client/dcc_client‎

192 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)