markow
/
ckpool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Rename remote trusted server's bool to trusted.

master
Con Kolivas 8 years ago
parent
718c2dcadf
commit
eab4762c34
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/stratifier.c

14
src/stratifier.c
Unescape View File

@ -311,7 +311,7 @@ struct stratum_instance {
int proxyid; /* Which proxy id */ int proxyid; /* Which proxy id */
int subproxyid; /* Which subproxy */ int subproxyid; /* Which subproxy */
bool remote; /* Is this a trusted remote server */ bool trusted; /* Is this a trusted remote server */
}; };
struct share { struct share {
@ -2923,7 +2923,7 @@ static void __drop_client(sdata_t *sdata, stratum_instance_t *client, bool lazil
if (unlikely(client->node)) if (unlikely(client->node))
DL_DELETE(sdata->node_instances, client); DL_DELETE(sdata->node_instances, client);
if (unlikely(client->remote)) if (unlikely(client->trusted))
DL_DELETE(sdata->remote_instances, client); DL_DELETE(sdata->remote_instances, client);
if (client->workername) { if (client->workername) {
if (user) { if (user) {
@ -3107,7 +3107,7 @@ static void stratum_broadcast(sdata_t *sdata, json_t *val, const int msg_type)
if (sdata != ckp_sdata && client->sdata != sdata) if (sdata != ckp_sdata && client->sdata != sdata)
continue; continue;
if (!client_active(client) || client->node || client->remote) if (!client_active(client) || client->node || client->trusted)
continue; continue;
/* Only send messages to whitelisted clients */ /* Only send messages to whitelisted clients */
@ -3158,7 +3158,7 @@ static void stratum_add_send(sdata_t *sdata, json_t *val, const int64_t client_i
} }
if (remote->node) if (remote->node)
json_set_string(val, "node.method", stratum_msgs[msg_type]); json_set_string(val, "node.method", stratum_msgs[msg_type]);
else if (remote->remote) else if (remote->trusted)
json_set_string(val, "method", stratum_msgs[msg_type]); json_set_string(val, "method", stratum_msgs[msg_type]);
dec_instance_ref(sdata, remote); dec_instance_ref(sdata, remote);
} }
@ -6134,7 +6134,7 @@ static void add_mining_node(ckpool_t *ckp, sdata_t *sdata, stratum_instance_t *c
static void add_remote_server(sdata_t *sdata, stratum_instance_t *client) static void add_remote_server(sdata_t *sdata, stratum_instance_t *client)
{ {
ck_wlock(&sdata->instance_lock); ck_wlock(&sdata->instance_lock);
client->remote = true; client->trusted = true;
DL_APPEND(sdata->remote_instances, client); DL_APPEND(sdata->remote_instances, client);
ck_wunlock(&sdata->instance_lock); ck_wunlock(&sdata->instance_lock);
} }
@ -6900,7 +6900,7 @@ static void srecv_process(ckpool_t *ckp, json_t *val)
if (unlikely(noid)) if (unlikely(noid))
LOGINFO("Stratifier added instance %s server %d", client->identity, server); LOGINFO("Stratifier added instance %s server %d", client->identity, server);
if (client->remote) if (client->trusted)
parse_trusted_msg(ckp, sdata, msg->json_msg, client); parse_trusted_msg(ckp, sdata, msg->json_msg, client);
else if (ckp->node) else if (ckp->node)
node_client_msg(ckp, msg->json_msg, client); node_client_msg(ckp, msg->json_msg, client);
@ -7493,7 +7493,7 @@ static void *statsupdate(void *arg)
* connector if they still exist */ * connector if they still exist */
if (client->dropped) if (client->dropped)
connector_test_client(ckp, client->id); connector_test_client(ckp, client->id);
else if (client->node || client->remote) { else if (client->node || client->trusted) {
/* Do nothing to these */ /* Do nothing to these */
} else if (!client->authorised) { } else if (!client->authorised) {
/* Test for clients that haven't authed in over a minute /* Test for clients that haven't authed in over a minute

Write Preview
Loading…
Cancel
Save