Commit 23cd22a5a539f8d831faa3b376ea33cba73a222b
2010-11-25T00:49:39
RPC URL, username and password become arguments, rather than compile-time constants.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88
diff --git a/cpu-miner.c b/cpu-miner.c
index 38a9149..df1da5e 100644
--- a/cpu-miner.c
+++ b/cpu-miner.c
@@ -39,14 +39,27 @@ static const bool opt_time = true;
static int opt_n_threads = 1;
static pthread_mutex_t stats_mutex = PTHREAD_MUTEX_INITIALIZER;
static uint64_t hash_ctr;
+static char *rpc_url = "http://127.0.0.1:8332/";
+static char *userpass = "rpcuser:rpcpass";
+
static struct argp_option options[] = {
- { "threads", 't', "N", 0,
- "Number of miner threads (default: 1)" },
{ "debug", 'D', NULL, 0,
"Enable debug output" },
+
{ "protocol-dump", 'P', NULL, 0,
"Verbose dump of protocol-level activities" },
+
+ { "threads", 't', "N", 0,
+ "Number of miner threads (default: 1)" },
+
+ { "url", 1001, "URL", 0,
+ "URL for bitcoin JSON-RPC server "
+ "(default: http://127.0.0.1:8332/)" },
+
+ { "userpass", 1002, "USER:PASS", 0,
+ "Username:Password pair for bitcoin JSON-RPC server "
+ "(default: rpcuser:rpcpass)" },
{ }
};
@@ -381,9 +394,6 @@ static uint32_t scanhash(unsigned char *midstate, unsigned char *data,
}
}
-static const char *url = "http://127.0.0.1:8332/";
-static const char *userpass = "pretzel:smooth";
-
static void submit_work(struct work *work)
{
char *hexstr = NULL, *s = NULL;
@@ -408,7 +418,7 @@ static void submit_work(struct work *work)
fprintf(stderr, "DBG: sending RPC call:\n%s", s);
/* issue JSON-RPC request */
- val = json_rpc_call(url, userpass, s);
+ val = json_rpc_call(rpc_url, userpass, s);
if (!val) {
fprintf(stderr, "submit_work json_rpc_call failed\n");
goto out;
@@ -437,7 +447,7 @@ static void *miner_thread(void *dummy)
uint32_t nonce;
/* obtain new work from bitcoin */
- val = json_rpc_call(url, userpass, rpc_req);
+ val = json_rpc_call(rpc_url, userpass, rpc_req);
if (!val) {
fprintf(stderr, "json_rpc_call failed\n");
return NULL;
@@ -479,11 +489,24 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
break;
case 't':
v = atoi(arg);
- if (v < 1 || v > 9999) /* sanity check */
+ if (v < 1 || v > 9999) /* sanity check */
argp_usage(state);
opt_n_threads = v;
break;
+ case 1001: /* --url */
+ if (strncmp(arg, "http://", 7) &&
+ strncmp(arg, "https://", 8))
+ argp_usage(state);
+
+ rpc_url = arg;
+ break;
+ case 1002: /* --userpass */
+ if (!strchr(arg, ':'))
+ argp_usage(state);
+
+ userpass = arg;
+ break;
case ARGP_KEY_ARG:
argp_usage(state); /* too many args */
break;