Merge remote-tracking branch 'github-pull/128/head' + minor change (PROXY protocol)

Author: luke-jr

src/datum_conf.c

@@ -90,6 +90,8 @@ const T_DATUM_CONFIG_ITEM datum_config_options[] = {
 		.required = false, .ptr = &datum_config.stratum_v1_max_threads,					.default_int = 8 },
 	{ .var_type = DATUM_CONF_INT, 		.category = "stratum", 		.name = "max_clients",				.description = "Maximum total Stratum clients before rejecting connections",
 		.required = false, .ptr = &datum_config.stratum_v1_max_clients, 				.default_int = 1024 },
+	{ .var_type = DATUM_CONF_INT, 		.category = "stratum", 		.name = "trust_proxy",		.description = "Enable support for the PROXY protocol, trusting up to the specified number of levels deep of proxies (-1 to disable entirely)",
+		.required = false, .ptr = &datum_config.stratum_v1_trust_proxy, 	.default_int = -1 },
 	{ .var_type = DATUM_CONF_INT, 		.category = "stratum", 		.name = "vardiff_min",				.description = "Work difficulty floor",
 		.required = false, .ptr = &datum_config.stratum_v1_vardiff_min, 				.default_int = 16384 },
 	{ .var_type = DATUM_CONF_INT, 		.category = "stratum", 		.name = "vardiff_target_shares_min",.description = "Adjust work difficulty to target this many shares per minute",

src/datum_conf.h

@@ -110,6 +110,7 @@ typedef struct {
 	int stratum_v1_max_clients;
 	int stratum_v1_max_threads;
 	int stratum_v1_max_clients_per_thread;
+	int stratum_v1_trust_proxy;
 
 	int stratum_v1_vardiff_min;
 	int stratum_v1_vardiff_target_shares_min;

src/datum_sockets.c

@@ -141,6 +141,7 @@ void *datum_threadpool_thread(void *arg) {
 					my->client_data[i].new_connection = false;
 					my->client_data[i].in_buf = 0;
 					my->client_data[i].out_buf = 0;
+					my->client_data[i].proxy_line_read = 0;
 
 					// add to epoll for this thread
 					my->ev.events = EPOLLIN  | EPOLLONESHOT | EPOLLERR; // | EPOLLRDHUP
@@ -269,6 +270,31 @@ void *datum_threadpool_thread(void *arg) {
 
 						while (end_line != NULL) {
 							*end_line = 0; // null terminate the line
+							if (datum_config.stratum_v1_trust_proxy != -1 && my->client_data[cidx].proxy_line_read != -1) {
+								if (strncmp(start_line, "PROXY ", 6) == 0) {
+									my->client_data[cidx].proxy_line_read += 1;
+									if (my->client_data[cidx].proxy_line_read <= datum_config.stratum_v1_trust_proxy) {
+										char src_ip[DATUM_MAX_IP_LEN + 1];
+										int matched = sscanf(start_line, "PROXY TCP4 %15s", src_ip);
+										if (matched != 1) {
+											matched = sscanf(start_line, "PROXY TCP6 %45s", src_ip);
+										}
+										if (matched == 1 && src_ip[0] != 0) {
+											DLOG_DEBUG("New proxy IP detected: %s on TID: %d, CID: %d", src_ip, my->thread_id, my->client_data[cidx].cid);
+											strcpy(my->client_data[cidx].rem_host, src_ip);
+										}
+										else {
+											DLOG_DEBUG("PROXY line present but no valid IP found, keeping original source IP: %s on TID: %d, CID: %d", my->client_data[cidx].rem_host, my->thread_id, my->client_data[cidx].cid);
+										}
+									}
+									start_line = end_line + 1;
+									end_line = strchr(start_line, '\n');
+									continue;
+								} else {
+									DLOG_DEBUG("Received non-PROXY line from client %d/%d", my->thread_id, my->client_data[cidx].cid);
+									my->client_data[cidx].proxy_line_read = -1;
+								}
+							}
 							// this function can not be NULL
 							j = my->app->client_cmd_func(&my->client_data[cidx], start_line);
 							if (j < 0) {

src/datum_sockets.h

@@ -79,6 +79,8 @@ typedef struct T_DATUM_CLIENT_DATA {
 
 	void *app_client_data;
 
+	int proxy_line_read;
+	
 	T_DATUM_THREAD_DATA *datum_thread;
 } T_DATUM_CLIENT_DATA;