Minor work on getting history command to be configurable and also

display a certain number of main chat history lines after login.

ChangeLog

@@ -1,23 +1,3 @@
-0.3.3:
-- Fix SSL/TLS related memory leak.
-- Fix 100% CPU issue with SSL connections.
-- Added option to redirect from adc:// to adcs:// if tls is required.
-- Added more informative error messages for the configuration file parser.
-- Made sure logs can be rotated by sending a SIGHUP to the hub
-- Fix bug #139: Unable to use TLS - due to not handling quotes around configuration strings.
-- Fix bug #136 - !broadcast does not report status back to to sender.
-
-
-0.3.2:
-- Fixed bugs in the kqueue network backend (OSX/BSD)
-- Rewrote the configuration backend code.
-- Added support for escaping characters in the configuration files.
-- Updated the !broadcast command to send private messages instead of main chat messages.
-- Adding support for redirecting clients to other hubs when they fail to log in.
-- Fix some out of memory related crashes.
-- Fixed minor memory leaks.
-
-
 0.3.1:
 - Fixed bug where !getip did not work.
 - Added flood control configuration options.

GNUmakefile

@@ -10,7 +10,7 @@ LD            := $(CC)
 MV            := mv
 RANLIB        := ranlib
 CFLAGS        += -pipe -Wall
-USE_SSL       ?= YES
+USE_SSL       ?= NO
 USE_BIGENDIAN ?= AUTO
 BITS          ?= AUTO
 SILENT        ?= YES

debian/changelog

@@ -1,15 +1,3 @@
-uhub (0.3.3-1) unstable; urgency=low
-
-  * Updated upstream version.
-
-  -- Jan Vidar Krey <janvidar@extatic.org>  Tue 24 Aug 2010 18:00:00 +0200
-
-uhub (0.3.2-1) unstable; urgency=low
-
-  * Updated upstream version.
-
- -- Jan Vidar Krey <janvidar@extatic.org>  Mon 30 May 2010 18:00:00 +0200
-
 uhub (0.3.1-1) unstable; urgency=low
 
   * Updated version number.

doc/uhub.spec

@@ -1,6 +1,6 @@
 Summary: High performance ADC p2p hub.
 Name: uhub
-Version: 0.3.3
+Version: 0.3.1
 Release: 3
 License: GPLv3
 Group: Networking/File transfer

src/adc/message.c

@@ -756,7 +756,7 @@ char* adc_msg_get_argument(struct adc_message* cmd, int offset)
 			else
 			{
 				argument = hub_strdup(&start[1]);
-				if (argument && *argument && argument[strlen(argument)-1] == '\n')
+				if (argument && argument[strlen(argument)-1] == '\n')
 					argument[strlen(argument)-1] = 0;
 			}
 

src/adc/sid.c

@@ -119,7 +119,6 @@ void sid_pool_destroy(struct sid_pool* pool)
 
 sid_t sid_alloc(struct sid_pool* pool, struct hub_user* user)
 {
-	sid_t n;
 	if (pool->count >= (pool->max - pool->min))
 	{
 #ifdef DEBUG_SID
@@ -128,7 +127,7 @@ sid_t sid_alloc(struct sid_pool* pool, struct hub_user* user)
 		return 0;
 	}
 
-	n = (++pool->count);
+	sid_t n = (++pool->count);
 	for (; (pool->map[n % pool->max]); n++) ;
 
 #ifdef DEBUG_SID

src/core/auth.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * Copyright (C) 2007-2009, Jan Vidar Krey
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -176,10 +176,14 @@ static int check_cmd_addr(const char* cmd, struct linked_list* list, char* line,
 
 static int acl_parse_line(char* line, int line_count, void* ptr_data)
 {
+	char* pos;
 	struct acl_handle* handle = (struct acl_handle*) ptr_data;
 	int ret;
 
-	strip_off_ini_line_comments(line, line_count);
+	if ((pos = strchr(line, '#')) != NULL)
+	{
+		pos[0] = 0;
+	}
 
 	line = strip_white_space(line);
 	if (!*line)

src/core/auth.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * Copyright (C) 2007-2009, Jan Vidar Krey
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/core/commands.c

@@ -132,19 +132,40 @@ static int command_status_user_not_found(struct hub_info* hub, struct hub_user*
 const char* command_get_syntax(struct commands_handler* handler)
 {
 	static char args[128];
+	int optional = 0;
 	size_t n = 0;
 	args[0] = 0;
 	if (handler->args)
 	{
 		for (n = 0; n < strlen(handler->args); n++)
 		{
+			// detect optionals
+			if (handler->args[n] == '?')
+			{
+				optional = 1;
+				continue;
+			}
+
 			if (n > 0) strcat(args, " ");
+
+			if (optional)
+			{
+				strcat(args, "[");
+			}
+
 			switch (handler->args[n])
 			{
 				case 'n': strcat(args, "<nick>"); break;
 				case 'c': strcat(args, "<cid>");  break;
 				case 'a': strcat(args, "<addr>"); break;
 				case 'm': strcat(args, "<message>"); break;
+				case 'i': strcat(args, "<number>"); break;
+			}
+
+			if (optional)
+			{
+				strcat(args, "]");
+				optional = 0;
 			}
 		}
 	}
@@ -412,50 +433,11 @@ static int command_whoip(struct hub_info* hub, struct hub_user* user, struct hub
 
 static int command_broadcast(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
 {
-	size_t offset = 12;
+	struct adc_message* command = adc_msg_construct(ADC_CMD_IMSG, strlen((cmd->message + 12)) + 6);
-#if USE_OLD_BROADCAST_STYLE
+	adc_msg_add_argument(command, (cmd->message + 12));
-	struct adc_message* command = adc_msg_construct(ADC_CMD_IMSG, strlen((cmd->message + offset)) + 6);
-	adc_msg_add_argument(command, (cmd->message + offset));
 	route_to_all(hub, command);
 	adc_msg_free(command);
 	return 0;
-#else
-	size_t message_len = strlen(cmd->message + offset);
-	struct adc_message* command = 0;
-	char pm_flag[7] = "PM";
-	char from_sid[5];
-	char buffer[128];
-	size_t recipients = 0;
-	struct hub_user* target;
-
-	memcpy(from_sid, sid_to_string(user->id.sid), sizeof(from_sid));
-	memcpy(pm_flag + 2, from_sid, sizeof(from_sid));
-
-	target = (struct hub_user*) list_get_first(hub->users->list);
-	while (target)
-	{
-		if (target != user)
-		{
-			recipients++;
-			command = adc_msg_construct(ADC_CMD_DMSG, message_len + 23);
-			if (!command)
-				break;
-
-			adc_msg_add_argument(command, from_sid);
-			adc_msg_add_argument(command, sid_to_string(target->id.sid));
-			adc_msg_add_argument(command, (cmd->message + offset));
-			adc_msg_add_argument(command, pm_flag);
-
-			route_to_user(hub, target, command);
-			adc_msg_free(command);
-		}
-		target = (struct hub_user*) list_get_next(hub->users->list);
-	}
-
-	snprintf(buffer, sizeof(buffer), "*** %s: Delivered to " PRINTF_SIZE_T " user%s", cmd->prefix, recipients, (recipients != 1 ? "s" : ""));
-	send_message(hub, user, buffer);
-	return 0;
-#endif
 }
 
 static int command_history(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
@@ -645,7 +627,7 @@ static struct commands_handler command_handlers[] = {
 #endif
 	{ "getip",      5, "n", cred_operator,  command_getip,    "Show IP address for a user"   },
 	{ "help",       4, 0,   cred_guest,     command_help,     "Show this help message."      },
-	{ "history",    7, 0,   cred_guest,     command_history,  "Show the last chat messages." },
+	{ "history",    7, "?i",cred_guest,     command_history,  "Show the last chat messages." },
 	{ "kick",       4, "n", cred_operator,  command_kick,     "Kick a user"                  },
 	{ "log",        3, 0,   cred_operator,  command_log,      "Display log"                  },
 	{ "motd",       4, 0,   cred_guest,     command_motd,     "Show the message of the day"  },

src/core/config.c

@@ -85,8 +85,11 @@ static int config_parse_line(char* line, int line_count, void* ptr_data)
 	char* data;
 	struct hub_config* config = (struct hub_config*) ptr_data;
 
-	strip_off_ini_line_comments(line, line_count);
+	if ((pos = strchr(line, '#')) != NULL)
-	
+	{
+		pos[0] = 0;
+	}
+
 	if (!*line) return 0;
 
 	LOG_DUMP("config_parse_line(): '%s'", line);
@@ -110,7 +113,6 @@ static int config_parse_line(char* line, int line_count, void* ptr_data)
 
 	key = strip_white_space(key);
 	data = strip_white_space(data);
-	data = strip_off_quotes(data);
 
 	if (!*key || !*data)
 	{

src/core/config.pl

@@ -125,7 +125,6 @@ sub write_c_impl_apply(@)
 	my $min;
 	my $max;
 	my $regexp;
-	my $expect = "";
 
 	if (defined $p)
 	{
@@ -142,21 +141,14 @@ sub write_c_impl_apply(@)
 
 	print GENIMPL "\tif (!strcmp(key, \"" . $name . "\"))\n\t{\n";
 
-	$expect = "\\\"$name\\\"";
-
 	if ($type eq "int")
 	{
-		$expect .= " (integer)";
-		$expect .= ", default=" . $default;
-
 		if (defined $min)
 		{
-			$expect .= ", min=" . $min;
 			print GENIMPL "\t\tmin = $min;\n"
 		}
 		if (defined $max)
 		{
-			$expect .= ", max=" . $max;
 			print GENIMPL "\t\tmax = $max;\n"
 		}
 
@@ -186,27 +178,16 @@ sub write_c_impl_apply(@)
 	}
 	elsif ($type eq "boolean")
 	{
-		$expect .= " (boolean)";
-		$expect .= ", default=" . $default;
 		print GENIMPL "\t\tif (!apply_boolean(key, data, &config->$name))\n";
 	}
 	elsif ($type =~ /(string|file|message)/)
 	{
-		$expect .= " (" . $type . ")";
-		$expect .= ", default=\\\"" . $default . "\\\"";
 		print GENIMPL "\t\tif (!apply_string(key, data, &config->$name, (char*) \"\"))\n";
 	}
-	else
-	{
-		$expect = " is unknown.";
-	}
 
 	print GENIMPL "\t\t{\n" .
-				  "\t\t\tLOG_ERROR(\"Configuration parse error on line %d\", line_count);\n";
+				  "\t\t\tLOG_ERROR(\"Configuration parse error on line %d\", line_count);\n" .
-
+				  "\t\t\treturn -1;\n" .
-	print GENIMPL 		  "\t\t\tLOG_ERROR(\"" . $expect . "\");\n" if ($expect ne "");
-
-	print GENIMPL		  "\t\t\treturn -1;\n" .
 				  "\t\t}\n" .
 				  "\t\treturn 0;\n" .
 				  "\t}\n\n";

src/core/config.xml

@@ -211,6 +211,17 @@
 		<since>0.3.0</since>
 	</option>
 
+	<option name="history_on_login" type="int" default="0">
+		<check min="0" max="250" />
+		<short>Send chat message history when logging in</short>
+		<description><![CDATA[
+			This specifies the number of chat messages that are sent to all users when logging in.
+			Users can use the "!history" command to list these messages later.
+		]]></description>
+		<since>0.3.2</since>
+	</option>
+
+
 	<option name="max_logout_log" type="int" default="20">
 		<check min="0" max="2000" />
 		<short>Number of log entries for people leaving the hub</short>
@@ -417,17 +428,6 @@
 		<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[

src/core/gen_config.c

@@ -42,7 +42,6 @@ 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("");
@@ -96,7 +95,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_boolean(key, data, &config->hub_enabled))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"hub_enabled\" (boolean), default=1");
 			return -1;
 		}
 		return 0;
@@ -107,7 +105,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->server_port, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"server_port\" (integer), default=1511");
 			return -1;
 		}
 		return 0;
@@ -118,7 +115,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->server_bind_addr, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"server_bind_addr\" (string), default=\"any\"");
 			return -1;
 		}
 		return 0;
@@ -129,7 +125,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->server_listen_backlog, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"server_listen_backlog\" (integer), default=50");
 			return -1;
 		}
 		return 0;
@@ -140,7 +135,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->server_alt_ports, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"server_alt_ports\" (string), default=\"\"");
 			return -1;
 		}
 		return 0;
@@ -151,7 +145,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_boolean(key, data, &config->show_banner))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"show_banner\" (boolean), default=1");
 			return -1;
 		}
 		return 0;
@@ -162,7 +155,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_boolean(key, data, &config->show_banner_sys_info))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"show_banner_sys_info\" (boolean), default=1");
 			return -1;
 		}
 		return 0;
@@ -175,7 +167,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->max_users, &min, &max))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"max_users\" (integer), default=500, min=1, max=1048576");
 			return -1;
 		}
 		return 0;
@@ -186,7 +177,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_boolean(key, data, &config->registered_users_only))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"registered_users_only\" (boolean), default=0");
 			return -1;
 		}
 		return 0;
@@ -197,7 +187,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_boolean(key, data, &config->obsolete_clients))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"obsolete_clients\" (boolean), default=0");
 			return -1;
 		}
 		return 0;
@@ -208,7 +197,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_boolean(key, data, &config->chat_only))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"chat_only\" (boolean), default=0");
 			return -1;
 		}
 		return 0;
@@ -219,7 +207,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_boolean(key, data, &config->chat_is_privileged))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"chat_is_privileged\" (boolean), default=0");
 			return -1;
 		}
 		return 0;
@@ -230,7 +217,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->hub_name, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"hub_name\" (string), default=\"uhub\"");
 			return -1;
 		}
 		return 0;
@@ -241,7 +227,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->hub_description, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"hub_description\" (string), default=\"no description\"");
 			return -1;
 		}
 		return 0;
@@ -252,7 +237,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->redirect_addr, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"redirect_addr\" (string), default=\"\"");
 			return -1;
 		}
 		return 0;
@@ -263,7 +247,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->max_recv_buffer, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"max_recv_buffer\" (integer), default=4096");
 			return -1;
 		}
 		return 0;
@@ -274,7 +257,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->max_send_buffer, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"max_send_buffer\" (integer), default=131072");
 			return -1;
 		}
 		return 0;
@@ -285,7 +267,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->max_send_buffer_soft, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"max_send_buffer_soft\" (integer), default=98304");
 			return -1;
 		}
 		return 0;
@@ -296,7 +277,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_boolean(key, data, &config->low_bandwidth_mode))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"low_bandwidth_mode\" (boolean), default=0");
 			return -1;
 		}
 		return 0;
@@ -307,7 +287,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->max_chat_history, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"max_chat_history\" (integer), default=20");
 			return -1;
 		}
 		return 0;
@@ -318,7 +297,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->max_logout_log, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"max_logout_log\" (integer), default=20");
 			return -1;
 		}
 		return 0;
@@ -329,7 +307,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->limit_max_hubs_user, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"limit_max_hubs_user\" (integer), default=10");
 			return -1;
 		}
 		return 0;
@@ -340,7 +317,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->limit_max_hubs_reg, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"limit_max_hubs_reg\" (integer), default=10");
 			return -1;
 		}
 		return 0;
@@ -351,7 +327,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->limit_max_hubs_op, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"limit_max_hubs_op\" (integer), default=10");
 			return -1;
 		}
 		return 0;
@@ -362,7 +337,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->limit_max_hubs, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"limit_max_hubs\" (integer), default=25");
 			return -1;
 		}
 		return 0;
@@ -373,7 +347,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->limit_min_hubs_user, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"limit_min_hubs_user\" (integer), default=0");
 			return -1;
 		}
 		return 0;
@@ -384,7 +357,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->limit_min_hubs_reg, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"limit_min_hubs_reg\" (integer), default=0");
 			return -1;
 		}
 		return 0;
@@ -395,7 +367,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->limit_min_hubs_op, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"limit_min_hubs_op\" (integer), default=0");
 			return -1;
 		}
 		return 0;
@@ -407,7 +378,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->limit_min_share, &min, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"limit_min_share\" (integer), default=0, min=0");
 			return -1;
 		}
 		return 0;
@@ -418,7 +388,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->limit_max_share, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"limit_max_share\" (integer), default=0");
 			return -1;
 		}
 		return 0;
@@ -429,7 +398,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->limit_min_slots, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"limit_min_slots\" (integer), default=0");
 			return -1;
 		}
 		return 0;
@@ -440,7 +408,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->limit_max_slots, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"limit_max_slots\" (integer), default=0");
 			return -1;
 		}
 		return 0;
@@ -453,7 +420,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->flood_ctl_interval, &min, &max))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"flood_ctl_interval\" (integer), default=0, min=1, max=60");
 			return -1;
 		}
 		return 0;
@@ -464,7 +430,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->flood_ctl_chat, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"flood_ctl_chat\" (integer), default=0");
 			return -1;
 		}
 		return 0;
@@ -475,7 +440,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->flood_ctl_connect, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"flood_ctl_connect\" (integer), default=0");
 			return -1;
 		}
 		return 0;
@@ -486,7 +450,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->flood_ctl_search, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"flood_ctl_search\" (integer), default=0");
 			return -1;
 		}
 		return 0;
@@ -497,7 +460,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->flood_ctl_update, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"flood_ctl_update\" (integer), default=0");
 			return -1;
 		}
 		return 0;
@@ -508,7 +470,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_integer(key, data, &config->flood_ctl_extras, 0, 0))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"flood_ctl_extras\" (integer), default=0");
 			return -1;
 		}
 		return 0;
@@ -519,7 +480,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_boolean(key, data, &config->tls_enable))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"tls_enable\" (boolean), default=0");
 			return -1;
 		}
 		return 0;
@@ -530,18 +490,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_boolean(key, data, &config->tls_require))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"tls_require\" (boolean), default=0");
-			return -1;
-		}
-		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;
@@ -552,7 +500,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->tls_certificate, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"tls_certificate\" (file), default=\"\"");
 			return -1;
 		}
 		return 0;
@@ -563,7 +510,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->tls_private_key, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"tls_private_key\" (file), default=\"\"");
 			return -1;
 		}
 		return 0;
@@ -574,7 +520,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->file_motd, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"file_motd\" (file), default=\"\"");
 			return -1;
 		}
 		return 0;
@@ -585,7 +530,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->file_acl, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"file_acl\" (file), default=\"\"");
 			return -1;
 		}
 		return 0;
@@ -596,7 +540,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->file_rules, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"file_rules\" (file), default=\"\"");
 			return -1;
 		}
 		return 0;
@@ -607,7 +550,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_hub_full, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_hub_full\" (message), default=\"Hub is full\"");
 			return -1;
 		}
 		return 0;
@@ -618,7 +560,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_hub_disabled, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_hub_disabled\" (message), default=\"Hub is disabled\"");
 			return -1;
 		}
 		return 0;
@@ -629,7 +570,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_hub_registered_users_only, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_hub_registered_users_only\" (message), default=\"Hub is for registered users only\"");
 			return -1;
 		}
 		return 0;
@@ -640,7 +580,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_nick_missing, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_nick_missing\" (message), default=\"No nickname given\"");
 			return -1;
 		}
 		return 0;
@@ -651,7 +590,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_nick_multiple, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_nick_multiple\" (message), default=\"Multiple nicknames given\"");
 			return -1;
 		}
 		return 0;
@@ -662,7 +600,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_nick_invalid, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_nick_invalid\" (message), default=\"Nickname is invalid\"");
 			return -1;
 		}
 		return 0;
@@ -673,7 +610,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_nick_long, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_nick_long\" (message), default=\"Nickname too long\"");
 			return -1;
 		}
 		return 0;
@@ -684,7 +620,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_nick_short, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_nick_short\" (message), default=\"Nickname too short\"");
 			return -1;
 		}
 		return 0;
@@ -695,7 +630,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_nick_spaces, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_nick_spaces\" (message), default=\"Nickname cannot start with spaces\"");
 			return -1;
 		}
 		return 0;
@@ -706,7 +640,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_nick_bad_chars, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_nick_bad_chars\" (message), default=\"Nickname contains invalid characters\"");
 			return -1;
 		}
 		return 0;
@@ -717,7 +650,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_nick_not_utf8, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_nick_not_utf8\" (message), default=\"Nickname is not valid UTF-8\"");
 			return -1;
 		}
 		return 0;
@@ -728,7 +660,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_nick_taken, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_nick_taken\" (message), default=\"Nickname is already in use\"");
 			return -1;
 		}
 		return 0;
@@ -739,7 +670,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_nick_restricted, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_nick_restricted\" (message), default=\"Nickname cannot be used on this hub\"");
 			return -1;
 		}
 		return 0;
@@ -750,7 +680,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_cid_invalid, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_cid_invalid\" (message), default=\"CID is not valid\"");
 			return -1;
 		}
 		return 0;
@@ -761,7 +690,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_cid_missing, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_cid_missing\" (message), default=\"CID is not specified\"");
 			return -1;
 		}
 		return 0;
@@ -772,7 +700,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_cid_taken, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_cid_taken\" (message), default=\"CID is taken\"");
 			return -1;
 		}
 		return 0;
@@ -783,7 +710,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_pid_missing, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_pid_missing\" (message), default=\"PID is not specified\"");
 			return -1;
 		}
 		return 0;
@@ -794,7 +720,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_inf_error_pid_invalid, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_inf_error_pid_invalid\" (message), default=\"PID is invalid\"");
 			return -1;
 		}
 		return 0;
@@ -805,7 +730,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_ban_permanently, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_ban_permanently\" (message), default=\"Banned permanently\"");
 			return -1;
 		}
 		return 0;
@@ -816,7 +740,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_ban_temporarily, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_ban_temporarily\" (message), default=\"Banned temporarily\"");
 			return -1;
 		}
 		return 0;
@@ -827,7 +750,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_auth_invalid_password, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_auth_invalid_password\" (message), default=\"Password is wrong\"");
 			return -1;
 		}
 		return 0;
@@ -838,7 +760,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_auth_user_not_found, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_auth_user_not_found\" (message), default=\"User not found in password database\"");
 			return -1;
 		}
 		return 0;
@@ -849,7 +770,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_error_no_memory, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_error_no_memory\" (message), default=\"No memory\"");
 			return -1;
 		}
 		return 0;
@@ -860,7 +780,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_user_share_size_low, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_user_share_size_low\" (message), default=\"User is not sharing enough\"");
 			return -1;
 		}
 		return 0;
@@ -871,7 +790,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_user_share_size_high, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_user_share_size_high\" (message), default=\"User is sharing too much\"");
 			return -1;
 		}
 		return 0;
@@ -882,7 +800,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_user_slots_low, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_user_slots_low\" (message), default=\"User have too few upload slots.\"");
 			return -1;
 		}
 		return 0;
@@ -893,7 +810,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_user_slots_high, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_user_slots_high\" (message), default=\"User have too many upload slots.\"");
 			return -1;
 		}
 		return 0;
@@ -904,7 +820,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_user_hub_limit_low, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_user_hub_limit_low\" (message), default=\"User is on too few hubs.\"");
 			return -1;
 		}
 		return 0;
@@ -915,7 +830,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_user_hub_limit_high, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_user_hub_limit_high\" (message), default=\"User is on too many hubs.\"");
 			return -1;
 		}
 		return 0;
@@ -926,7 +840,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_user_flood_chat, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_user_flood_chat\" (message), default=\"Chat flood detected, messages are dropped.\"");
 			return -1;
 		}
 		return 0;
@@ -937,7 +850,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_user_flood_connect, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_user_flood_connect\" (message), default=\"Connect flood detected, connection refused.\"");
 			return -1;
 		}
 		return 0;
@@ -948,7 +860,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_user_flood_search, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_user_flood_search\" (message), default=\"Search flood detected, search is stopped.\"");
 			return -1;
 		}
 		return 0;
@@ -959,7 +870,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_user_flood_update, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_user_flood_update\" (message), default=\"Update flood detected.\"");
 			return -1;
 		}
 		return 0;
@@ -970,7 +880,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_user_flood_extras, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_user_flood_extras\" (message), default=\"Flood detected.\"");
 			return -1;
 		}
 		return 0;
@@ -981,7 +890,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_proto_no_common_hash, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_proto_no_common_hash\" (message), default=\"No common hash algorithm.\"");
 			return -1;
 		}
 		return 0;
@@ -992,7 +900,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		if (!apply_string(key, data, &config->msg_proto_obsolete_adc0, (char*) ""))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
-			LOG_ERROR("\"msg_proto_obsolete_adc0\" (message), default=\"Client is using an obsolete ADC protocol version.\"");
 			return -1;
 		}
 		return 0;
@@ -1015,8 +922,6 @@ 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);
@@ -1223,9 +1128,6 @@ 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);
 

src/core/gen_config.h

@@ -42,7 +42,6 @@ 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: ) */

src/core/hub.c

@@ -257,15 +257,9 @@ int hub_handle_chat_message(struct hub_info* hub, struct hub_user* u, struct adc
 	int relay = 1;
 	int offset;
 
-	if (!message)
+	if (!message || !user_is_logged_in(u))
 		return 0;
 
-	if (!user_is_logged_in(u))
-	{
-		hub_free(message);
-		return 0;
-	}
-
 	if ((cmd->cache[0] == 'B') && (message[0] == '!' || message[0] == '+'))
 	{
 		/*
@@ -486,11 +480,11 @@ void hub_send_flood_warning(struct hub_info* hub, struct hub_user* u, const char
 		adc_msg_add_argument(msg, "110");
 		adc_msg_add_argument(msg, tmp);
 		hub_free(tmp);
-
-		route_to_user(hub, u, msg);
-		user_flag_set(u, flag_flood);
-		adc_msg_free(msg);
 	}
+
+	route_to_user(hub, u, msg);
+	user_flag_set(u, flag_flood);
+	adc_msg_free(msg);
 }
 
 static void hub_event_dispatcher(void* callback_data, struct event_data* message)
@@ -662,7 +656,6 @@ static int load_ssl_certificates(struct hub_info* hub, struct hub_config* config
 
 		/* Disable SSLv2 */
 		SSL_CTX_set_options(hub->ssl_ctx, SSL_OP_NO_SSLv2);
-		SSL_CTX_set_quiet_shutdown(hub->ssl_ctx, 1);
 
 		if (SSL_CTX_use_certificate_file(hub->ssl_ctx, config->tls_certificate, SSL_FILETYPE_PEM) < 0)
 		{
@@ -792,6 +785,7 @@ void hub_shutdown_service(struct hub_info* hub)
 
 	event_queue_shutdown(hub->queue);
 	net_con_close(hub->server);
+	hub_free(hub->server);
 	server_alt_port_stop(hub);
 	uman_shutdown(hub);
 	hub->status = hub_status_stopped;
@@ -950,7 +944,7 @@ void hub_send_status(struct hub_info* hub, struct hub_user* user, enum status_me
 	struct adc_message* cmd = adc_msg_construct(ADC_CMD_ISTA, 6);
 	struct adc_message* qui = adc_msg_construct(ADC_CMD_IQUI, 512);
 	char code[4];
-	char buf[256];
+	char buf[250];
 	const char* text = 0;
 	const char* flag = 0;
 	char* escaped_text = 0;

src/core/main.c

@@ -115,11 +115,6 @@ int main_loop()
 		{
 			LOG_INFO("Reloading configuration files...");
 			LOG_DEBUG("Hub status: %d", (int) hub->status);
-
-			/* Reinitialize logs */
-			hub_log_shutdown();
-			hub_log_initialize(arg_log, arg_log_syslog);
-			hub_set_log_verbosity(arg_verbose);
 		}
 	
 		if (read_config(arg_config, &configuration, !arg_have_config) == -1)

src/core/probe.c

@@ -49,17 +49,7 @@ static void probe_net_event(struct net_connection* con, int events, void *arg)
 #ifdef SSL_SUPPORT
 				if (probe->hub->config->tls_enable && probe->hub->config->tls_require)
 				{
-					if (*probe->hub->config->tls_require_redirect_addr)
+					LOG_TRACE("Not TLS connection - closing connection.");
-					{
-						char buf[512];
-						ssize_t len = snprintf(buf, sizeof(buf), "ISUP " ADC_PROTO_SUPPORT "\nISID AAAB\nIINF NIRedirecting...\nIQUI AAAB RD%s\n", probe->hub->config->tls_require_redirect_addr);
-						net_con_send(con, buf, (size_t) len);
-						LOG_TRACE("Not TLS connection - Redirecting to %s.", probe->hub->config->tls_require_redirect_addr);
-					}
-					else
-					{
-						LOG_TRACE("Not TLS connection - closing connection.");
-					}
 				}
 				else
 #endif
@@ -70,8 +60,9 @@ static void probe_net_event(struct net_connection* con, int events, void *arg)
 				probe_destroy(probe);
 				return;
 			}
+
 #ifdef SSL_SUPPORT
-			else if (bytes >= 11 &&
+			if (bytes >= 11 &&
 				probe_recvbuf[0] == 22 && 
 				probe_recvbuf[1] == 3 && /* protocol major version */
 				probe_recvbuf[5] == 1 && /* message type */
@@ -101,10 +92,9 @@ static void probe_net_event(struct net_connection* con, int events, void *arg)
 				net_con_ssl_handshake(con, net_con_ssl_mode_server, probe->hub->ssl_ctx);
 				return;
 			}
-#else
+#endif
 			probe_destroy(probe);
 			return;
-#endif
 		}
 	}
 }
@@ -116,8 +106,6 @@ struct hub_probe* probe_create(struct hub_info* hub, int sd, struct ip_addr_enca
 	if (probe == NULL)
 		return NULL; /* OOM */
 
-	LOG_TRACE("probe_create(): %p", probe);
-
 	probe->hub = hub;
 	probe->connection = net_con_create();
 	net_con_initialize(probe->connection, sd, probe_net_event, probe, NET_EVENT_READ);
@@ -129,7 +117,6 @@ struct hub_probe* probe_create(struct hub_info* hub, int sd, struct ip_addr_enca
 
 void probe_destroy(struct hub_probe* probe)
 {
-	LOG_TRACE("probe_destroy(): %p (connection=%p)", probe, probe->connection);
 	if (probe->connection)
 	{
 		net_con_close(probe->connection);

src/core/route.c

@@ -145,7 +145,7 @@ int route_to_all(struct hub_info* hub, struct adc_message* command) /* iterate u
 		route_to_user(hub, user, command);
 		user = (struct hub_user*) list_get_next(hub->users->list);
 	}
-
+	
 	return 0;
 }
 

src/core/user.c

@@ -71,12 +71,6 @@ void user_destroy(struct hub_user* user)
 	hub_recvq_destroy(user->recv_queue);
 	hub_sendq_destroy(user->send_queue);
 
-	if (user->connection)
-	{
-		LOG_TRACE("user_destory() -> net_con_close(%p)", user->connection);
-		net_con_close(user->connection);
-	}
-
 	adc_msg_free(user->info);
 	user_clear_feature_cast_support(user);
 	hub_free(user);

src/includes.h

@@ -1,109 +0,0 @@
-/*
- * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef HAVE_UHUB_INCLUDES_H
-#define HAVE_UHUB_INCLUDES_H
-
-#define _FILE_OFFSET_BITS 64
-
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-
-#ifdef WINSOCK
-# include <winsock2.h>
-# include <ws2tcpip.h>
-#else
-# include <sys/types.h>
-# include <sys/time.h>
-# include <arpa/inet.h>
-# include <netdb.h>
-# include <netinet/in.h>
-# include <sys/ioctl.h>
-# include <sys/socket.h>
-#endif
-
-# include <assert.h>
-# include <errno.h>
-# include <fcntl.h>
-
-#ifndef __sun__
-# include <getopt.h>
-# include <stdint.h>
-#endif
-
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#if !defined(WIN32)
-# include <grp.h>
-# include <pwd.h>
-# include <sys/resource.h>
-#endif
-
-#ifdef SSL_SUPPORT
-# include <openssl/ssl.h>
-# include <openssl/err.h>
-#endif
-
-#ifdef __linux__
-# define USE_EPOLL
-# include <sys/epoll.h>
-#endif
-
-#ifdef BSD_LIKE
-# define USE_KQUEUE
-# include <sys/event.h>
-#endif
-
-#define USE_SELECT
-# ifndef WINSOCK
-# include <sys/select.h>
-#endif
-
-#if !defined(WIN32)
-# define HAVE_STRNDUP
-# define HAVE_GETRLIMIT
-# if !defined(__HAIKU__)
-#  define HAVE_MEMMEM
-# endif
-#endif
-
-#if defined(BSD_LIKE) || defined(__sun__)
-# undef HAVE_STRNDUP
-# undef HAVE_MEMMEM
-#endif
-
-#if defined(WIN32)
-/* Windows uses %Iu for size_t */
-#define PRINTF_SIZE_T "%Iu"
-#else
-/* NOTE: does not work for old versions of gcc (like 2.95) */
-#define PRINTF_SIZE_T "%zu"
-#endif
-
-#define uhub_assert assert
-
-
-#endif /* HAVE_UHUB_INCLUDES_H */

src/network/backend.c

@@ -79,8 +79,11 @@ int net_backend_init()
 	timeout_queue_initialize(&g_backend->timeout_queue, g_backend->now, 120); /* FIXME: max 120 secs! */
 	g_backend->cleaner = net_cleanup_initialize(g_backend->common.max);
 
-	for (n = 0; net_backend_init_funcs[n]; n++)
+	for (n = 0; n < sizeof(net_backend_init_funcs); n++)
 	{
+		if (!net_backend_init_funcs[n])
+			break;
+
 		g_backend->data = net_backend_init_funcs[n](&g_backend->handler, &g_backend->common);
 		if (g_backend->data)
 		{
@@ -179,14 +182,6 @@ void net_con_close(struct net_connection* con)
 
 	g_backend->handler.con_del(g_backend->data, con);
 
-#ifdef SSL_SUPPORT
-	if (con->ssl)
-	{
-		SSL_shutdown(con->ssl);
-		SSL_clear(con->ssl);
-	}
-#endif
-
 	net_close(con->sd);
 	con->sd = -1;
 
@@ -204,7 +199,6 @@ struct net_cleanup_handler* net_cleanup_initialize(size_t max)
 
 void net_cleanup_shutdown(struct net_cleanup_handler* handler)
 {
-	net_cleanup_process(handler);
 	hub_free(handler->queue);
 	hub_free(handler);
 }

src/network/connection.c

@@ -161,7 +161,7 @@ ssize_t net_con_send(struct net_connection* con, const void* buf, size_t len)
 		LOG_PROTO("SSL_write(con=%p, buf=%p, len=" PRINTF_SIZE_T ") => %d", con, buf, len, ret);
 		if (ret <= 0)
 		{
-			return handle_openssl_error(con, ret);
+			return -handle_openssl_error(con, ret);
 		}
 	}
 #endif
@@ -201,7 +201,7 @@ ssize_t net_con_recv(struct net_connection* con, void* buf, size_t len)
 		}
 		else
 		{
-			return handle_openssl_error(con, ret);
+			return -handle_openssl_error(con, ret);
 		}
 	}
 #endif
@@ -251,9 +251,6 @@ void* net_con_get_ptr(struct net_connection* con)
 
 void net_con_destroy(struct net_connection* con)
 {
-#ifdef SSL_SUPPORT
-	SSL_free(con->ssl);
-#endif
 	hub_free(con);
 }
 

src/network/kqueue.c

@@ -32,29 +32,19 @@ struct net_connection_kqueue
 	NET_CON_STRUCT_COMMON
 	struct kevent ev_r;
 	struct kevent ev_w;
-	int change;
 };
 
 struct net_backend_kqueue
 {
 	int kqfd;
 	struct net_connection_kqueue** conns;
-	struct kevent* changes;
+	struct kevent** changes;
-	int* change_list;
+	size_t nchanges;
-	size_t change_list_len;
 	struct kevent events[KQUEUE_EVBUFFER];
 	struct net_backend_common* common;
 };
 
-#define CHANGE_ACTION_ADD       0x0001
-#define CHANGE_ACTION_MOD       0x0002
-#define CHANGE_ACTION_DEL       0x0004
-#define CHANGE_OP_WANT_READ     0x0100
-#define CHANGE_OP_WANT_WRITE    0x0200
-
 static void net_backend_set_handlers(struct net_backend_handler* handler);
-static void add_change(struct net_backend_kqueue* backend, struct net_connection_kqueue* con, int actions);
-static size_t create_change_list(struct net_backend_kqueue* backend);
 
 const char* net_backend_name_kqueue()
 {
@@ -66,13 +56,12 @@ int net_backend_poll_kqueue(struct net_backend* data, int ms)
 	int res;
 	struct timespec tspec = { 0, };
 	struct net_backend_kqueue* backend = (struct net_backend_kqueue*) data;
-	size_t changes;
 
 	tspec.tv_sec = (ms / 1000);
 	tspec.tv_nsec = ((ms % 1000) * 1000000);
 
-	changes = create_change_list(backend);
+	res = kevent(backend->kqfd, *backend->changes, backend->nchanges, backend->events, KQUEUE_EVBUFFER, &tspec);
-	res = kevent(backend->kqfd, backend->changes, changes, backend->events, KQUEUE_EVBUFFER, &tspec);
+	backend->nchanges = 0;
 
 	if (res == -1 && errno == EINTR)
 		return 0;
@@ -87,13 +76,11 @@ void net_backend_process_kqueue(struct net_backend* data, int res)
 	for (n = 0; n < res; n++)
 	{
 		struct net_connection_kqueue* con = (struct net_connection_kqueue*) backend->events[n].udata;
-		if (con && con->sd >= 0 && backend->conns[con->sd])
+		int ev = -1;
-		{
+		if (backend->events[n].filter == EVFILT_READ)  ev = NET_EVENT_READ;
-			int ev = 0;
+		else if (backend->events[n].filter == EVFILT_WRITE) ev = NET_EVENT_WRITE;
-			if (backend->events[n].filter == EVFILT_READ) ev = NET_EVENT_READ;
+		if (con)
-			else if (backend->events[n].filter == EVFILT_WRITE) ev = NET_EVENT_WRITE;
 			net_con_callback((struct net_connection*) con, ev);
-		}
 	}
 }
 
@@ -115,37 +102,58 @@ void net_con_initialize_kqueue(struct net_backend* data, struct net_connection*
 
 void net_con_backend_add_kqueue(struct net_backend* data, struct net_connection* con_, int events)
 {
+	unsigned short flags_r = EV_ADD;
+	unsigned short flags_w = EV_ADD;
 	struct net_backend_kqueue* backend = (struct net_backend_kqueue*) data;
 	struct net_connection_kqueue* con = (struct net_connection_kqueue*) con_;
-	int operation;
 
 	backend->conns[con->sd] = con;
 
-	operation = CHANGE_ACTION_ADD;
-
 	if (events & NET_EVENT_READ)
-	  operation |= CHANGE_OP_WANT_READ;
+	    flags_r |= EV_ENABLE;
+	else
+	    flags_r |= EV_DISABLE;
+
+	EV_SET(&con->ev_r, con->sd, EVFILT_READ, flags_r, 0, 0, con);
+	backend->changes[backend->nchanges++] = &con->ev_r;
 
 	if (events & NET_EVENT_WRITE)
-	  operation |= CHANGE_OP_WANT_WRITE;
+	    flags_w |= EV_ENABLE;
+	else
+	    flags_w |= EV_DISABLE;
 
-	add_change(backend, con, operation);
+	EV_SET(&con->ev_w, con->sd, EVFILT_WRITE, flags_w, 0, 0, con);
+	backend->changes[backend->nchanges++] = &con->ev_w;
 }
 
 void net_con_backend_mod_kqueue(struct net_backend* data, struct net_connection* con_, int events)
 {
+	unsigned short flags_r = 0;
+	unsigned short flags_w = 0;
 	struct net_backend_kqueue* backend = (struct net_backend_kqueue*) data;
 	struct net_connection_kqueue* con = (struct net_connection_kqueue*) con_;
 
-	int operation = CHANGE_ACTION_ADD;
-
 	if (events & NET_EVENT_READ)
-	  operation |= CHANGE_OP_WANT_READ;
+	    flags_r |= EV_ENABLE;
+	else
+	    flags_r |= EV_DISABLE;
+
+	if (!(con->ev_r.flags & flags_r))
+	{
+	    EV_SET(&con->ev_r, con->sd, EVFILT_READ, flags_r, 0, 0, con);
+	    backend->changes[backend->nchanges++] = &con->ev_r;
+	}
 
 	if (events & NET_EVENT_WRITE)
-	  operation |= CHANGE_OP_WANT_WRITE;
+	    flags_r |= EV_ENABLE;
+	else
+	    flags_r |= EV_DISABLE;
 
-	add_change(backend, con, operation);
+	if (!(con->ev_w.flags & flags_w))
+	{
+	    EV_SET(&con->ev_w, con->sd, EVFILT_WRITE, flags_w, 0, 0, con);
+	    backend->changes[backend->nchanges++] = &con->ev_w;
+	}
 }
 
 void net_con_backend_del_kqueue(struct net_backend* data, struct net_connection* con_)
@@ -154,8 +162,11 @@ void net_con_backend_del_kqueue(struct net_backend* data, struct net_connection*
 	struct net_connection_kqueue* con = (struct net_connection_kqueue*) con_;
 
 	/* No need to remove it from the kqueue filter, the kqueue man page says
-	   it is automatically removed when the descriptor is closed... */
+	   it is automatically removed when the descriptor is closed. */
-	add_change(backend, con, CHANGE_ACTION_DEL);
+	EV_SET(&con->ev_r, con->sd, EVFILT_READ,  EV_DELETE, 0, 0, 0);
+	backend->changes[backend->nchanges++] = &con->ev_r;
+	EV_SET(&con->ev_w, con->sd, EVFILT_WRITE, EV_DELETE, 0, 0, 0);
+	backend->changes[backend->nchanges++] = &con->ev_w;
 
 	// Unmap the socket descriptor.
 	backend->conns[con->sd] = 0;
@@ -167,7 +178,6 @@ void net_backend_shutdown_kqueue(struct net_backend* data)
 	close(backend->kqfd);
 	hub_free(backend->conns);
 	hub_free(backend->changes);
-	hub_free(backend->change_list);
 	hub_free(backend);
 }
 
@@ -187,8 +197,8 @@ struct net_backend* net_backend_init_kqueue(struct net_backend_handler* handler,
 	}
 
 	backend->conns = hub_malloc_zero(sizeof(struct net_connection_kqueue*) * common->max);
-	backend->changes = hub_malloc_zero(sizeof(struct kevent) * common->max * 2);
+	backend->conns = hub_malloc_zero(sizeof(struct net_connection_kqueue*) * common->max);
-	backend->change_list = hub_malloc_zero(sizeof(int) * common->max);
+	backend->changes = hub_malloc_zero(sizeof(struct kevent*) * common->max * 2);
 	backend->common = common;
 
 	net_backend_set_handlers(handler);
@@ -208,71 +218,4 @@ static void net_backend_set_handlers(struct net_backend_handler* handler)
 	handler->con_del = net_con_backend_del_kqueue;
 }
 
-static void add_change(struct net_backend_kqueue* backend, struct net_connection_kqueue* con, int actions)
-{
-	if (actions && !con->change)
-	{
-		backend->change_list[backend->change_list_len++] = con->sd;
-		con->change = actions;
-	}
-}
-
-static size_t create_change_list(struct net_backend_kqueue* backend)
-{
-	size_t n = 0;
-	size_t changes = 0;
-	int sd;
-	struct net_connection_kqueue* con;
-	unsigned short flags_r = 0;
-	unsigned short flags_w = 0;
-
-	for (; n < backend->change_list_len; n++)
-	{
-		sd = backend->change_list[n];
-		con = backend->conns[sd];
-		if (con)
-		{
-			flags_r = 0;
-			flags_w = 0;
-
-			if (con->change & CHANGE_ACTION_ADD)
-			{
-				flags_r |= EV_ADD;
-				flags_w |= EV_ADD;
-			}
-
-			if (con->change & CHANGE_OP_WANT_READ)
-				flags_r |= EV_ENABLE;
-			else
-				flags_r |= EV_DISABLE;
-
-			if (con->change & CHANGE_OP_WANT_WRITE)
-				flags_w |= EV_ENABLE;
-			else
-				flags_w |= EV_DISABLE;
-
-			if (con->ev_r.flags != flags_r)
-			{
-				EV_SET(&con->ev_r, sd, EVFILT_READ, flags_r, 0, 0, con);
-				memcpy(&backend->changes[changes++], &con->ev_r, sizeof(struct kevent));
-			}
-
-			if (con->ev_w.flags != flags_w)
-			{
-				EV_SET(&con->ev_w, sd, EVFILT_WRITE, flags_w, 0, 0, con);
-				memcpy(&backend->changes[changes++], &con->ev_w, sizeof(struct kevent));
-			}
-
-			con->change = 0;
-		}
-		else
-		{
-			EV_SET(&backend->changes[changes++], sd, EVFILT_READ, EV_DELETE, 0, 0, 0);
-			EV_SET(&backend->changes[changes++], sd, EVFILT_READ, EV_DELETE, 0, 0, 0);
-		}
-	}
-	backend->change_list_len = 0;
-	return changes;
-}
-
 #endif /* USE_KQUEUE */

src/network/network.c

@@ -60,6 +60,7 @@ int net_initialize()
 		LOG_TRACE("Initializing OpenSSL...");
 		SSL_library_init();
 		SSL_load_error_strings();
+		OpenSSL_add_all_algorithms();
 #endif /*  SSL_SUPPORT */
 
 		net_initialized = 1;
@@ -99,9 +100,7 @@ int net_destroy()
 		net_backend_shutdown();
 		
 #ifdef SSL_SUPPORT
-		ERR_free_strings();
+		/* FIXME: Shutdown OpenSSL here. */
-		EVP_cleanup();
-		CRYPTO_cleanup_all_ex_data();
 #endif
 
 #ifdef WINSOCK

src/system.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * Copyright (C) 2007-2009, Jan Vidar Krey
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,127 +20,225 @@
 #ifndef HAVE_UHUB_SYSTEM_H
 #define HAVE_UHUB_SYSTEM_H
 
+#define _FILE_OFFSET_BITS 64
+
+#if USE_REGPARM && __GNUC__ >= 3
+#define REGPRM1 __attribute__((regparm(1)))
+#define REGPRM2 __attribute__((regparm(2)))
+#define REGPRM3 __attribute__((regparm(3)))
+#else
+#define REGPRM1
+#define REGPRM2
+#define REGPRM3
+#endif
+
+#ifndef FORCEINLINE
+#if __GNUC__ < 3
+#define FORCEINLINE inline
+#else
+#define FORCEINLINE inline __attribute__((always_inline))
+#endif
+#endif
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__))
-# define BSD_LIKE
+#define BSD_LIKE
 #endif
 
 #if defined(__CYGWIN__) || defined(__MINGW32__)
-# ifndef WINSOCK
+#ifndef WINSOCK
-#  define WINSOCK
+#define WINSOCK
-# endif
 #endif
+#endif
+
+#ifdef WINSOCK
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <sys/types.h>
+#include <sys/time.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#endif
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#ifndef __sun__
+#include <getopt.h>
+#include <stdint.h>
+#endif
+
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#if !defined(WIN32)
+#include <grp.h>
+#include <pwd.h>
+#include <sys/resource.h>
+#define HAVE_STRNDUP
+#ifndef __HAIKU__
+#define HAVE_MEMMEM
+#endif
+#define HAVE_GETRLIMIT
+#endif
+
+/* printf and size_t support */
+#if defined(WIN32)
+/* Windows uses %Iu for size_t */
+#define PRINTF_SIZE_T "%Iu"
+#else
+#define PRINTF_SIZE_T "%zu"
+#endif
+
+#ifdef SSL_SUPPORT
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#endif
+
+#include "../version.h"
+
+#define uhub_assert assert
+
+#ifdef __linux__
+#define USE_EPOLL
+#include <sys/epoll.h>
+#endif
+
+#ifdef BSD_LIKE
+#define USE_KQUEUE
+#include <sys/event.h>
+#endif
+
+#define USE_SELECT
+#ifndef WINSOCK
+#include <sys/select.h>
+#endif
+
+#if defined(BSD_LIKE) || defined(__sun__)
+#undef HAVE_STRNDUP
+#undef HAVE_MEMMEM
+#endif
+
 
 /*
  * Detect operating system info.
  * See: http://predef.sourceforge.net/
  */
 #if defined(__linux__)
-# define OPSYS "Linux"
+#define OPSYS "Linux"
 #endif
 
 #if defined(_WIN32) || defined(__MINGW32__) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__)
-# define OPSYS "Windows"
+#define OPSYS "Windows"
 #endif
 
 #if defined(__APPLE__) && defined(__MACH__)
-# define OPSYS "MacOSX"
+#define OPSYS "MacOSX"
 #endif
 
 #if defined(__FreeBSD__)
-# define OPSYS "FreeBSD"
+#define OPSYS "FreeBSD"
 #endif
 
 #if defined(__OpenBSD__)
-# define OPSYS "OpenBSD"
+#define OPSYS "OpenBSD"
 #endif
 
 #if defined(__NetBSD__)
-# define OPSYS "NetBSD"
+#define OPSYS "NetBSD"
 #endif
 
 #if defined(__sun__)
-# if defined(__SVR4) || defined(__svr4__)
+#if defined(__SVR4) || defined(__svr4__)
-#  define OPSYS "Solaris"
+#define OPSYS "Solaris"
-# else
+#else
-#  define OPSYS "SunOS"
+#define OPSYS "SunOS"
-# endif
+#endif
 #endif
 
 #if defined(__HAIKU__)
-# define OPSYS "Haiku"
+#define OPSYS "Haiku"
 #endif
 
 /* Detect CPUs */
 #if defined(__alpha__) || defined(__alpha)
-# define CPUINFO "Alpha"
+#define CPUINFO "Alpha"
 #endif
 
 #if defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) || defined(__amd64) || defined(_M_X64)
-# define CPUINFO "AMD64"
+#define CPUINFO "AMD64"
 #endif
 
 #if defined(__arm__) || defined(__thumb__) || defined(_ARM) || defined(__TARGET_ARCH_ARM)
-# define CPUINFO "ARM"
+#define CPUINFO "ARM"
 #endif
 
 #if defined(__i386__) || defined(__i386) || defined(i386) || defined(_M_IX86) || defined(__X86__) || defined(_X86_) || defined(__I86__) || defined(__INTEL__) || defined(__THW_INTEL__)
-# define CPUINFO "i386"
+#define CPUINFO "i386"
 #endif
 
 #if defined(__ia64__) || defined(_IA64) || defined(__IA64__) || defined(__ia64) || defined(_M_IA64)
-# define CPUINFO "IA64"
+#define CPUINFO "IA64"
 #endif
 
 #if defined(__hppa__) || defined(__hppa)
-# define CPUINFO "PARISC"
+#define CPUINFO "PARISC"
 #endif
 
 #if defined(__m68k__) || defined(M68000)
-# define CPUINFO "M68K"
+#define CPUINFO "M68K"
 #endif
 
 #if defined(__mips__) || defined(mips) || defined(__mips) || defined(__MIPS__)
-# define CPUINFO "MIPS"
+#define CPUINFO "MIPS"
 #endif
 
 #if defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC) || defined(__powerpc) || defined(__powerpc__)
-# define CPUINFO "PowerPC"
+#define CPUINFO "PowerPC"
 #endif
 
 #if defined(__sparc__) || defined(__sparc)
-# define CPUINFO "SPARC"
+#define CPUINFO "SPARC"
 #endif
 
 #if defined(__sh__)
-# define CPUINFO "SuperH"
+#define CPUINFO "SuperH"
 #endif
 
-/* System includes */
-#include "includes.h"
-#include "../version.h"
-
-
 /* Misc */
 #ifdef MSG_NOSIGNAL
-# define UHUB_SEND_SIGNAL MSG_NOSIGNAL
+#define UHUB_SEND_SIGNAL MSG_NOSIGNAL
 #else
-# ifdef MSG_NOPIPE
+#ifdef MSG_NOPIPE
-#  define UHUB_SEND_SIGNAL MSG_NOPIPE
+#define UHUB_SEND_SIGNAL MSG_NOPIPE
-# else
+#else
-#  define UHUB_SEND_SIGNAL 0
+#define UHUB_SEND_SIGNAL 0
-# endif
+#endif
 #endif
 
 #ifndef INET6_ADDRSTRLEN
-# define INET6_ADDRSTRLEN 46
+#define INET6_ADDRSTRLEN 46
 #endif
 
 #ifndef MIN
-# define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
 #endif
 
 #ifndef MAX
-# define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
 #endif
 
 #endif /* HAVE_UHUB_SYSTEM_H */

src/util/misc.c

@@ -400,72 +400,3 @@ const char* get_timestamp(time_t now)
 	sprintf(ts, "[%02d:%02d]", t->tm_hour, t->tm_min);
 	return ts;
 }
-
-void strip_off_ini_line_comments(char* line, int line_count)
-{
-	char* p = line;
-	char* out = line;
-	int backslash = 0;
-
-	if (!*line)
-		return;
-
-	for (; *p; p++)
-	{
-		if (!backslash)
-		{
-			if (*p == '\\')
-			{
-				backslash = 1;
-			}
-			else if (*p == '#')
-			{
-				*out = '\0';
-				out++;
-				break;
-			}
-			else
-			{
-				*out = *p;
-				out++;
-			}
-		}
-		else
-		{
-			if (*p == '\\' || *p == '#' || *p == '\"')
-			{
-				*out = *p;
-				out++;
-			}
-			else
-			{
-				LOG_WARN("Invalid backslash escape on line %d", line_count);
-				*out = *p;
-				out++;
-			}
-			backslash = 0;
-		}
-	}
-	*out = '\0';
-}
-
-char* strip_off_quotes(char* line)
-{
-	size_t len;
-
-	if (!*line)
-		return line;
-
-	len = strlen(line);
-	if (len < 2)
-		return line;
-
-	if ((line[0] == '"' && line[len - 1] == '"') ||
-	    (line[0] == '\'' && line[len - 1] == '\''))
-	{
-		line[len-1] = '\0';
-		return line + 1;
-	}
-	return line;
-}
-

src/util/misc.h

@@ -33,13 +33,10 @@ extern int is_valid_base32_char(char c);
 extern void base32_encode(const unsigned char* buffer, size_t len, char* result);
 extern void base32_decode(const char* src, unsigned char* dst, size_t len);
 extern char* strip_white_space(char* string);
-extern void strip_off_ini_line_comments(char* line, int line_count);
-extern char* strip_off_quotes(char* line);
 
 extern int file_read_lines(const char* file, void* data, file_line_handler_t handler);
 
 
-
 extern const char* uhub_itoa(int val);
 extern const char* uhub_ulltoa(uint64_t val);
 

version.h

@@ -5,7 +5,7 @@
 #endif
 
 #ifndef VERSION
-#define VERSION "0.3.3"
+#define VERSION "0.3.1"
 #endif
 
 #ifndef GIT_REVISION
@@ -14,7 +14,7 @@
 #else
 #define REVISION "(git: " GIT_REVISION ")"
 #ifdef GIT_VERSION
-#define PRODUCT_STRING PRODUCT "/" VERSION " (" GIT_VERSION ")"
+#define PRODUCT_STRING PRODUCT "/" GIT_VERSION
 #else
 #define PRODUCT_STRING PRODUCT "/" VERSION " " REVISION
 #endif