*
* This file is part of x3.
*
- * srvx is free software; you can redistribute it and/or modify
+ * x3 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 2 of the License, or
* (at your option) any later version.
#include "ioset.h"
#include "log.h"
#include "nickserv.h"
+#include "spamserv.h"
#include "shun.h"
#include "timeq.h"
#ifdef HAVE_SYS_SOCKET_H
typedef void (*foreach_userfunc) (struct userNode *user, void *data);
typedef void (*foreach_nonuser) (char *name, void *data);
static void parse_foreach(char *target_list, foreach_chanfunc cf, foreach_nonchan nc, foreach_userfunc uf, foreach_nonuser nu, void *data);
+static void call_channel_mode_funcs(struct userNode *who, struct chanNode *channel, char **modes, unsigned int argc);
static void
uplink_readable(struct io_fd *fd) {
log_module(MAIN_LOG, LOG_INFO, "Connecting to %s:%i...", addr, port);
- socket_io_fd = ioset_connect((struct sockaddr*)cManager.uplink->bind_addr, sizeof(struct sockaddr), addr, port, 1, 0, NULL);
+ socket_io_fd = ioset_connect(cManager.uplink->bind_addr, cManager.uplink->bind_addr_len, addr, port, 1, 0, NULL);
if (!socket_io_fd) {
log_module(MAIN_LOG, LOG_ERROR, "Connection to uplink failed: %s (%d)", strerror(errno), errno);
target->state = DISCONNECTED;
if (!pd->is_notice && cf->func
&& ((cn->modes & MODE_REGISTERED) || GetUserMode(cn, cf->service)))
cf->func(pd->user, cn, pd->text+1, cf->service);
+ else
+ spamserv_channel_message(cn, pd->user, pd->text);
/* This catches *all* text sent to the channel that the services server sees */
for (x = 0; x < ALLCHANMSG_FUNCS_MAX; x++) {
res->modes_clear = orig->modes_clear;
res->new_limit = orig->new_limit;
memcpy(res->new_key, orig->new_key, sizeof(res->new_key));
+ memcpy(res->new_upass, orig->new_upass, sizeof(res->new_upass));
+ memcpy(res->new_apass, orig->new_apass, sizeof(res->new_apass));
res->argc = orig->argc;
memcpy(res->args, orig->args, orig->argc*sizeof(orig->args[0]));
}
channel->limit = change->new_limit;
if (change->modes_set & MODE_KEY)
strcpy(channel->key, change->new_key);
+ if (change->modes_set & MODE_UPASS)
+ strcpy(channel->upass, change->new_upass);
+ if (change->modes_set & MODE_APASS)
+ strcpy(channel->apass, change->new_apass);
for (ii = 0; ii < change->argc; ++ii) {
switch (change->args[ii].mode) {
case MODE_BAN:
int
mod_chanmode(struct userNode *who, struct chanNode *channel, char **modes, unsigned int argc, unsigned int flags)
{
+ struct modeNode *member;
struct mod_chanmode *change;
unsigned int ii;
+ short base_oplevel;
+
if (!modes || !modes[0])
return 0;
- if (!(change = mod_chanmode_parse(channel, modes, argc, flags)))
+ if (who && (member = GetUserMode(channel, who)))
+ base_oplevel = member->oplevel;
+ else
+ base_oplevel = MAXOPLEVEL;
+ if (!(change = mod_chanmode_parse(channel, modes, argc, flags, base_oplevel)))
return 0;
+
+ call_channel_mode_funcs(who, channel, modes, argc);
+
if (flags & MC_ANNOUNCE)
mod_chanmode_announce(who, channel, change);
else
change.modes_set = chan->modes;
change.new_limit = chan->limit;
safestrncpy(change.new_key, chan->key, sizeof(change.new_key));
+ safestrncpy(change.new_upass, chan->upass, sizeof(change.new_upass));
+ safestrncpy(change.new_apass, chan->apass, sizeof(change.new_apass));
return strlen(mod_chanmode_format(&change, out));
}
+static user_mode_func_t *um_list;
+static unsigned int um_size = 0, um_used = 0;
+
+void
+reg_user_mode_func(user_mode_func_t handler)
+{
+ if (um_used == um_size) {
+ if (um_size) {
+ um_size <<= 1;
+ um_list = realloc(um_list, um_size*sizeof(user_mode_func_t));
+ } else {
+ um_size = 8;
+ um_list = malloc(um_size*sizeof(user_mode_func_t));
+ }
+ }
+ um_list[um_used++] = handler;
+}
+
+void
+unreg_user_mode_func(user_mode_func_t handler)
+{
+ unsigned int i;
+ for (i=0; i<um_used; i++) {
+ if (um_list[i] == handler) break;
+ }
+ if (i == um_used) return;
+ memmove(um_list+i, um_list+i+1, (um_used-i-1)*sizeof(um_list[0]));
+ um_used--;
+}
+
+static void
+call_user_mode_funcs(struct userNode *user, const char *mode_change)
+{
+ unsigned int n;
+ for (n=0; n<um_used; n++) {
+ um_list[n](user, mode_change);
+ }
+}
+
+static channel_mode_func_t *cm_list;
+static unsigned int cm_size = 0, cm_used = 0;
+
+void
+reg_channel_mode_func(channel_mode_func_t handler)
+{
+ if (cm_used == cm_size) {
+ if (cm_size) {
+ cm_size <<= 1;
+ cm_list = realloc(cm_list, cm_size*sizeof(channel_mode_func_t));
+ } else {
+ cm_size = 8;
+ cm_list = malloc(cm_size*sizeof(channel_mode_func_t));
+ }
+ }
+ cm_list[cm_used++] = handler;
+}
+
+void
+unreg_channel_mode_func(channel_mode_func_t handler)
+{
+ unsigned int i;
+ for (i=0; i<cm_used; i++) {
+ if(cm_list[i] == handler) break;
+ }
+ if (i == cm_used) return;
+ memmove(cm_list+i, cm_list+i+1, (cm_used-i-1)*sizeof(cm_list[0]));
+ cm_used--;
+}
+
+static void
+call_channel_mode_funcs(struct userNode *who, struct chanNode *channel, char **modes, unsigned int argc)
+{
+ unsigned int n;
+ for (n=0; n<cm_used; n++) {
+ cm_list[n](who, channel, modes, argc);
+ }
+}
+
char *
generate_hostmask(struct userNode *user, int options)
{
- char *nickname, *ident, *hostname;
- char *mask;
+ irc_in_addr_t ip;
+ char *nickname, *ident, *hostname, *mask;
int len, ii;
/* figure out string parts */
sprintf(hostname, "%s.%s", user->handle_info->handle, hidden_host_suffix);
} else if (options & GENMASK_STRICT_HOST) {
if (options & GENMASK_BYIP)
- hostname = inet_ntoa(user->ip);
- } else if ((options & GENMASK_BYIP) || !hostname[strspn(hostname, "0123456789.")]) {
- /* Should generate an IP-based hostmask. By popular acclaim, a /16
- * hostmask is used by default. */
- unsigned masked_ip, mask, masklen;
- masklen = 16;
- mask = ~0 << masklen;
- masked_ip = ntohl(user->ip.s_addr) & mask;
- hostname = alloca(32);
- if (options & GENMASK_X3MASK) {
- sprintf(hostname, "%d.%d.%d.%d/%d", (masked_ip>>24)&0xFF, (masked_ip>>16)&0xFF, (masked_ip>>8)&0xFF, masked_ip&0xFF, masklen);
+ hostname = (char*)irc_ntoa(&user->ip);
+ } else if ((options & GENMASK_BYIP) || irc_pton(&ip, NULL, hostname)) {
+ /* Should generate an IP-based hostmask. */
+ hostname = alloca(IRC_NTOP_MAX_SIZE);
+ hostname[IRC_NTOP_MAX_SIZE-1] = '\0';
+ if (irc_in_addr_is_ipv4(user->ip)) {
+ /* By popular acclaim, a /16 hostmask is used. */
+ sprintf(hostname, "%d.%d.*", user->ip.in6_8[12], user->ip.in6_8[13]);
+ } else if (irc_in_addr_is_ipv6(user->ip)) {
+ /* Who knows what the default mask should be? Use a /48 to start with. */
+ sprintf(hostname, "%x:%x:%x:*", user->ip.in6[0], user->ip.in6[1], user->ip.in6[2]);
} else {
- int ofs = 0;
- for (ii=0; ii<4; ii++) {
- if (masklen) {
- ofs += sprintf(hostname+ofs, "%d.", (masked_ip>>24)&0xFF);
- masklen -= 8;
- masked_ip <<= 8;
- } else {
- ofs += sprintf(hostname+ofs, "*.");
- }
- }
- /* Truncate the last . */
- hostname[ofs-1] = 0;
+ /* Unknown type; just copy IP directly. */
+ irc_ntop(hostname, IRC_NTOP_MAX_SIZE, &user->ip);
}
} else {
int cnt;