Compare commits
12 Commits
master
...
adc_client
Author | SHA1 | Date |
---|---|---|
Jan Vidar Krey | a5b9350fd1 | |
Jan Vidar Krey | 43375d8443 | |
Jan Vidar Krey | 0190c38c32 | |
Jan Vidar Krey | 25c03f5c96 | |
Jan Vidar Krey | f25cb7bd5d | |
Jan Vidar Krey | 1e6d6cd1e7 | |
Jan Vidar Krey | f55243cf88 | |
Jan Vidar Krey | 6e1de7329c | |
Jan Vidar Krey | f65a81a2aa | |
Jan Vidar Krey | 6daa5ecf95 | |
Jan Vidar Krey | 23498e9ac8 | |
Jan Vidar Krey | c30b85bbcb |
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,3 +1,9 @@
|
|||
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.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
Summary: High performance ADC p2p hub.
|
||||
Name: uhub
|
||||
Version: 0.3.2
|
||||
Version: 0.3.3
|
||||
Release: 3
|
||||
License: GPLv3
|
||||
Group: Networking/File transfer
|
||||
|
|
|
@ -110,6 +110,7 @@ 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)
|
||||
{
|
||||
|
|
|
@ -125,6 +125,7 @@ sub write_c_impl_apply(@)
|
|||
my $min;
|
||||
my $max;
|
||||
my $regexp;
|
||||
my $expect = "";
|
||||
|
||||
if (defined $p)
|
||||
{
|
||||
|
@ -141,14 +142,21 @@ 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"
|
||||
}
|
||||
|
||||
|
@ -178,16 +186,27 @@ 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\treturn -1;\n" .
|
||||
"\t\t\tLOG_ERROR(\"Configuration parse error on line %d\", line_count);\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";
|
||||
|
|
|
@ -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[
|
||||
|
|
|
@ -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("");
|
||||
|
@ -95,6 +96,7 @@ 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;
|
||||
|
@ -105,6 +107,7 @@ 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;
|
||||
|
@ -115,6 +118,7 @@ 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;
|
||||
|
@ -125,6 +129,7 @@ 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;
|
||||
|
@ -135,6 +140,7 @@ 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;
|
||||
|
@ -145,6 +151,7 @@ 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;
|
||||
|
@ -155,6 +162,7 @@ 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;
|
||||
|
@ -167,6 +175,7 @@ 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;
|
||||
|
@ -177,6 +186,7 @@ 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;
|
||||
|
@ -187,6 +197,7 @@ 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;
|
||||
|
@ -197,6 +208,7 @@ 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;
|
||||
|
@ -207,6 +219,7 @@ 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;
|
||||
|
@ -217,6 +230,7 @@ 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;
|
||||
|
@ -227,6 +241,7 @@ 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;
|
||||
|
@ -237,6 +252,7 @@ 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;
|
||||
|
@ -247,6 +263,7 @@ 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;
|
||||
|
@ -257,6 +274,7 @@ 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;
|
||||
|
@ -267,6 +285,7 @@ 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;
|
||||
|
@ -277,6 +296,7 @@ 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;
|
||||
|
@ -287,6 +307,7 @@ 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;
|
||||
|
@ -297,6 +318,7 @@ 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;
|
||||
|
@ -307,6 +329,7 @@ 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;
|
||||
|
@ -317,6 +340,7 @@ 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;
|
||||
|
@ -327,6 +351,7 @@ 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;
|
||||
|
@ -337,6 +362,7 @@ 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;
|
||||
|
@ -347,6 +373,7 @@ 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;
|
||||
|
@ -357,6 +384,7 @@ 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;
|
||||
|
@ -367,6 +395,7 @@ 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;
|
||||
|
@ -378,6 +407,7 @@ 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;
|
||||
|
@ -388,6 +418,7 @@ 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;
|
||||
|
@ -398,6 +429,7 @@ 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;
|
||||
|
@ -408,6 +440,7 @@ 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;
|
||||
|
@ -420,6 +453,7 @@ 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;
|
||||
|
@ -430,6 +464,7 @@ 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;
|
||||
|
@ -440,6 +475,7 @@ 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;
|
||||
|
@ -450,6 +486,7 @@ 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;
|
||||
|
@ -460,6 +497,7 @@ 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;
|
||||
|
@ -470,6 +508,7 @@ 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;
|
||||
|
@ -480,6 +519,7 @@ 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;
|
||||
|
@ -490,6 +530,18 @@ 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;
|
||||
|
@ -500,6 +552,7 @@ 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;
|
||||
|
@ -510,6 +563,7 @@ 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;
|
||||
|
@ -520,6 +574,7 @@ 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;
|
||||
|
@ -530,6 +585,7 @@ 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;
|
||||
|
@ -540,6 +596,7 @@ 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;
|
||||
|
@ -550,6 +607,7 @@ 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;
|
||||
|
@ -560,6 +618,7 @@ 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;
|
||||
|
@ -570,6 +629,7 @@ 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;
|
||||
|
@ -580,6 +640,7 @@ 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;
|
||||
|
@ -590,6 +651,7 @@ 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;
|
||||
|
@ -600,6 +662,7 @@ 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;
|
||||
|
@ -610,6 +673,7 @@ 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;
|
||||
|
@ -620,6 +684,7 @@ 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;
|
||||
|
@ -630,6 +695,7 @@ 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;
|
||||
|
@ -640,6 +706,7 @@ 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;
|
||||
|
@ -650,6 +717,7 @@ 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;
|
||||
|
@ -660,6 +728,7 @@ 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;
|
||||
|
@ -670,6 +739,7 @@ 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;
|
||||
|
@ -680,6 +750,7 @@ 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;
|
||||
|
@ -690,6 +761,7 @@ 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;
|
||||
|
@ -700,6 +772,7 @@ 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;
|
||||
|
@ -710,6 +783,7 @@ 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;
|
||||
|
@ -720,6 +794,7 @@ 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;
|
||||
|
@ -730,6 +805,7 @@ 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;
|
||||
|
@ -740,6 +816,7 @@ 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;
|
||||
|
@ -750,6 +827,7 @@ 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;
|
||||
|
@ -760,6 +838,7 @@ 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;
|
||||
|
@ -770,6 +849,7 @@ 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;
|
||||
|
@ -780,6 +860,7 @@ 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;
|
||||
|
@ -790,6 +871,7 @@ 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;
|
||||
|
@ -800,6 +882,7 @@ 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;
|
||||
|
@ -810,6 +893,7 @@ 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;
|
||||
|
@ -820,6 +904,7 @@ 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;
|
||||
|
@ -830,6 +915,7 @@ 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;
|
||||
|
@ -840,6 +926,7 @@ 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;
|
||||
|
@ -850,6 +937,7 @@ 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;
|
||||
|
@ -860,6 +948,7 @@ 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;
|
||||
|
@ -870,6 +959,7 @@ 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;
|
||||
|
@ -880,6 +970,7 @@ 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;
|
||||
|
@ -890,6 +981,7 @@ 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;
|
||||
|
@ -900,6 +992,7 @@ 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;
|
||||
|
@ -922,6 +1015,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);
|
||||
|
@ -1128,6 +1223,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);
|
||||
|
||||
|
|
|
@ -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: ) */
|
||||
|
|
|
@ -662,6 +662,7 @@ 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)
|
||||
{
|
||||
|
@ -791,7 +792,6 @@ 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;
|
||||
|
|
|
@ -115,6 +115,11 @@ 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)
|
||||
|
|
|
@ -49,7 +49,17 @@ 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)
|
||||
{
|
||||
LOG_TRACE("Not TLS connection - closing connection.");
|
||||
if (*probe->hub->config->tls_require_redirect_addr)
|
||||
{
|
||||
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
|
||||
|
@ -60,9 +70,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 */
|
||||
|
@ -107,6 +116,8 @@ 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);
|
||||
|
@ -118,6 +129,7 @@ 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);
|
||||
|
|
|
@ -71,6 +71,12 @@ 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);
|
||||
|
|
|
@ -179,6 +179,14 @@ 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;
|
||||
|
||||
|
@ -196,6 +204,7 @@ 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);
|
||||
}
|
||||
|
|
|
@ -138,6 +138,23 @@ ssize_t net_con_ssl_handshake(struct net_connection* con, enum net_con_ssl_mode
|
|||
#endif /* SSL_SUPPORT */
|
||||
|
||||
|
||||
int net_con_connect(struct net_connection* con, struct sockaddr* addr, size_t addr_len)
|
||||
{
|
||||
int ret = net_connect(con->sd, (struct sockaddr*) addr, addr_len);
|
||||
if (ret == 0 || (ret == -1 && net_error() == EISCONN))
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
else if (ret == -1 && (net_error() == EALREADY || net_error() == EINPROGRESS || net_error() == EWOULDBLOCK || net_error() == EINTR))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
ssize_t net_con_send(struct net_connection* con, const void* buf, size_t len)
|
||||
{
|
||||
int ret;
|
||||
|
@ -161,7 +178,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 +218,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,6 +268,9 @@ 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);
|
||||
}
|
||||
|
||||
|
@ -304,15 +324,18 @@ void net_con_callback(struct net_connection* con, int events)
|
|||
|
||||
case tls_st_connected:
|
||||
LOG_PROTO("tls_st_connected, events=%s%s, ssl_flags=%s%s", (events & NET_EVENT_READ ? "R" : ""), (events & NET_EVENT_WRITE ? "W" : ""), con->flags & NET_WANT_SSL_READ ? "R" : "", con->flags & NET_WANT_SSL_WRITE ? "W" : "");
|
||||
if (events & NET_EVENT_WRITE && con->flags & NET_WANT_SSL_READ)
|
||||
|
||||
// continue a SSL_read() that wants to write.
|
||||
if (events & NET_EVENT_WRITE && con->flags & NET_WANT_SSL_WRITE)
|
||||
{
|
||||
con->callback(con, events & NET_EVENT_READ, con->ptr);
|
||||
con->callback(con, NET_EVENT_READ, con->ptr);
|
||||
return;
|
||||
}
|
||||
|
||||
// continue a SSL_write() that wants to read something.
|
||||
if (events & NET_EVENT_READ && con->flags & NET_WANT_SSL_WRITE)
|
||||
{
|
||||
con->callback(con, events & NET_EVENT_READ, con->ptr);
|
||||
con->callback(con, NET_EVENT_WRITE, con->ptr);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -75,6 +75,12 @@ extern ssize_t net_con_recv(struct net_connection* con, void* buf, size_t len);
|
|||
*/
|
||||
extern ssize_t net_con_peek(struct net_connection* con, void* buf, size_t len);
|
||||
|
||||
/**
|
||||
* Returns 1 if connected, 0 if net_con_connect needs to be called again,
|
||||
* and -1 if an error occured.
|
||||
*/
|
||||
extern int net_con_connect(struct net_connection* con, struct sockaddr* addr, size_t addr_len);
|
||||
|
||||
/**
|
||||
* Set timeout for connetion.
|
||||
*
|
||||
|
|
|
@ -60,7 +60,6 @@ int net_initialize()
|
|||
LOG_TRACE("Initializing OpenSSL...");
|
||||
SSL_library_init();
|
||||
SSL_load_error_strings();
|
||||
OpenSSL_add_all_algorithms();
|
||||
#endif /* SSL_SUPPORT */
|
||||
|
||||
net_initialized = 1;
|
||||
|
@ -100,7 +99,9 @@ int net_destroy()
|
|||
net_backend_shutdown();
|
||||
|
||||
#ifdef SSL_SUPPORT
|
||||
/* FIXME: Shutdown OpenSSL here. */
|
||||
ERR_free_strings();
|
||||
EVP_cleanup();
|
||||
CRYPTO_cleanup_all_ex_data();
|
||||
#endif
|
||||
|
||||
#ifdef WINSOCK
|
||||
|
|
|
@ -376,13 +376,13 @@ int ADC_client_connect(struct ADC_client* client, const char* address)
|
|||
|
||||
client->callback(client, ADC_CLIENT_CONNECTING, 0);
|
||||
}
|
||||
|
||||
int ret = net_connect(net_con_get_sd(client->con), (struct sockaddr*) &client->addr, sizeof(struct sockaddr_in));
|
||||
if (ret == 0 || (ret == -1 && net_error() == EISCONN))
|
||||
|
||||
int ret = net_con_connect(client->con, (struct sockaddr*) &client->addr, sizeof(struct sockaddr_in));
|
||||
if (ret == 1)
|
||||
{
|
||||
ADC_client_on_connected(client);
|
||||
}
|
||||
else if (ret == -1 && (net_error() == EALREADY || net_error() == EINPROGRESS || net_error() == EWOULDBLOCK || net_error() == EINTR))
|
||||
else if (ret == 0)
|
||||
{
|
||||
if (client->state != ps_conn)
|
||||
{
|
||||
|
@ -400,10 +400,17 @@ int ADC_client_connect(struct ADC_client* client, const char* address)
|
|||
|
||||
static void ADC_client_on_connected(struct ADC_client* client)
|
||||
{
|
||||
net_con_update(client->con, NET_EVENT_READ);
|
||||
client->callback(client, ADC_CLIENT_CONNECTED, 0);
|
||||
ADC_client_send(client, ADC_HANDSHAKE);
|
||||
ADC_client_set_state(client, ps_protocol);
|
||||
if (client->ssl)
|
||||
{
|
||||
net_con_ssl_handshake(client->con, net_con_ssl_mode_client, NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
net_con_update(client->con, NET_EVENT_READ);
|
||||
client->callback(client, ADC_CLIENT_CONNECTED, 0);
|
||||
ADC_client_send(client, ADC_HANDSHAKE);
|
||||
ADC_client_set_state(client, ps_protocol);
|
||||
}
|
||||
}
|
||||
|
||||
static void ADC_client_on_disconnected(struct ADC_client* client)
|
||||
|
@ -432,8 +439,8 @@ static int ADC_client_parse_address(struct ADC_client* client, const char* arg)
|
|||
{
|
||||
char* split;
|
||||
int ssl = 0;
|
||||
struct hostent* dns;
|
||||
struct in_addr* addr;
|
||||
struct hostent* dns = 0;
|
||||
struct in_addr* addr = 0;
|
||||
|
||||
if (!arg)
|
||||
return 0;
|
||||
|
@ -445,12 +452,11 @@ static int ADC_client_parse_address(struct ADC_client* client, const char* arg)
|
|||
return 0;
|
||||
|
||||
/* Check for ADC or ADCS */
|
||||
if (!strncmp(arg, "adc://", 6))
|
||||
ssl = 0;
|
||||
else if (!strncmp(arg, "adcs://", 7))
|
||||
ssl = 1;
|
||||
else
|
||||
return 0;
|
||||
if (!strncmp(arg, "adc://", 6)) ssl = 0;
|
||||
else if (!strncmp(arg, "adcs://", 7)) ssl = 1;
|
||||
else return 0;
|
||||
|
||||
client->ssl = ssl;
|
||||
|
||||
/* Split hostname and port (if possible) */
|
||||
split = strrchr(client->hub_address + 6 + ssl, ':');
|
||||
|
@ -467,9 +473,7 @@ static int ADC_client_parse_address(struct ADC_client* client, const char* arg)
|
|||
/* Resolve IP address (FIXME: blocking call) */
|
||||
dns = gethostbyname(client->hub_address + 6 + ssl);
|
||||
if (dns)
|
||||
{
|
||||
addr = (struct in_addr*) dns->h_addr_list[0];
|
||||
}
|
||||
|
||||
// Initialize the sockaddr struct.
|
||||
memset(&client->addr, 0, sizeof(client->addr));
|
||||
|
|
|
@ -105,6 +105,7 @@ struct ADC_client
|
|||
struct adc_message* info;
|
||||
char recvbuf[ADC_BUFSIZE];
|
||||
char sendbuf[ADC_BUFSIZE];
|
||||
int ssl;
|
||||
adc_client_cb callback;
|
||||
size_t s_offset;
|
||||
size_t r_offset;
|
||||
|
|
|
@ -82,7 +82,8 @@ int main(int argc, char** argv)
|
|||
|
||||
while (running)
|
||||
{
|
||||
net_backend_process();
|
||||
if (!net_backend_process())
|
||||
break;
|
||||
}
|
||||
|
||||
ADC_client_destroy(&client);
|
||||
|
|
|
@ -448,3 +448,24 @@ void strip_off_ini_line_comments(char* line, int line_count)
|
|||
}
|
||||
*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;
|
||||
}
|
||||
|
||||
|
|
|
@ -34,6 +34,7 @@ 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);
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#endif
|
||||
|
||||
#ifndef VERSION
|
||||
#define VERSION "0.3.2"
|
||||
#define VERSION "0.3.3"
|
||||
#endif
|
||||
|
||||
#ifndef GIT_REVISION
|
||||
|
@ -14,7 +14,7 @@
|
|||
#else
|
||||
#define REVISION "(git: " GIT_REVISION ")"
|
||||
#ifdef GIT_VERSION
|
||||
#define PRODUCT_STRING PRODUCT "/" GIT_VERSION
|
||||
#define PRODUCT_STRING PRODUCT "/" VERSION " (" GIT_VERSION ")"
|
||||
#else
|
||||
#define PRODUCT_STRING PRODUCT "/" VERSION " " REVISION
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue