Browse Source

Store the full stratum url information in rpc_url for correct configuration file saving.

nfactor-troky
Con Kolivas 12 years ago
parent
commit
298ffcbc9e
  1. 13
      cgminer.c

13
cgminer.c

@ -563,6 +563,7 @@ bool detect_stratum(struct pool *pool, char *url)
return false; return false;
if (!strncasecmp(url, "stratum+tcp://", 14)) { if (!strncasecmp(url, "stratum+tcp://", 14)) {
pool->rpc_url = strdup(url);
pool->has_stratum = true; pool->has_stratum = true;
pool->stratum_url = pool->sockaddr_url; pool->stratum_url = pool->sockaddr_url;
return true; return true;
@ -582,11 +583,8 @@ static char *set_url(char *arg)
arg = get_proxy(arg, pool); arg = get_proxy(arg, pool);
if (detect_stratum(pool, arg)) { if (detect_stratum(pool, arg))
if (!pool->rpc_url)
pool->rpc_url = strdup(pool->stratum_url);
return NULL; return NULL;
}
opt_set_charp(arg, &pool->rpc_url); opt_set_charp(arg, &pool->rpc_url);
if (strncmp(arg, "http://", 7) && if (strncmp(arg, "http://", 7) &&
@ -6339,12 +6337,11 @@ static bool input_pool(bool live)
pool = add_pool(); pool = add_pool();
if (detect_stratum(pool, url)) if (!detect_stratum(pool, url) && strncmp(url, "http://", 7) &&
url = strdup(pool->stratum_url); strncmp(url, "https://", 8)) {
else if (strncmp(url, "http://", 7) && strncmp(url, "https://", 8)) {
char *httpinput; char *httpinput;
httpinput = malloc(255); httpinput = malloc(256);
if (!httpinput) if (!httpinput)
quit(1, "Failed to malloc httpinput"); quit(1, "Failed to malloc httpinput");
strcpy(httpinput, "http://"); strcpy(httpinput, "http://");

Loading…
Cancel
Save