Browse Source

Show only the URL in the status bar to avoid long prefixes making for extra long lines.

nfactor-troky
Con Kolivas 12 years ago
parent
commit
d9276557f1
  1. 8
      cgminer.c
  2. 1
      util.c

8
cgminer.c

@ -552,10 +552,10 @@ static char *set_rr(enum pool_strategy *strategy)
* stratum+tcp or by detecting a stratum server response */ * stratum+tcp or by detecting a stratum server response */
bool detect_stratum(struct pool *pool, char *url) bool detect_stratum(struct pool *pool, char *url)
{ {
if (opt_scrypt) if (!extract_sockaddr(pool, url))
return false; return false;
if (!extract_sockaddr(pool, url)) if (opt_scrypt)
return false; return false;
if (!strncasecmp(url, "stratum+tcp://", 14)) { if (!strncasecmp(url, "stratum+tcp://", 14)) {
@ -1588,13 +1588,13 @@ static void curses_print_status(void)
wclrtoeol(statuswin); wclrtoeol(statuswin);
if (pool->has_stratum) { if (pool->has_stratum) {
mvwprintw(statuswin, 4, 0, " Connected to %s with stratum as user %s", mvwprintw(statuswin, 4, 0, " Connected to %s with stratum as user %s",
pool->stratum_url, pool->rpc_user); pool->sockaddr_url, pool->rpc_user);
} else if ((pool_strategy == POOL_LOADBALANCE || pool_strategy == POOL_BALANCE) && total_pools > 1) { } else if ((pool_strategy == POOL_LOADBALANCE || pool_strategy == POOL_BALANCE) && total_pools > 1) {
mvwprintw(statuswin, 4, 0, " Connected to multiple pools with%s LP", mvwprintw(statuswin, 4, 0, " Connected to multiple pools with%s LP",
have_longpoll ? "": "out"); have_longpoll ? "": "out");
} else { } else {
mvwprintw(statuswin, 4, 0, " Connected to %s with%s LP as user %s", mvwprintw(statuswin, 4, 0, " Connected to %s with%s LP as user %s",
pool->rpc_url, have_longpoll ? "": "out", pool->rpc_user); pool->sockaddr_url, have_longpoll ? "": "out", pool->rpc_user);
} }
wclrtoeol(statuswin); wclrtoeol(statuswin);
mvwprintw(statuswin, 5, 0, " Block: %s... Started: %s Best share: %s ", current_hash, blocktime, best_share); mvwprintw(statuswin, 5, 0, " Block: %s... Started: %s Best share: %s ", current_hash, blocktime, best_share);

1
util.c

@ -823,6 +823,7 @@ bool extract_sockaddr(struct pool *pool, char *url)
struct addrinfo hints, *res; struct addrinfo hints, *res;
int url_len, port_len = 0; int url_len, port_len = 0;
pool->sockaddr_url = url;
url_begin = strstr(url, "//"); url_begin = strstr(url, "//");
if (!url_begin) if (!url_begin)
url_begin = url; url_begin = url;

Loading…
Cancel
Save