Skip to content

Refactor: stratum: Simplify handling of non-string usernames (treated as "NULL") #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luke-jr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor: stratum: Simplify handling of non-string usernames (treated as "NULL") #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 6 additions & 20 deletions src/datum_stratum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
#include "datum_submitblock.h"
#include "datum_protocol.h"

static const char datum_stratum_nonstring_username[] = "NULL";

T_DATUM_SOCKET_APP *global_stratum_app = NULL;

int stratum_job_next = 0;
Expand Down Expand Up @@ -891,7 +893,6 @@ int client_mining_submit(T_DATUM_CLIENT_DATA *c, uint64_t id, json_t *params_obj
// 4 = nonce
// 5 = version roll (OR with version)

json_t *username;
json_t *job_id;
json_t *extranonce2;
json_t *ntime;
Expand Down Expand Up @@ -1177,15 +1178,8 @@ int client_mining_submit(T_DATUM_CLIENT_DATA *c, uint64_t id, json_t *params_obj
return 0;
}

username = json_array_get(params_obj, 0);
if (!username) {
username_s = (const char *)"NULL";
} else {
username_s = json_string_value(username);
if (!username_s) {
username_s = (const char *)"NULL";
}
}
username_s = json_string_value(json_array_get(params_obj, 0));
if (!username_s) username_s = datum_stratum_nonstring_username;

// most important thing to do right here is to check if the share is a block
// there's some downstream failures that can impact the share being valid, but at this point it's
Expand Down Expand Up @@ -1398,19 +1392,11 @@ int client_mining_configure(T_DATUM_CLIENT_DATA *c, uint64_t id, json_t *params_
int client_mining_authorize(T_DATUM_CLIENT_DATA *c, uint64_t id, json_t *params_obj) {
char s[256];
const char *username_s;
json_t *username;

T_DATUM_MINER_DATA * const m = c->app_client_data;

username = json_array_get(params_obj, 0);
if (!username) {
username_s = (const char *)"NULL";
} else {
username_s = json_string_value(username);
if (!username_s) {
username_s = (const char *)"NULL";
}
}
username_s = json_string_value(json_array_get(params_obj, 0));
if (!username_s) username_s = datum_stratum_nonstring_username;

strncpy(m->last_auth_username, username_s, sizeof(m->last_auth_username) - 1);
m->last_auth_username[sizeof(m->last_auth_username)-1] = 0;
Expand Down