Noel Maersk
e46581dea1
Remove --vectors (current kernel only supports 1 vector).
...
The functionality to set the number of vectors still remains, though.
2014-01-15 17:03:50 +02:00
Noel Maersk
e6b5fb7aa8
core: remove deprecated --scrypt option.
2014-01-15 16:45:04 +02:00
Noel Maersk
50066cf3c7
misc: Replace all remaining instances of 'cgminer' with 'sgminer'.
...
sed again.
2014-01-15 16:36:48 +02:00
Noel Maersk
6ea3b93809
core: fix build error due to CGMINER_PREFIX reference.
2014-01-15 16:03:24 +02:00
Noel Maersk
9d16ff98f5
doc: reference veox/sgminer in ChangeLog.
2014-01-15 15:58:51 +02:00
Noel Maersk
683abd0b17
build: fix warning + other small fixes.
2014-01-15 15:52:05 +02:00
Noel Maersk
5b977125fa
misc: Replace many (but not all) instances of 'cgminer' with 'sgminer'.
...
Just ran a `sed -i 's/cgminer/sgminer/'` on several files.
2014-01-15 15:36:19 +02:00
Noel Maersk
909af927c3
Merge pull request #2 from veox/forward-port
...
Forward-port relevant changes up to ckolivas/cgminer 3.10.0
2014-01-15 04:43:24 -08:00
Kano
65518d3712
api.c no decref if not json
2014-01-15 14:32:31 +02:00
Con Kolivas
350fe7f135
Minimise risk of nonce2 overflow with small nonce2 lengths by always encoding the work little endian, and increasing the maximum size of nonce2 to 8 bytes.
2014-01-15 14:31:28 +02:00
Con Kolivas
9628207066
Provide a helper function that can reset cgsems to zero.
2014-01-15 14:28:24 +02:00
Con Kolivas
155945094f
Add to cgminer_CPPFLAGS instead of redefining them.
...
Conflicts:
Makefile.am
2014-01-15 13:54:14 +02:00
Noel Maersk
747d870d32
build: remove reference to a linux-usb-miner
2014-01-15 13:49:01 +02:00
Con Kolivas
d26fb09e7c
Replace deprecated use of INCLUDES with _CPPFLAGS.
...
Conflicts:
Makefile.am
2014-01-15 13:48:33 +02:00
Con Kolivas
1ca4198a45
Quieten down jansson component of build.
2014-01-15 13:44:49 +02:00
Tim Bateman
0a187bdd41
Fixed one byte stack overflow in mcast recvfrom.
...
The actual overflow happens when enforcing the NULL termination shortly
after the recvfrom.
2014-01-15 13:43:10 +02:00
Con Kolivas
65d9136dd5
Fix json parsing in api.c
2014-01-15 13:39:51 +02:00
Con Kolivas
79521fe8f0
Initialise devices before attempting to connect to pools to allow their thread prepare function to be called before having to connect to pools.
...
Conflicts:
cgminer.c
2014-01-15 13:38:44 +02:00
Con Kolivas
7d2cee3066
Drop json stratum auth failed message log level to verbose.
2014-01-15 13:35:19 +02:00
Con Kolivas
39b7bc26cb
Silence irrelevant warning.
2014-01-15 13:34:31 +02:00
Con Kolivas
05d69bf75c
Provide a function to discard queued work based on age. (NOTE: may be unused)
2014-01-15 13:25:30 +02:00
Con Kolivas
ebeb710375
Decrement json references in api.c to not leak memory.
...
The json_val in api.c is a borrowed reference, not a new one so don't decref it.
2014-01-15 13:22:28 +02:00
ouɐɹɔs ʞɹɐɯ
c8b97fbd8a
line 2913 added urlencode
...
There was a cross site scripting vulnerability due to insufficient input sanitation on the $pg parameter. This patch fixes that issue.
2014-01-15 13:21:00 +02:00
Con Kolivas
93782c30ed
Update api example compilation instructions.
2014-01-15 13:20:14 +02:00
Con Kolivas
7dd8b316ac
Prevent a deadlock with use of restart_threads by spawning a thread to send the driver flush work messages.
...
Conflicts:
cgminer.c
2014-01-15 13:19:30 +02:00
Con Kolivas
39121183e1
Set priority of various threads if possible.
...
Conflicts:
cgminer.c
2014-01-15 12:59:54 +02:00
Con Kolivas
e9f20f5e0b
Do not hold the mining thread lock in restart_threads when calling the driver flush work commands.
2014-01-15 12:54:33 +02:00
Con Kolivas
b5eddd1159
Don't run device restart code if the device is not enabled.
2014-01-15 12:53:41 +02:00
Con Kolivas
9ed6c3b1b5
Provide a function for setting the work ntime.
2014-01-15 12:49:48 +02:00
Kano
89000ffb1a
api.c trylock() add missing locklock
2014-01-15 12:48:11 +02:00
Maksym Borodin
d976abe12d
api.c: Release apisock on error in api()
2014-01-15 12:45:51 +02:00
Maksym Borodin
7383e19a9d
api.c: Release io_data->ptr when releasing io_data in io_free()
2014-01-15 12:45:29 +02:00
Con Kolivas
f1902fe6ac
We can't connect to a GBT pool at all with fix protocol enabled.
2014-01-15 12:44:56 +02:00
Noel Maersk
cb806d2437
core: Display difficulty in cgminer style, not true network difficulty (for consistency within the interface).
...
This regression was introduced by commit 3f6b9d6796
.
2014-01-14 19:33:20 +02:00
Noel Maersk
08727c1a57
Update authors.
...
Still pulling from ckolivas/cgminer, so note that.
2014-01-14 19:02:58 +02:00
Noel Maersk
4c99829179
Merge pull request #1 from veox/forward-port
...
Forward port
Pull in changes in ckolivas/cgminer (up to commit 8fa5ddf
, made on Wed Nov 13 11:57:29 2013 +0100).
This is still useful for all functionality not related to SHA256d/Scrypt mining. Obviously, ckolivas/cgminer developers are few bits more familiar with the code base.
2014-01-14 08:44:32 -08:00
Maksym Borodin
8fa5ddfd2c
util.c: Decreasing reference count on allocated JSON obects to prevent memory leak
2014-01-14 18:35:56 +02:00
Con Kolivas
cd7f6ed56a
Initialise the stgd lock mutex earlier to prevent dereferences when pool testing occurs before it.
...
Conflicts:
cgminer.c
2014-01-14 18:33:59 +02:00
Con Kolivas
694a98ece3
--shares should be scaled to diff1 not absolute number of shares
2014-01-14 18:31:15 +02:00
Con Kolivas
cd03fcdf2d
Reset the work_restart bool after the scanwork loop in case the driver flushes work synchronously.
2014-01-14 18:25:36 +02:00
Con Kolivas
75c5ac0457
Only check for the stratum clean message if we have had a valid message.
2014-01-14 18:24:29 +02:00
Con Kolivas
d38802a68f
Get rid of the stage thread since all work can be asynchronously added now via hash_push anyway.
...
Conflicts:
cgminer.c
2014-01-14 18:19:57 +02:00
Con Kolivas
c9bf06d19b
Break out of the hash work loops when a failure is detected instead of dropping into mt disable.
2014-01-13 21:24:57 +02:00
ckolivas
d9b3037e4b
Fix build for no libcurl
2014-01-13 21:19:15 +02:00
Noel Maersk
be0270408f
doc: update README, rename CONFIGURATION back to SCRYPT.
2014-01-13 11:21:11 +02:00
Noel Maersk
e4680ab627
core: allow changing TCP keepalive packet idle time using tcp-keepalive
command-line option or config-file option.
...
This may be useful in certain scenarios. However, server load from keepalive
is increased 6-fold if code is hard-changed from 30 to 5. So, provide it as
an option instead, and use the previous value as a default (30).
Explanation from
015c064396
Kevin's middlecoin fix, CURL TCP keepalive constants lowered:
CURLOPT_TCP_KEEPIDLE from 45 to 5 and CURLOPT_TCP_KEEPINTVL from 30 to
5. Before it'd trigger a keepalive packet after 45 seconds of connection
idle time and then again every 30 seconds. Now it triggers a keepalive
packet after 5 seconds of connection idle time and then again every 5
seconds.
It makes the client more resilient against coin switching pools or just
pools with connection issues in general. It will however add a tiny bit
pressure to the pool server; but a TCP keepalive probe is only about
60-80 bytes, so I don't think it is an issue.
2014-01-12 19:45:31 +02:00
Noel Maersk
bb5065b601
core: Remove two unused functions.
...
They were previously necessary to switch between SHA256d and Scrypt.
2014-01-12 17:46:57 +02:00
Noel Maersk
211da58a73
Remove a few stray ASIC defines.
2014-01-12 17:40:59 +02:00
Noel Maersk
d6f5f01e88
doc: move to separate directory.
2014-01-12 16:00:06 +02:00
Noel Maersk
21289de654
misc: Remove LICENSE (use COPYING).
2014-01-12 15:44:05 +02:00