From d9276557f1a29efab7be5decc2d30854ee041725 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Sat, 27 Oct 2012 23:20:10 +1100 Subject: [PATCH] Show only the URL in the status bar to avoid long prefixes making for extra long lines. --- cgminer.c | 8 ++++---- util.c | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cgminer.c b/cgminer.c index 5ad32636..e68d5369 100644 --- a/cgminer.c +++ b/cgminer.c @@ -552,10 +552,10 @@ static char *set_rr(enum pool_strategy *strategy) * stratum+tcp or by detecting a stratum server response */ bool detect_stratum(struct pool *pool, char *url) { - if (opt_scrypt) + if (!extract_sockaddr(pool, url)) return false; - if (!extract_sockaddr(pool, url)) + if (opt_scrypt) return false; if (!strncasecmp(url, "stratum+tcp://", 14)) { @@ -1588,13 +1588,13 @@ static void curses_print_status(void) wclrtoeol(statuswin); if (pool->has_stratum) { 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) { mvwprintw(statuswin, 4, 0, " Connected to multiple pools with%s LP", have_longpoll ? "": "out"); } else { 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); mvwprintw(statuswin, 5, 0, " Block: %s... Started: %s Best share: %s ", current_hash, blocktime, best_share); diff --git a/util.c b/util.c index 9877afe6..cd75c8f3 100644 --- a/util.c +++ b/util.c @@ -823,6 +823,7 @@ bool extract_sockaddr(struct pool *pool, char *url) struct addrinfo hints, *res; int url_len, port_len = 0; + pool->sockaddr_url = url; url_begin = strstr(url, "//"); if (!url_begin) url_begin = url;