Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2006-12-08 01:39:32 UTC
Modified files:
ChangeLog doc/example.conf include/listener.h ircd/ircd_lexer.l
ircd/ircd_parser.y ircd/listener.c ircd/os_generic.c ircd/s_bsd.c
Log message:
Merge listening port ipv4/ipv6 selection from 2.10.12.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.822 ircu2.10/ChangeLog:1.823
--- ircu2.10/ChangeLog:1.822 Sat Nov 4 14:01:36 2006
+++ ircu2.10/ChangeLog Thu Dec 7 17:39:21 2006
@@ -1,3 +1,71 @@
+2006-12-07 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd/listener.c (show_ports): Update to show '4' and/or '6' as
+ flags in response, with a '-' suffix if either one fails to open.
+
+2006-12-07 Michael Poole <[EMAIL PROTECTED]>
+
+ * doc/example.conf (Port): Document the method to select IPv4 or
+ IPv6 restriction for a port.
+
+ * include/listener.h (LISTEN_IPV4): New listener flag.
+ (LISTEN_IPV6): New listener flag.
+ (struct Listener): Split 'fd' and 'socket' fields into two each.
+
+ * ircd/ircd_lexer.l (ipv4): New token.
+ (ipv6): Likewise.
+
+ * ircd/ircd_parser.y (USE_IPV4): New macro.
+ (USE_IPV6): Likewise.
+ (TOK_IPV4): New token.
+ (TOK_IPV6): Likewise.
+ (address_family): New non-terminal rule.
+ (portblock): Default to listening on both IPv4 and IPv6.
+ (portnumber): Add address_family element and use it.
+ (portvhost): Likewise.
+
+ * ircd/listener.c (make_listener): Adjust for newly split fields
+ in struct Listener.
+ (inetport): Likewise. Adjust return value as well.
+ (add_listener): Update to handle both IPv4 and IPV6 support.
+ (close_listener): Likewise.
+ (accept_connection): Because each listener has two sockets, it is
+ no longer safe to free the listener when one is destroyed -- so
+ don't. Also accept() on the file descriptor from the incoming
+ event rather than on a fixed fd.
+
+ * ircd/os_generic.c (os_socket): For platforms with IPV6_V6ONLY,
+ enable it for AF_INET6 sockets rather than disabling it for
+ unspecified sockets.
+
+2006-12-06 Michael Poole <[EMAIL PROTECTED]>
+
+ * include/listener.h (enum ListenerFlag): New enum.
+ (struct Listener): Convert "active", "hidden" and "server" to a
+ flagset.
+ (add_listener): Convert "is_server" and "is_hidden" arguments to
+ use the same flagset structure.
+
+ * ircd/ircd_parser.y (listen_flags): New variable.
+ (general_vhost): Consolidate references to $3 to use a variable.
+ (portblock): Use listen_flags instead of tconn and tping.
+ (portserver): Likewise.
+ (porthidden): Likewise.
+
+ * ircd/listener.c (show_ports): Use new field in Listener.
+ (set_listener_options): New function.
+ (inetport): Use it.
+ (add_listener): Use new field in Listener. When reusing an extant
+ listener, call set_listener_options() so the options are updated.
+ (mark_listeners_closing): Use new field in Listener.
+ (close_listeners): Use new helper macro to check activeness.
+ (release_listener): Likewise.
+ (accept_connection): Likewise.
+
+ * ircd/s_bsd.c (report_error): Use the standard snotice rate
+ limiting here.
+ (add_connection): Use new helper macro to check serverness.
+
2006-11-04 Michael Poole <[EMAIL PROTECTED]>
* ircd/m_nick.c (m_nick): If we get NICK on a server port, tell
Index: ircu2.10/doc/example.conf
diff -u ircu2.10/doc/example.conf:1.75 ircu2.10/doc/example.conf:1.76
--- ircu2.10/doc/example.conf:1.75 Wed Jul 26 18:06:46 2006
+++ ircu2.10/doc/example.conf Thu Dec 7 17:39:21 2006
@@ -635,16 +635,20 @@
# so we don't do that.
#
# Port {
-# port = number;
+# port = [ipv4] [ipv6] number;
# mask = "ipmask";
# # Use this to control the interface you bind to.
-# vhost = "virtualhostip";
+# vhost = [ipv4] [ipv6] "virtualhostip";
# # Setting to yes makes this server only.
# server = yes;
# # Setting to yes makes the port "hidden" from stats.
# hidden = yes;
# };
#
+# The port and vhost lines allow you to specify one or both of "ipv4"
+# and "ipv6" as address families to use for the port. The default is
+# to listen on both IPv4 and IPv6.
+#
# The mask setting allows you to specify a range of IP addresses that
# you will allow connections from. This should only contain IP addresses
# and '*' if used. This field only uses IP addresses. This does not use
@@ -664,11 +668,11 @@
port = 4400;
};
-# This is a Server port that is Hidden
+# This is an IPv4-only Server port that is Hidden
Port {
server = yes;
hidden = yes;
- port = 4401;
+ port = ipv4 4401;
};
# The following are normal client ports
Index: ircu2.10/include/listener.h
diff -u ircu2.10/include/listener.h:1.7 ircu2.10/include/listener.h:1.8
--- ircu2.10/include/listener.h:1.7 Fri Jan 6 03:22:29 2006
+++ ircu2.10/include/listener.h Thu Dec 7 17:39:22 2006
@@ -17,7 +17,7 @@
*/
/** @file
* @brief Interface and declarations for handling listening sockets.
- * @version $Id: listener.h,v 1.7 2006/01/06 11:22:29 isomer Exp $
+ * @version $Id: listener.h,v 1.8 2006/12/08 01:39:22 entrope Exp $
*/
#ifndef INCLUDED_listener_h
#define INCLUDED_listener_h
@@ -30,6 +30,9 @@
#ifndef INCLUDED_res_h
#include "res.h"
#endif
+#ifndef INCLUDED_client_h
+#include "client.h" /* flagset stuff. oh well. */
+#endif
#ifndef INCLUDED_sys_types_h
#include <sys/types.h> /* size_t, broken BSD system headers */
#define INCLUDED_sys_types_h
@@ -38,25 +41,45 @@
struct Client;
struct StatDesc;
+enum ListenerFlag {
+ /** Port is currently accepting connections. */
+ LISTEN_ACTIVE,
+ /** Port is hidden from /STATS P output. */
+ LISTEN_HIDDEN,
+ /** Port accepts only server connections. */
+ LISTEN_SERVER,
+ /** Port listens for IPv4 connections. */
+ LISTEN_IPV4,
+ /** Port listens for IPv6 connections. */
+ LISTEN_IPV6,
+ /** Sentinel for counting listener flags. */
+ LISTEN_LAST_FLAG
+};
+
+DECLARE_FLAGSET(ListenerFlags, LISTEN_LAST_FLAG);
+
/** Describes a single listening port. */
struct Listener {
struct Listener* next; /**< list node pointer */
- int fd; /**< file descriptor */
+ struct ListenerFlags flags; /**< on-off flags for listener */
+ int fd_v4; /**< file descriptor for IPv4 */
+ int fd_v6; /**< file descriptor for IPv6 */
int ref_count; /**< number of connection references */
- unsigned char active; /**< current state of listener */
- unsigned char hidden; /**< hidden in stats output for clients
*/
- unsigned char server; /**< 1 if port is a server listener */
unsigned char mask_bits; /**< number of bits in mask address */
int index; /**< index into poll array */
time_t last_accept; /**< last time listener accepted */
struct irc_sockaddr addr; /**< virtual address and port */
struct irc_in_addr mask; /**< listener hostmask */
- struct Socket socket; /**< describe socket to event system */
+ struct Socket socket_v4; /**< describe IPv4 socket to event
system */
+ struct Socket socket_v6; /**< describe IPv6 socket to event
system */
};
+#define listener_server(LISTENER) FlagHas(&(LISTENER)->flags, LISTEN_SERVER)
+#define listener_active(LISTENER) FlagHas(&(LISTENER)->flags, LISTEN_ACTIVE)
+
extern void add_listener(int port, const char* vaddr_ip,
- const char* mask, int is_server,
- int is_hidden);
+ const char* mask,
+ const struct ListenerFlags *flags);
extern void close_listeners(void);
extern void count_listener_memory(int* count_out, size_t* size_out);
extern void mark_listeners_closing(void);
Index: ircu2.10/ircd/ircd_lexer.l
diff -u ircu2.10/ircd/ircd_lexer.l:1.28 ircu2.10/ircd/ircd_lexer.l:1.29
--- ircu2.10/ircd/ircd_lexer.l:1.28 Wed Jul 26 18:06:46 2006
+++ ircu2.10/ircd/ircd_lexer.l Thu Dec 7 17:39:22 2006
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
- * $Id: ircd_lexer.l,v 1.28 2006/07/27 01:06:46 entrope Exp $
+ * $Id: ircd_lexer.l,v 1.29 2006/12/08 01:39:22 entrope Exp $
*/
%option never-interactive case-insensitive warn nodefault nounput yylineno
@@ -118,6 +118,8 @@
IAUTH return IAUTH;
INCLUDE return INCLUDE;
IP return IP;
+IPV4 return TOK_IPV4;
+IPV6 return TOK_IPV6;
JUPE return JUPE;
KB return KBYTES;
KBYTES return KBYTES;
Index: ircu2.10/ircd/ircd_parser.y
diff -u ircu2.10/ircd/ircd_parser.y:1.70 ircu2.10/ircd/ircd_parser.y:1.71
--- ircu2.10/ircd/ircd_parser.y:1.70 Wed Aug 2 20:13:31 2006
+++ ircu2.10/ircd/ircd_parser.y Thu Dec 7 17:39:22 2006
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
- * $Id: ircd_parser.y,v 1.70 2006/08/03 03:13:31 entrope Exp $
+ * $Id: ircd_parser.y,v 1.71 2006/12/08 01:39:22 entrope Exp $
*/
%{
@@ -57,7 +57,11 @@
#include <stdio.h>
#include <string.h>
#include <arpa/inet.h>
+
#define MAX_STRINGS 80 /* Maximum number of feature params. */
+#define USE_IPV4 (1 << 0)
+#define USE_IPV6 (1 << 1)
+
extern struct LocalConf localConf;
extern struct DenyConf* denyConfList;
extern struct CRuleConf* cruleConfList;
@@ -72,6 +76,7 @@
static int tping, tconn, maxlinks, sendq, port, invert, stringno, flags;
static char *name, *pass, *host, *ip, *username, *origin, *hub_limit;
static char *stringlist[MAX_STRINGS];
+ struct ListenerFlags listen_flags;
static struct ConnectionClass *c_class;
static struct DenyConf *dconf;
static struct s_map *smap;
@@ -203,6 +208,7 @@
%token FAST
%token AUTOCONNECT
%token PROGRAM
+%token TOK_IPV4 TOK_IPV6
%token INCLUDE
%token LINESYNC
%token FROM
@@ -221,7 +227,7 @@
/* and some types... */
%type <num> sizespec
%type <num> timespec timefactor factoredtimes factoredtime
-%type <num> expr yesorno privtype
+%type <num> expr yesorno privtype address_family
%type <num> blocklimit blocktypes blocktype
%type <num> optall
%type <crule> crule_expr
@@ -387,18 +393,20 @@
generalvhost: VHOST '=' QSTRING ';'
{
struct irc_in_addr addr;
+ char *vhost = $3;
+
if (!permitted(BLOCK_GENERAL, 0))
;
- else if (!strcmp($3, "*")) {
+ else if (!strcmp(vhost, "*")) {
/* This traditionally meant bind to all interfaces and connect
* from the default. */
- } else if (!ircd_aton(&addr, $3))
- parse_error("Invalid virtual host '%s'.", $3);
+ } else if (!ircd_aton(&addr, vhost))
+ parse_error("Invalid virtual host '%s'.", vhost);
else if (irc_in_addr_is_ipv4(&addr))
memcpy(&VirtualHost_v4.addr, &addr, sizeof(addr));
else
memcpy(&VirtualHost_v6.addr, &addr, sizeof(addr));
- MyFree($3);
+ MyFree(vhost);
};
adminblock: ADMIN
@@ -733,31 +741,61 @@
yesorno: YES { $$ = 1; } | NO { $$ = 0; };
+/* not a recursive definition because some pedant will just come along
+ * and whine that the parser accepts "ipv4 ipv4 ipv4 ipv4"
+ */
+address_family:
+ { $$ = 0; }
+ | TOK_IPV4 { $$ = USE_IPV4; }
+ | TOK_IPV6 { $$ = USE_IPV6; }
+ | TOK_IPV4 TOK_IPV6 { $$ = USE_IPV4 | USE_IPV6; }
+ | TOK_IPV6 TOK_IPV4 { $$ = USE_IPV6 | USE_IPV4; }
+ ;
+
/* The port block... */
portblock: PORT '{' portitems '}' ';'
{
if (!permitted(BLOCK_PORT, 1))
;
else if (port > 0 && port <= 0xFFFF)
- add_listener(port, host, pass, tconn, tping);
+ {
+ if (!FlagHas(&listen_flags, LISTEN_IPV4)
+ && !FlagHas(&listen_flags, LISTEN_IPV6))
+ {
+ FlagSet(&listen_flags, LISTEN_IPV4);
+ FlagSet(&listen_flags, LISTEN_IPV6);
+ }
+ add_listener(port, host, pass, &listen_flags);
+ }
else
parse_error("Port %d is out of range", port);
MyFree(host);
MyFree(pass);
+ memset(&listen_flags, 0, sizeof(listen_flags));
host = pass = NULL;
- port = tconn = tping = 0;
+ port = 0;
};
portitems: portitem portitems | portitem;
portitem: portnumber | portvhost | portmask | portserver | porthidden;
-portnumber: PORT '=' NUMBER ';'
-{
- port = $3;
-};
-
-portvhost: VHOST '=' QSTRING ';'
+portnumber: PORT '=' address_family NUMBER ';'
{
+ int families = $3;
+ if (families & USE_IPV4)
+ FlagSet(&listen_flags, LISTEN_IPV4);
+ else if (families & USE_IPV6)
+ FlagSet(&listen_flags, LISTEN_IPV6);
+ port = $4;
+};
+
+portvhost: VHOST '=' address_family QSTRING ';'
+{
+ int families = $3;
+ if (families & USE_IPV4)
+ FlagSet(&listen_flags, LISTEN_IPV4);
+ else if (families & USE_IPV6)
+ FlagSet(&listen_flags, LISTEN_IPV6);
MyFree(host);
- host = $3;
+ host = $4;
};
portmask: MASK '=' QSTRING ';'
@@ -768,18 +806,18 @@
portserver: SERVER '=' YES ';'
{
- tconn = -1;
+ FlagSet(&listen_flags, LISTEN_SERVER);
} | SERVER '=' NO ';'
{
- tconn = 0;
+ FlagClr(&listen_flags, LISTEN_SERVER);
};
porthidden: HIDDEN '=' YES ';'
{
- tping = -1;
+ FlagSet(&listen_flags, LISTEN_HIDDEN);
} | HIDDEN '=' NO ';'
{
- tping = 0;
+ FlagClr(&listen_flags, LISTEN_HIDDEN);
};
clientblock: CLIENT
Index: ircu2.10/ircd/listener.c
diff -u ircu2.10/ircd/listener.c:1.33 ircu2.10/ircd/listener.c:1.34
--- ircu2.10/ircd/listener.c:1.33 Sun Jul 23 11:04:21 2006
+++ ircu2.10/ircd/listener.c Thu Dec 7 17:39:22 2006
@@ -18,7 +18,7 @@
*/
/** @file
* @brief Implementation for handling listening sockets.
- * @version $Id: listener.c,v 1.33 2006/07/23 18:04:21 entrope Exp $
+ * @version $Id: listener.c,v 1.34 2006/12/08 01:39:22 entrope Exp $
*/
#include "config.h"
@@ -69,7 +69,8 @@
memset(listener, 0, sizeof(struct Listener));
- listener->fd = -1;
+ listener->fd_v4 = -1;
+ listener->fd_v6 = -1;
listener->addr.port = port;
memcpy(&listener->addr.addr, addr, sizeof(listener->addr.addr));
@@ -134,6 +135,7 @@
int show_hidden = IsOper(sptr);
int count = (IsOper(sptr) || MyUser(sptr)) ? 100 : 8;
int port = 0;
+ int len;
assert(0 != sptr);
@@ -143,18 +145,26 @@
for (listener = ListenerPollList; listener; listener = listener->next) {
if (port && port != listener->addr.port)
continue;
- flags[0] = (listener->server) ? 'S' : 'C';
- if (listener->hidden) {
- if (!show_hidden)
- continue;
- flags[1] = 'H';
- flags[2] = '\0';
+ len = 0;
+ flags[len++] = listener_server(listener) ? 'S' : 'C';
+ if (show_hidden && FlagHas(&listener->flags, LISTEN_HIDDEN))
+ flags[len++] = 'H';
+ if (FlagHas(&listener->flags, LISTEN_IPV4))
+ {
+ flags[len++] = '4';
+ if (listener->fd_v4 < 0)
+ flags[len++] = '-';
+ }
+ if (FlagHas(&listener->flags, LISTEN_IPV6))
+ {
+ flags[len++] = '6';
+ if (listener->fd_v6 < 0)
+ flags[len++] = '-';
}
- else
- flags[1] = '\0';
+ flags[len] = '\0';
send_reply(sptr, RPL_STATSPLINE, listener->addr.port, listener->ref_count,
- flags, (listener->active) ? "active" : "disabled");
+ flags, listener_active(listener) ? "active" : "disabled");
if (--count == 0)
break;
}
@@ -176,20 +186,16 @@
#define HYBRID_SOMAXCONN 64
#endif
-/** Open listening socket for \a listener.
- * @param[in,out] listener Listener to make a socket for.
+/** Set or update socket options for \a listener.
+ * @param[in] listener Listener to determine socket option values.
+ * @param[in] fd File descriptor being updated.
* @return Non-zero on success, zero on failure.
*/
-static int inetport(struct Listener* listener)
+static int set_listener_options(struct Listener *listener, int fd)
{
- int fd;
+ int is_server;
- /*
- * At first, open a new socket
- */
- fd = os_socket(&listener->addr, SOCK_STREAM, get_listener_name(listener), 0);
- if (fd < 0)
- return 0;
+ is_server = listener_server(listener);
/*
* Set the buffer sizes for the listener. Accepted connections
* inherit the accepting sockets settings for SO_RCVBUF S_SNDBUF
@@ -198,34 +204,55 @@
* NOTE: this must be set before listen is called
*/
if (!os_set_sockbufs(fd,
- (listener->server) ? feature_int(FEAT_SOCKSENDBUF) :
CLIENT_TCP_WINDOW,
- (listener->server) ? feature_int(FEAT_SOCKRECVBUF) :
CLIENT_TCP_WINDOW)) {
+ is_server ? feature_int(FEAT_SOCKSENDBUF) :
CLIENT_TCP_WINDOW,
+ is_server ? feature_int(FEAT_SOCKRECVBUF) :
CLIENT_TCP_WINDOW)) {
report_error(SETBUFS_ERROR_MSG, get_listener_name(listener), errno);
close(fd);
return 0;
}
- if (!os_set_listen(fd, HYBRID_SOMAXCONN)) {
- report_error(LISTEN_ERROR_MSG, get_listener_name(listener), errno);
- close(fd);
- return 0;
- }
+
/*
* Set the TOS bits - this is nonfatal if it doesn't stick.
*/
- if (!os_set_tos(fd,feature_int((listener->server)?FEAT_TOS_SERVER :
FEAT_TOS_CLIENT))) {
+ if (!os_set_tos(fd,feature_int(is_server ? FEAT_TOS_SERVER :
FEAT_TOS_CLIENT))) {
report_error(TOS_ERROR_MSG, get_listener_name(listener), errno);
}
- if (!socket_add(&listener->socket, accept_connection, (void*) listener,
+ return 1;
+}
+
+/** Open listening socket for \a listener.
+ * @param[in,out] listener Listener to make a socket for.
+ * @param[in] family Socket address family to use.
+ * @return Negative on failure, file descriptor on success.
+ */
+static int inetport(struct Listener* listener, int family)
+{
+ struct Socket *sock;
+ int fd;
+
+ /*
+ * At first, open a new socket
+ */
+ fd = os_socket(&listener->addr, SOCK_STREAM, get_listener_name(listener),
family);
+ if (fd < 0)
+ return -1;
+ if (!os_set_listen(fd, HYBRID_SOMAXCONN)) {
+ report_error(LISTEN_ERROR_MSG, get_listener_name(listener), errno);
+ close(fd);
+ return -1;
+ }
+ if (!set_listener_options(listener, fd))
+ return -1;
+ sock = (family == AF_INET) ? &listener->socket_v4 : &listener->socket_v6;
+ if (!socket_add(sock, accept_connection, (void*) listener,
SS_LISTENING, 0, fd)) {
/* Error should already have been reported to the logs */
close(fd);
- return 0;
+ return -1;
}
- listener->fd = fd;
-
- return 1;
+ return fd;
}
/** Find the listener (if any) for a particular port and address.
@@ -250,14 +277,16 @@
* @param[in] port Port number to listen on.
* @param[in] vhost_ip Local address to listen on.
* @param[in] mask Address mask to accept connections from.
- * @param[in] is_server Non-zero if the port should only accept server
connections.
- * @param[in] is_hidden Non-zero if the port should be hidden from /STATS P
output.
+ * @param[in] flags Flags describing listener options.
*/
void add_listener(int port, const char* vhost_ip, const char* mask,
- int is_server, int is_hidden)
+ const struct ListenerFlags *flags)
{
struct Listener* listener;
struct irc_in_addr vaddr;
+ int okay = 0;
+ int new_listener = 0;
+ int fd;
/*
* if no port in conf line, don't bother
@@ -274,24 +303,53 @@
listener = find_listener(port, &vaddr);
if (!listener)
+ {
+ new_listener = 1;
listener = make_listener(port, &vaddr);
- listener->active = 1;
- listener->hidden = is_hidden;
- listener->server = is_server;
+ }
+ memcpy(&listener->flags, flags, sizeof(listener->flags));
+ FlagSet(&listener->flags, LISTEN_ACTIVE);
if (mask)
ipmask_parse(mask, &listener->mask, &listener->mask_bits);
else
listener->mask_bits = 0;
- if (listener->fd >= 0) {
- /* If the listener is already open, do not try to re-open. */
+#ifdef IPV6
+ if (FlagHas(&listener->flags, LISTEN_IPV6)) {
+ if (listener->fd_v6 >= 0) {
+ set_listener_options(listener, listener->fd_v6);
+ okay = 1;
+ } else if ((fd = inetport(listener, AF_INET6)) >= 0) {
+ listener->fd_v6 = fd;
+ okay = 1;
+ }
+ } else if (-1 < listener->fd_v6) {
+ close(listener->fd_v6);
+ socket_del(&listener->socket_v6);
+ listener->fd_v6 = -1;
+ }
+#endif
+
+ if (FlagHas(&listener->flags, LISTEN_IPV4)) {
+ if (listener->fd_v4 >= 0) {
+ set_listener_options(listener, listener->fd_v4);
+ okay = 1;
+ } else if ((fd = inetport(listener, AF_INET)) >= 0) {
+ listener->fd_v4 = fd;
+ okay = 1;
+ }
+ } else if (-1 < listener->fd_v4) {
+ close(listener->fd_v4);
+ socket_del(&listener->socket_v4);
+ listener->fd_v4 = -1;
}
- else if (inetport(listener)) {
+
+ if (!okay)
+ free_listener(listener);
+ else if (new_listener) {
listener->next = ListenerPollList;
ListenerPollList = listener;
}
- else
- free_listener(listener);
}
/** Mark all listeners as closing (inactive).
@@ -301,7 +359,7 @@
{
struct Listener* listener;
for (listener = ListenerPollList; listener; listener = listener->next)
- listener->active = 0;
+ FlagClr(&listener->flags, LISTEN_ACTIVE);
}
/** Close a single listener.
@@ -325,9 +383,17 @@
}
}
}
- if (-1 < listener->fd)
- close(listener->fd);
- socket_del(&listener->socket);
+ if (-1 < listener->fd_v4) {
+ close(listener->fd_v4);
+ socket_del(&listener->socket_v4);
+ listener->fd_v4 = -1;
+ }
+ if (-1 < listener->fd_v6) {
+ close(listener->fd_v6);
+ socket_del(&listener->socket_v6);
+ listener->fd_v6 = -1;
+ }
+ free_listener(listener);
}
/** Close all inactive listeners. */
@@ -340,7 +406,7 @@
*/
for (listener = ListenerPollList; listener; listener = listener_next) {
listener_next = listener->next;
- if (0 == listener->active && 0 == listener->ref_count)
+ if (!listener_active(listener) && 0 == listener->ref_count)
close_listener(listener);
}
}
@@ -352,7 +418,7 @@
{
assert(0 != listener);
assert(0 < listener->ref_count);
- if (0 == --listener->ref_count && !listener->active)
+ if (0 == --listener->ref_count && !listener_active(listener))
close_listener(listener);
}
@@ -371,7 +437,7 @@
listener = (struct Listener*) s_data(ev_socket(ev));
if (ev_type(ev) == ET_DESTROY) /* being destroyed */
- free_listener(listener);
+ return;
else {
assert(ev_type(ev) == ET_ACCEPT || ev_type(ev) == ET_ERROR);
@@ -396,7 +462,7 @@
*/
while (1)
{
- if ((fd = os_accept(listener->fd, &addr)) == -1)
+ if ((fd = os_accept(s_fd(ev_socket(ev)), &addr)) == -1)
{
if (errno == EAGAIN ||
#ifdef EWOULDBLOCK
@@ -430,7 +496,7 @@
* to accept(), because it makes sense to clear our the
* socket's queue as fast as possible.
*/
- if (!listener->active)
+ if (!listener_active(listener))
{
++ServerStats->is_ref;
send(fd, "ERROR :Use another port\r\n", 25, 0);
Index: ircu2.10/ircd/os_generic.c
diff -u ircu2.10/ircd/os_generic.c:1.27 ircu2.10/ircd/os_generic.c:1.28
--- ircu2.10/ircd/os_generic.c:1.27 Fri Jul 14 17:09:10 2006
+++ ircu2.10/ircd/os_generic.c Thu Dec 7 17:39:22 2006
@@ -18,7 +18,7 @@
*/
/** @file
* @brief Implementation of OS-dependent operations.
- * @version $Id: os_generic.c,v 1.27 2006/07/15 00:09:10 entrope Exp $
+ * @version $Id: os_generic.c,v 1.28 2006/12/08 01:39:22 entrope Exp $
*/
#include "config.h"
@@ -611,8 +611,8 @@
}
if (local) {
#if defined(IPV6_V6ONLY)
- int on = 0;
- if (family == 0 && irc_in_addr_unspec(&local->addr))
+ int on = 1;
+ if (family == AF_INET6 && irc_in_addr_unspec(&local->addr))
setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on));
#endif
if (bind(fd, (struct sockaddr*)&addr, size)) {
Index: ircu2.10/ircd/s_bsd.c
diff -u ircu2.10/ircd/s_bsd.c:1.87 ircu2.10/ircd/s_bsd.c:1.88
--- ircu2.10/ircd/s_bsd.c:1.87 Sun Jul 23 11:04:22 2006
+++ ircu2.10/ircd/s_bsd.c Thu Dec 7 17:39:22 2006
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Functions that now (or in the past) relied on BSD APIs.
- * @version $Id: s_bsd.c,v 1.87 2006/07/23 18:04:22 entrope Exp $
+ * @version $Id: s_bsd.c,v 1.88 2006/12/08 01:39:22 entrope Exp $
*/
#include "config.h"
@@ -145,13 +145,7 @@
if (EmptyString(who))
who = "unknown";
- if (last_notice + 20 < CurrentTime) {
- /*
- * pace error messages so opers don't get flooded by transients
- */
- sendto_opmask(0, SNO_OLDSNO, text, who, errmsg);
- last_notice = CurrentTime;
- }
+ sendto_opmask_ratelimited(0, SNO_OLDSNO, &last_notice, text, who, errmsg);
log_write(LS_SOCKET, L_ERROR, 0, text, who, errmsg);
errno = errtmp;
}
@@ -522,7 +516,7 @@
*/
os_disable_options(fd);
- if (listener->server)
+ if (listener_server(listener))
{
new_client = make_client(0, STAT_UNKNOWN_SERVER);
}
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
