Commit graph

292 commits

Author SHA1 Message Date
BenDr0id
fa96fc6faf Merge remote-tracking branch 'origin/dev_tls' into dev_tls 2018-03-01 17:44:27 +01:00
BenDr0id
972f542901 Fixed TLS build on Windows GCC/MVSC
Cleanup TLS compile
2018-03-01 17:44:15 +01:00
Unknown
12fa14f034 Made executable names of miner and daemon settable via CMake parameters. 2018-03-01 13:10:55 +01:00
Ben Gräf
bc110ef162 Update Options.cpp 2018-02-26 11:44:37 +01:00
BenDr0id
246f6bcebd Cleanup 2018-02-26 09:19:46 +01:00
BenDroid
be293d72cd Cleanup and added integrated tls config params parsing 2018-02-25 23:32:51 +01:00
BenDroid
16fff2fd51 Added clibs-net and clibs-buffer to 3rdparty 2018-02-25 22:10:49 +01:00
BenDroid
b5cba7bf57 Added SSL/TLS support to stratum communication 2018-02-25 22:06:40 +01:00
BenDr0id
d6f27624b7 Merge remote-tracking branch 'origin/master' into dev_tls 2018-02-22 08:36:12 +01:00
BenDroid
8fd88a4e11 Manual merged #43 Mac OS Compilation fixes 2018-02-21 23:17:11 +01:00
BenDroid
204835a3f3 Fixed hugepages on MacOSx 2018-02-21 23:09:29 +01:00
BenDroid
bcbda15832 Added tls flag to Url 2018-02-09 20:16:07 +01:00
BenDroid
f97a7fb121 Fixed behavior for non-tls mode 2018-02-09 20:15:11 +01:00
BenDroid
80c0381dc7 Fixed Uptime column in Dashboard
Implemented HTTPS for miner -> server and server -> dashboard
2018-02-06 21:43:53 +01:00
BenDroid
1b7b48f6e3 Added miner uptime to dashboard
WIP SSL/TLS for CC communication and Dashboard
2018-02-05 22:53:38 +01:00
BenDroid
512bbf83de When miner is offline status now shows "OFFLINE"
Cleanup of Readme.md
2018-01-24 21:31:27 +01:00
BenDroid
50a0dbb39f Fixed 32bit build 2018-01-20 14:49:15 +01:00
BenDroid
ba3a62ca88 Fixed arm build and windows build server script 2018-01-20 13:46:46 +01:00
sebastianstolzenberg
b2301c07ca Fixes stub build break and maybe also arm (#31) 2018-01-20 13:34:56 +01:00
Ben Gräf
acf27e9341 Preparation for #1.4.0 (#30)
- Fixed CPU affinity on Windows for NUMA and CPUs with lot of cores
- Implemented per thread configurable Multihash mode (double, triple, quadruple, quintuple)
- Rebased from XMRig 2.4.4
2018-01-19 19:42:06 +01:00
BenDroid
5f8ea98764 Merge remote-tracking branch 'refs/remotes/xmrig/master'
Conflicts:
	CHANGELOG.md
	README.md
	src/version.h
2018-01-19 19:25:31 +01:00
BenDroid
c7d9074ab4 Fixed windows gcc build issues 2018-01-14 19:57:59 +01:00
BenDroid
34f7fcc957 Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
	src/cc/XMRigd.cpp
2018-01-14 19:16:10 +01:00
BenDroid
60c72eaaea Preparation for #1.3.2 2018-01-14 19:15:08 +01:00
BenDroid
e8d8d4e866 Fixed for freebsd 2018-01-12 23:12:39 +01:00
BenDroid
e7bf633010 Integrated config less startup with only given CCServer and token #14
Fixed time drift issues on dashboard by sending server time to dashboard and use this for comparisson
2018-01-12 23:11:00 +01:00
XMRig
f8481a4430 #328 Added guard to prevent paused message spam and crash. 2018-01-10 22:55:45 +07:00
XMRig
409741ddc1 Fix version. 2018-01-10 16:56:08 +07:00
XMRig
1c68ca4f9d Add libmicrohttpd version to --version output. 2018-01-05 19:41:19 +07:00
XMRig
5b6045d398 Fix recent MSVC 2017 version detection. 2018-01-05 17:23:39 +07:00
BenDroid
0d652508b1 Preparation for #1.3.1 2018-01-04 21:19:13 +01:00
BenDr0id
e12b0070a9 Merge remote-tracking branch 'xmrig/master' into dev 2018-01-04 17:34:52 +01:00
BenDr0id
9620fe0eeb Added cpu sockets to dashboard client info popup
* Removed not working background mode for *nix
2018-01-04 17:32:56 +01:00
XMRig
aacb9b271e Fix wrong signal handle. 2018-01-04 11:38:32 +07:00
XMRig
56e21b41fa Remove extra semicolon. 2018-01-02 13:41:00 +07:00
XMRig
158c4c1b64 #279 Add missing stdio header 2018-01-02 12:24:57 +07:00
BenDroid
9f0bc484c3 Added additional fix for #16 2017-12-29 21:42:46 +01:00
BenDroid
02534a3679 Removed debug log 2017-12-29 19:51:12 +01:00
BenDroid
a6a3447507 Added fix for miner to retry when server is not reachable 2017-12-29 19:50:14 +01:00
BenDroid
ff8a284acd Merged branch master into master 2017-12-29 19:44:36 +01:00
BenDroid
84a3a01dbf Fixed #10 CCServer spontaneously freezes and holds CPU 100% 2017-12-29 19:44:27 +01:00
Ben Gräf
d04ec17f93 Fix for #16 Build error on FreeBSD 2017-12-29 09:01:46 +01:00
BenDroid
9ef2eea854 Preparation for #1.3.0 2017-12-27 13:33:39 +01:00
Ben Gräf
81a06ee21d Added fix for av mode 3 and 4 (CPU without AES) #11 2017-12-26 15:14:42 +01:00
BenDroid
4bb86be776 Fixed MSC_VER for latest Visual Studio builds
Added build type to summary to detect if debug or release build
2017-12-24 21:16:28 +01:00
BenDroid
90f3bc9e4e Updated version/changelog 2017-12-20 21:03:08 +01:00
BenDroid
ebf0ecc3c0 Fixed Memory Leaks #7 in XMRigCCServer
+ Little cleanup in dashboard
2017-12-18 22:02:06 +01:00
BenDroid
e349dccb91 - Refactored Dashboard to send one command to multiple miners and "beautified" dashboard
- Miner now publishs own config to XMRigCCServer on startup
- Added command to trigger miner to upload config to XMRigCCServer
- Added threads to miner info tooltip on client id
2017-12-16 22:38:51 +01:00
BenDroid
379e25162e Added delay in windows closse of xmrigDaemon when an error occurs 2017-12-04 21:47:47 +01:00
Ben Gräf
e2bc90fd10 Cleanup 2017-12-04 17:26:25 +01:00