fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev_tls' into dev_tls

Browse source
This commit is contained in:
BenDr0id 2018-03-01 17:44:27 +01:00
commit fa96fc6faf
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -11,6 +11,8 @@ option(WITH_HTTPD "HTTP REST API" OFF)
option(WITH_CC_CLIENT "CC Client" ON) option(WITH_CC_CLIENT "CC Client" ON)
option(WITH_CC_SERVER "CC Server" ON) option(WITH_CC_SERVER "CC Server" ON)
option(WITH_TLS "TLS support" ON) option(WITH_TLS "TLS support" ON)
set(MINER_EXECUTABLE_NAME "xmrigMiner" CACHE STRING "Miner executable file name")
set(DAEMON_EXECUTABLE_NAME "xmrigDaemon" CACHE STRING "Daemon executable file name")
include (CheckIncludeFile) include (CheckIncludeFile)
include (cmake/cpu.cmake) include (cmake/cpu.cmake)
@ -104,6 +106,7 @@ endif()
add_definitions(/D__STDC_FORMAT_MACROS) add_definitions(/D__STDC_FORMAT_MACROS)
add_definitions(/DUNICODE) add_definitions(/DUNICODE)
add_definitions(/DMINER_EXECUTABLE_NAME=${MINER_EXECUTABLE_NAME})
#add_definitions(/DAPP_DEBUG) #add_definitions(/DAPP_DEBUG)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
@ -217,6 +220,7 @@ if (WITH_CC_SERVER OR WITH_CC_CLIENT)
endif (WITH_CC_SERVER OR WITH_CC_CLIENT) endif (WITH_CC_SERVER OR WITH_CC_CLIENT)
add_executable(xmrigMiner ${SOURCES} ${SOURCES_CRYPTO} ${HTTPD_SOURCES} ${SOURCES_CC_CLIENT} res/app.rc) add_executable(xmrigMiner ${SOURCES} ${SOURCES_CRYPTO} ${HTTPD_SOURCES} ${SOURCES_CC_CLIENT} res/app.rc)
set_target_properties(xmrigMiner PROPERTIES OUTPUT_NAME ${MINER_EXECUTABLE_NAME})
target_link_libraries(xmrigMiner xmrig_common xmrig_os_dependencies xmrig_cpuid target_link_libraries(xmrigMiner xmrig_common xmrig_os_dependencies xmrig_cpuid
${UV_LIBRARIES} ${MHD_LIBRARY} ${EXTRA_LIBS} ${CPUID_LIB}) ${UV_LIBRARIES} ${MHD_LIBRARY} ${EXTRA_LIBS} ${CPUID_LIB})
@ -230,6 +234,7 @@ if (WITH_TLS)
endif (WITH_TLS) endif (WITH_TLS)
add_executable(xmrigDaemon src/cc/XMRigd.cpp res/app.rc) add_executable(xmrigDaemon src/cc/XMRigd.cpp res/app.rc)
set_target_properties(xmrigDaemon PROPERTIES OUTPUT_NAME ${DAEMON_EXECUTABLE_NAME})
if (WITH_CC_SERVER AND MHD_FOUND) if (WITH_CC_SERVER AND MHD_FOUND)
add_library(xmrig_common_cc STATIC ${SOURCES_COMMON}) add_library(xmrig_common_cc STATIC ${SOURCES_COMMON})

2
README.md
View file

@ -11,6 +11,7 @@ The modified version can also handle commands like "update config", "start/stop
Full Windows/Linux compatible, and you can mix Linux and Windows miner on one XMRigCCServer. Full Windows/Linux compatible, and you can mix Linux and Windows miner on one XMRigCCServer.
## Additional features of XMRigCC (on top of XMRig) ## Additional features of XMRigCC (on top of XMRig)
* **NEW: Full SSL/TLS support**
* Command and control server * Command and control server
* CC Dashboard with: * CC Dashboard with:
* statistics of all connected miners * statistics of all connected miners
@ -201,7 +202,6 @@ This will limit multihash mode (multihash-factor = 2) to thread 0 and thread 2,
## Other information ## Other information
* No HTTP support, only stratum protocol support. * No HTTP support, only stratum protocol support.
* No TLS support.
### CPU mining performance ### CPU mining performance

10
src/cc/XMRigd.cpp
View file

@ -36,16 +36,22 @@
#include <errno.h> #include <errno.h>
#endif #endif
#ifndef MINER_EXECUTABLE_NAME
#define MINER_EXECUTABLE_NAME xmrigMiner
#endif
#define VALUE_TO_STRING(x) #x
#define VALUE(x) VALUE_TO_STRING(x)
int main(int argc, char **argv) { int main(int argc, char **argv) {
std::string ownPath(argv[0]); std::string ownPath(argv[0]);
#if defined(_WIN32) || defined(WIN32) #if defined(_WIN32) || defined(WIN32)
int pos = ownPath.rfind('\\'); int pos = ownPath.rfind('\\');
std::string xmrigMiner("xmrigMiner.exe"); std::string xmrigMiner( VALUE(MINER_EXECUTABLE_NAME) ".exe");
#else #else
int pos = ownPath.rfind('/'); int pos = ownPath.rfind('/');
std::string xmrigMiner("xmrigMiner"); std::string xmrigMiner( VALUE(MINER_EXECUTABLE_NAME) );
#endif #endif
std::string xmrigMinerPath = ownPath.substr(0, pos+1) + xmrigMiner; std::string xmrigMinerPath = ownPath.substr(0, pos+1) + xmrigMiner;