#include "newconf.h"
#include "ircd_defs.h"
-#include "sprintf_irc.h"
#include "common.h"
#include "logger.h"
#include "s_conf.h"
static void
conf_set_serverinfo_vhost(void *data)
{
- if(inetpton(AF_INET, (char *) data, &ServerInfo.ip.sin_addr) <= 0)
+ if(rb_inet_pton(AF_INET, (char *) data, &ServerInfo.ip.sin_addr) <= 0)
{
conf_report_error("Invalid netmask for server IPv4 vhost (%s)", (char *) data);
return;
conf_set_serverinfo_vhost6(void *data)
{
#ifdef RB_IPV6
- if(inetpton(AF_INET6, (char *) data, &ServerInfo.ip6.sin6_addr) <= 0)
+ if(rb_inet_pton(AF_INET6, (char *) data, &ServerInfo.ip6.sin6_addr) <= 0)
{
conf_report_error("Invalid netmask for server IPv6 vhost (%s)", (char *) data);
return;
{ "kline", SHARED_PKLINE|SHARED_TKLINE },
{ "xline", SHARED_PXLINE|SHARED_TXLINE },
{ "resv", SHARED_PRESV|SHARED_TRESV },
+ { "dline", SHARED_PDLINE|SHARED_TDLINE },
+ { "tdline", SHARED_TDLINE },
+ { "pdline", SHARED_PDLINE },
+ { "undline", SHARED_UNDLINE },
{ "tkline", SHARED_TKLINE },
{ "unkline", SHARED_UNKLINE },
{ "txline", SHARED_TXLINE },
}
}
-static void\r
-conf_set_listen_port(void *data)\r
-{\r
- conf_set_listen_port_both(data, 0);\r
-}\r
-\r
-static void\r
-conf_set_listen_sslport(void *data)\r
-{\r
- conf_set_listen_port_both(data, 1);\r
+static void
+conf_set_listen_port(void *data)
+{
+ conf_set_listen_port_both(data, 0);
+}
+
+static void
+conf_set_listen_sslport(void *data)
+{
+ conf_set_listen_port_both(data, 1);
}
static void
yy_server->flags &= ~SERVER_COMPRESSED;
}
#endif
- if(ServerConfCompressed(yy_server) && ServerConfSSL(yy_server))\r
- {\r
- conf_report_error("Ignoring compressed for connect block %s -- "\r
- "ssl and compressed are mutually exclusive (OpenSSL does its own compression)", \r
- yy_server->name);\r
- yy_server->flags &= ~SERVER_COMPRESSED;\r
+ if(ServerConfCompressed(yy_server) && ServerConfSSL(yy_server))
+ {
+ conf_report_error("Ignoring compressed for connect block %s -- "
+ "ssl and compressed are mutually exclusive (OpenSSL does its own compression)",
+ yy_server->name);
+ yy_server->flags &= ~SERVER_COMPRESSED;
}
add_server_conf(yy_server);
static void
conf_set_connect_vhost(void *data)
{
- if(inetpton_sock(data, (struct sockaddr *)&yy_server->my_ipnum) <= 0)
+ if(rb_inet_pton_sock(data, (struct sockaddr *)&yy_server->my_ipnum) <= 0)
{
conf_report_error("Invalid netmask for server vhost (%s)",
(char *) data);
{ "vhost", CF_QSTRING, conf_set_serverinfo_vhost, 0, NULL },
{ "vhost6", CF_QSTRING, conf_set_serverinfo_vhost6, 0, NULL },
- { "ssl_private_key", CF_QSTRING, NULL, 0, &ServerInfo.ssl_private_key },\r
- { "ssl_ca_cert", CF_QSTRING, NULL, 0, &ServerInfo.ssl_ca_cert },\r
- { "ssl_cert", CF_QSTRING, NULL, 0, &ServerInfo.ssl_cert }, \r
- { "ssl_dh_params", CF_QSTRING, NULL, 0, &ServerInfo.ssl_dh_params },\r
+ { "ssl_private_key", CF_QSTRING, NULL, 0, &ServerInfo.ssl_private_key },
+ { "ssl_ca_cert", CF_QSTRING, NULL, 0, &ServerInfo.ssl_ca_cert },
+ { "ssl_cert", CF_QSTRING, NULL, 0, &ServerInfo.ssl_cert },
+ { "ssl_dh_params", CF_QSTRING, NULL, 0, &ServerInfo.ssl_dh_params },
{ "ssld_count", CF_INT, NULL, 0, &ServerInfo.ssld_count },
{ "default_max_clients",CF_INT, NULL, 0, &ServerInfo.default_max_clients },