From 169b8a4a758d62023ac7cb24e2b623eba0a45bbf Mon Sep 17 00:00:00 2001
From: Jan Vidar Krey <janvidar@extatic.org>
Date: Wed, 18 Aug 2010 23:32:53 +0200
Subject: [PATCH] Added option to redirect from adc:// to adcs:// if tls is
 required.

---
 GNUmakefile           |  2 +-
 src/core/config.xml   | 11 +++++++++++
 src/core/gen_config.c | 17 +++++++++++++++++
 src/core/gen_config.h |  1 +
 src/core/probe.c      |  3 +--
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index f46d315..2f22a6e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -10,7 +10,7 @@ LD            := $(CC)
 MV            := mv
 RANLIB        := ranlib
 CFLAGS        += -pipe -Wall
-USE_SSL       ?= NO
+USE_SSL       ?= YES
 USE_BIGENDIAN ?= AUTO
 BITS          ?= AUTO
 SILENT        ?= YES
diff --git a/src/core/config.xml b/src/core/config.xml
index b8066ea..895314c 100644
--- a/src/core/config.xml
+++ b/src/core/config.xml
@@ -417,6 +417,17 @@
 		<since>0.3.0</since>
 	</option>
 
+	<option name="tls_require_redirect_addr" type="string" default="">
+		<check regexp="(adc|adcs|dchub)://.*" />
+		<short>A redirect address in case a client connects using "adc://" when "adcs://" is required.</short>
+		<description><![CDATA[
+		This is the redirect address used when the hub wants to redirect a client for not using ADCS.
+		For instance a hub at adc://adc.example.com might redirect to adcs://adc.example.com
+		]]></description>
+		<since>0.3.3</since>
+	</option>
+
+
 	<option name="tls_certificate" type="file" default="">
 		<short>Certificate file</short>
 		<description><![CDATA[
diff --git a/src/core/gen_config.c b/src/core/gen_config.c
index 82ce22c..9279ad1 100644
--- a/src/core/gen_config.c
+++ b/src/core/gen_config.c
@@ -42,6 +42,7 @@ void config_defaults(struct hub_config* config)
 	config->flood_ctl_extras = 0;
 	config->tls_enable = 0;
 	config->tls_require = 0;
+	config->tls_require_redirect_addr = hub_strdup("");
 	config->tls_certificate = hub_strdup("");
 	config->tls_private_key = hub_strdup("");
 	config->file_motd = hub_strdup("");
@@ -496,6 +497,17 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		return 0;
 	}
 
+	if (!strcmp(key, "tls_require_redirect_addr"))
+	{
+		if (!apply_string(key, data, &config->tls_require_redirect_addr, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			LOG_ERROR("\"tls_require_redirect_addr\" (string), default=\"\"");
+			return -1;
+		}
+		return 0;
+	}
+
 	if (!strcmp(key, "tls_certificate"))
 	{
 		if (!apply_string(key, data, &config->tls_certificate, (char*) ""))
@@ -933,6 +945,8 @@ void free_config(struct hub_config* config)
 
 	hub_free(config->redirect_addr);
 
+	hub_free(config->tls_require_redirect_addr);
+
 	hub_free(config->tls_certificate);
 
 	hub_free(config->tls_private_key);
@@ -1141,6 +1155,9 @@ void dump_config(struct hub_config* config, int ignore_defaults)
 	if (!ignore_defaults || config->tls_require != 0)
 		fprintf(stdout, "tls_require = %s\n", config->tls_require ? "yes" : "no");
 
+	if (!ignore_defaults || strcmp(config->tls_require_redirect_addr, "") != 0)
+		fprintf(stdout, "tls_require_redirect_addr = \"%s\"\n", config->tls_require_redirect_addr);
+
 	if (!ignore_defaults || strcmp(config->tls_certificate, "") != 0)
 		fprintf(stdout, "tls_certificate = \"%s\"\n", config->tls_certificate);
 
diff --git a/src/core/gen_config.h b/src/core/gen_config.h
index a19e65d..d3aca24 100644
--- a/src/core/gen_config.h
+++ b/src/core/gen_config.h
@@ -42,6 +42,7 @@ struct hub_config
 	int   flood_ctl_extras;                /*<<< Max extra messages allowed in time interval (default: 0) */
 	int   tls_enable;                      /*<<< Enable SSL/TLS support (default: 0) */
 	int   tls_require;                     /*<<< If SSL/TLS enabled, should it be required (default: 0) (default: 0) */
+	char* tls_require_redirect_addr;       /*<<< A redirect address in case a client connects using "adc://" when "adcs://" is required. (default: ) */
 	char* tls_certificate;                 /*<<< Certificate file (default: ) */
 	char* tls_private_key;                 /*<<< Private key file (default: ) */
 	char* file_motd;                       /*<<< File containing the 'message of the day (default: ) */
diff --git a/src/core/probe.c b/src/core/probe.c
index c7fb620..f14f2f5 100644
--- a/src/core/probe.c
+++ b/src/core/probe.c
@@ -71,9 +71,8 @@ static void probe_net_event(struct net_connection* con, int events, void *arg)
 				probe_destroy(probe);
 				return;
 			}
-
 #ifdef SSL_SUPPORT
-			if (bytes >= 11 &&
+			else if (bytes >= 11 &&
 				probe_recvbuf[0] == 22 && 
 				probe_recvbuf[1] == 3 && /* protocol major version */
 				probe_recvbuf[5] == 1 && /* message type */