advertise SSL port (if configured)

master
Jethro Grassie 4 years ago
parent 9a091921f1
commit 9ba84a4a76
No known key found for this signature in database
GPG Key ID: DE8ED755616565BB

@ -1,4 +1,5 @@
pool-port = 4242
pool-ssl-port =
webui-port = 4243
rpc-host = 127.0.0.1
rpc-port = 28081

@ -137,6 +137,7 @@ typedef struct config_t
double pool_fee;
double payment_threshold;
uint32_t pool_port;
uint32_t pool_ssl_port;
uint32_t log_level;
uint32_t webui_port;
char log_file[MAX_PATH];
@ -2644,6 +2645,7 @@ read_config(const char *config_file)
config.pool_fee = 0.01;
config.payment_threshold = 0.33;
config.pool_port = 4242;
config.pool_ssl_port = 0;
config.log_level = 5;
config.webui_port = 4243;
config.block_notified = false;
@ -2700,6 +2702,10 @@ read_config(const char *config_file)
{
config.pool_port = atoi(val);
}
else if (strcmp(key, "pool-ssl-port") == 0)
{
config.pool_ssl_port = atoi(val);
}
else if (strcmp(key, "webui-port") == 0)
{
config.webui_port = atoi(val);
@ -2796,6 +2802,7 @@ static void print_config()
{
log_info("\nCONFIG:\n"
" pool-port = %u\n"
" pool-ssl-port = %u\n"
" webui-port=%u\n"
" rpc-host = %s\n"
" rpc-port = %u\n"
@ -2816,6 +2823,7 @@ static void print_config()
" pid-file = %s\n"
" forked = %u\n",
config.pool_port,
config.pool_ssl_port,
config.webui_port,
config.rpc_host,
config.rpc_port,
@ -3081,6 +3089,7 @@ int main(int argc, char **argv)
uic.pool_stats = &pool_stats;
uic.pool_fee = config.pool_fee;
uic.pool_port = config.pool_port;
uic.pool_ssl_port = config.pool_ssl_port;
uic.allow_self_select = !config.disable_self_select;
uic.payment_threshold = config.payment_threshold;
start_web_ui(&uic);

@ -54,6 +54,7 @@
<tr><td>Payment threshold: </td><td id="payment_threshold"></td></tr>
<tr><td>Pool fee: </td><td id="pool_fee"></td></tr>
<tr><td>Pool port: </td><td id="pool_port"></td></tr>
<tr><td>Pool SSL port: </td><td id="pool_ssl_port"></td></tr>
<tr><td>Allow self-select: </td><td id="allow_self_select"></td></tr>
<tr><td>Miners connected: </td><td id="connected_miners"></td></tr>
<tr class="miner"><td>Your HR: </td><td id="miner_hashrate"></td></tr>
@ -122,6 +123,12 @@
el.innerHTML = (stats[e]*100) + "%";
else if (e == "allow_self_select")
el.innerHTML = stats[e] == 1 ? "Yes" : "No";
else if (e == "pool_ssl_port")
{
el.closest("tr").style = "display: " +
(stats[e] == 0 ? "none;" : "table-row;");
el.innerHTML = stats[e];
}
else
el.innerHTML = stats[e];
}

@ -100,13 +100,15 @@ send_json_stats(struct evhttp_request *req, void *arg)
"\"payment_threshold\":%.2f,"
"\"pool_fee\":%.3f,"
"\"pool_port\":%d,"
"\"pool_ssl_port\":%d,"
"\"allow_self_select\":%u,"
"\"connected_miners\":%d,"
"\"miner_hashrate\":%"PRIu64","
"\"miner_balance\":%.8f"
"}", ph, nh, height, ltf, lbf, pbf,
context->payment_threshold, context->pool_fee,
context->pool_port, ss, context->pool_stats->connected_miners,
context->pool_port, context->pool_ssl_port,
ss, context->pool_stats->connected_miners,
mh, mb);
hdrs_out = evhttp_request_get_output_headers(req);
evhttp_add_header(hdrs_out, "Content-Type", "application/json");

@ -54,6 +54,7 @@ typedef struct wui_context_t
double pool_fee;
double payment_threshold;
uint32_t pool_port;
uint32_t pool_ssl_port;
unsigned allow_self_select;
} wui_context_t;

Loading…
Cancel
Save