From 69124695cc68a16fd0d2598a745007c821aff884 Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Tue, 16 Jun 2015 13:19:58 +1000
Subject: [PATCH] Add options for supporting a passthrough node

---
 src/ckpool.c | 25 +++++++++++++++++--------
 src/ckpool.h |  3 +++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/ckpool.c b/src/ckpool.c
index 2d5b54a3..8a6c5895 100644
--- a/src/ckpool.c
+++ b/src/ckpool.c
@@ -1472,6 +1472,7 @@ static struct option long_options[] = {
 	{"killold",	no_argument,		0,	'k'},
 	{"log-shares",	no_argument,		0,	'L'},
 	{"loglevel",	required_argument,	0,	'l'},
+	{"node",	no_argument,		0,	'N'},
 	{"name",	required_argument,	0,	'n'},
 	{"passthrough",	no_argument,		0,	'P'},
 	{"proxy",	no_argument,		0,	'p'},
@@ -1490,6 +1491,7 @@ static struct option long_options[] = {
 	{"killold",	no_argument,		0,	'k'},
 	{"log-shares",	no_argument,		0,	'L'},
 	{"loglevel",	required_argument,	0,	'l'},
+	{"node",	no_argument,		0,	'N'},
 	{"name",	required_argument,	0,	'n'},
 	{"passthrough",	no_argument,		0,	'P'},
 	{"proxy",	no_argument,		0,	'p'},
@@ -1537,7 +1539,7 @@ int main(int argc, char **argv)
 		ckp.initial_args[ckp.args] = strdup(argv[ckp.args]);
 	ckp.initial_args[ckp.args] = NULL;
 
-	while ((c = getopt_long(argc, argv, "Ac:Dd:g:HhkLl:n:PpRS:s:", long_options, &i)) != -1) {
+	while ((c = getopt_long(argc, argv, "Ac:Dd:g:HhkLl:Nn:PpRS:s:", long_options, &i)) != -1) {
 		switch (c) {
 			case 'A':
 				ckp.standalone = true;
@@ -1588,22 +1590,27 @@ int main(int argc, char **argv)
 					     LOG_EMERG, LOG_DEBUG, ckp.loglevel);
 				}
 				break;
+			case 'N':
+				if (ckp.proxy || ckp.redirector || ckp.passthrough)
+					quit(1, "Cannot set combinations of proxy, node, redirector and passthrough");
+				ckp.standalone = ckp.node = ckp.proxy = ckp.passthrough = true;
+				break;
 			case 'n':
 				ckp.name = optarg;
 				break;
 			case 'P':
-				if (ckp.proxy || ckp.redirector)
-					quit(1, "Cannot set both proxy or redirector and passthrough mode");
+				if (ckp.node || ckp.proxy || ckp.redirector)
+					quit(1, "Cannot set combinations of proxy, node, redirector and passthrough");
 				ckp.standalone = ckp.proxy = ckp.passthrough = true;
 				break;
 			case 'p':
-				if (ckp.passthrough || ckp.redirector)
-					quit(1, "Cannot set both passthrough or redirector and proxy mode");
+				if (ckp.node || ckp.passthrough || ckp.redirector)
+					quit(1, "Cannot set combinations of proxy, node, redirector and passthrough");
 				ckp.proxy = true;
 				break;
 			case 'R':
-				if (ckp.proxy || ckp.passthrough)
-					quit(1, "Cannot set both proxy or passthrough and redirector modes");
+				if (ckp.node || ckp.proxy || ckp.passthrough)
+					quit(1, "Cannot set combinations of proxy, node, redirector and passthrough");
 				ckp.standalone = ckp.proxy = ckp.passthrough = ckp.redirector = true;
 				break;
 			case 'S':
@@ -1616,7 +1623,9 @@ int main(int argc, char **argv)
 	}
 
 	if (!ckp.name) {
-		if (ckp.redirector)
+		if (ckp.node)
+			ckp.name = "cknode";
+		else if (ckp.redirector)
 			ckp.name = "ckredirector";
 		else if (ckp.passthrough)
 			ckp.name = "ckpassthrough";
diff --git a/src/ckpool.h b/src/ckpool.h
index cd62bcd6..f23dedf4 100644
--- a/src/ckpool.h
+++ b/src/ckpool.h
@@ -180,6 +180,9 @@ struct ckpool_instance {
 	/* Are we a redirecting passthrough */
 	bool redirector;
 
+	/* Are we a relay node passthrough */
+	bool node;
+
 	/* Are we running as a proxy */
 	bool proxy;