#include "reject.h"
#include "s_conf.h"
#include "hostmask.h"
+#include "sslproc.h"
+#include "hash.h"
#ifndef INADDR_NONE
#define INADDR_NONE ((unsigned int) 0xffffffff)
#endif
-#if defined(NO_IN6ADDR_ANY) && defined(IPV6)
+#if defined(NO_IN6ADDR_ANY) && defined(RB_IPV6)
static const struct in6_addr in6addr_any =
{ { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
#endif
if(listener == NULL)
return NULL;
-#ifdef IPV6
+#ifdef RB_IPV6
if(listener->addr.ss_family == AF_INET6)
port = ntohs(((const struct sockaddr_in6 *)&listener->addr)->sin6_port);
else
{
sendto_one_numeric(source_p, RPL_STATSPLINE,
form_str(RPL_STATSPLINE), 'P',
-#ifdef IPV6
+#ifdef RB_IPV6
ntohs(listener->addr.ss_family == AF_INET ? ((struct sockaddr_in *)&listener->addr)->sin_port :
((struct sockaddr_in6 *)&listener->addr)->sin6_port),
#else
ntohs(((struct sockaddr_in *)&listener->addr)->sin_port),
#endif
IsOperAdmin(source_p) ? listener->name : me.name,
- listener->ref_count, (listener->active) ? "active" : "disabled");
+ listener->ref_count, (listener->active) ? "active" : "disabled",\r
+ listener->ssl ? " ssl" : "");
}
}
F = rb_socket(GET_SS_FAMILY(&listener->addr), SOCK_STREAM, 0, "Listener socket");
-#ifdef IPV6
+#ifdef RB_IPV6
if(listener->addr.ss_family == AF_INET6)
{
struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&listener->addr;
if(F == NULL)
{
- report_error("opening listener socket %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
+ ilog_error("opening listener socket");
return 0;
}
else if((maxconnections - 10) < rb_get_fd(F)) /* XXX this is kinda bogus*/
{
- report_error("no more connections left for listener %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
+ ilog_error("no more connections left for listener");
rb_close(F);
return 0;
}
*/
if(setsockopt(rb_get_fd(F), SOL_SOCKET, SO_REUSEADDR, (char *) &opt, sizeof(opt)))
{
- report_error("setting SO_REUSEADDR for listener %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
+ ilog_error("setting SO_REUSEADDR for listener");
rb_close(F);
return 0;
}
if(bind(rb_get_fd(F), (struct sockaddr *) &listener->addr, GET_SS_LEN(&listener->addr)))
{
- report_error("binding listener socket %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
+ ilog_error("binding listener socket");
rb_close(F);
return 0;
}
if((ret = rb_listen(F, RATBOX_SOMAXCONN)))
{
- report_error("listen failed for %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
+ ilog_error("listen()");
rb_close(F);
return 0;
}
}
break;
}
-#ifdef IPV6
+#ifdef RB_IPV6
case AF_INET6:
{
struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr;
* the format "255.255.255.255"
*/
void
-add_listener(int port, const char *vhost_ip, int family)
+add_listener(int port, const char *vhost_ip, int family, int ssl)
{
listener_t *listener;
struct rb_sockaddr_storage vaddr;
if(inetpton(family, vhost_ip, &((struct sockaddr_in *)&vaddr)->sin_addr) <= 0)
return;
}
-#ifdef IPV6
+#ifdef RB_IPV6
else
{
if(inetpton(family, vhost_ip, &((struct sockaddr_in6 *)&vaddr)->sin6_addr) <= 0)
case AF_INET:
((struct sockaddr_in *)&vaddr)->sin_addr.s_addr = INADDR_ANY;
break;
-#ifdef IPV6
+#ifdef RB_IPV6
case AF_INET6:
memcpy(&((struct sockaddr_in6 *)&vaddr)->sin6_addr, &in6addr_any, sizeof(struct in6_addr));
break;
SET_SS_LEN(&vaddr, sizeof(struct sockaddr_in));
((struct sockaddr_in *)&vaddr)->sin_port = htons(port);
break;
-#ifdef IPV6
+#ifdef RB_IPV6
case AF_INET6:
SET_SS_LEN(&vaddr, sizeof(struct sockaddr_in6));
((struct sockaddr_in6 *)&vaddr)->sin6_port = htons(port);
}
listener->F = NULL;
+ listener->ssl = ssl;
if(inetport(listener))
listener->active = 1;
* any client list yet.
*/
static void
-add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, int exempt)
+add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, void *ssl_ctl, int exempt)
{
struct Client *new_client;
s_assert(NULL != listener);
strlcpy(new_client->host, new_client->sockhost, sizeof(new_client->host));
new_client->localClient->F = F;
-
+ add_to_cli_fd_hash(new_client);
new_client->localClient->listener = listener;
+ new_client->localClient->ssl_ctl = ssl_ctl;\r
+ if(ssl_ctl != NULL || rb_fd_ssl(F))\r
+ SetSSL(new_client);
+
++listener->ref_count;
if(!exempt)
struct ConfItem *aconf;
static time_t last_oper_notice = 0;
+ if(listener->ssl && (!ssl_ok || !get_ssld_count()))\r
+ {\r
+ rb_close(F);\r
+ return 0;\r
+ }
+
if((maxconnections - 10) < rb_get_fd(F)) /* XXX this is kinda bogus */
{
- ++ServerStats->is_ref;
+ ++ServerStats.is_ref;
/*
* slow down the whining to opers bit
*/
* from this IP... */
if(aconf != NULL)
{
- ServerStats->is_ref++;
+ ServerStats.is_ref++;
if(ConfigFileEntry.dline_with_reason)
{
return 1;
}
+static void\r
+accept_ssld(rb_fde_t *F, struct sockaddr *addr, struct sockaddr *laddr, struct Listener *listener)\r
+{\r
+ ssl_ctl_t *ctl;\r
+ rb_fde_t *xF[2];\r
+ rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Incoming ssld Connection");\r
+ ctl = start_ssld_accept(F, xF[1], rb_get_fd(xF[0])); /* this will close F for us */\r
+ add_connection(listener, xF[0], addr, ctl, 1);\r
+}
+
static void
accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t addrlen, void *data)
{
struct rb_sockaddr_storage lip;
unsigned int locallen = sizeof(struct rb_sockaddr_storage);
- ServerStats->is_ac++;
+ ServerStats.is_ac++;
if(getsockname(rb_get_fd(F), (struct sockaddr *) &lip, &locallen) < 0)
{
rb_close(F);
}
- add_connection(listener, F, addr, 1);
+ if(listener->ssl)\r
+ accept_ssld(F, addr, (struct sockaddr *)&lip, listener);\r
+ else\r
+ add_connection(listener, F, addr, NULL, 1);
}
projects / irc / rqf / shadowircd.git / blobdiff