*
* 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
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
#include "ioset.h"
#include "log.h"
#include "nickserv.h"
+#include "spamserv.h"
#include "shun.h"
#include "timeq.h"
+#include "version.h"
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
extern unsigned long burst_length;
extern struct cManagerNode cManager;
extern struct policer_params *oper_policer_params, *luser_policer_params;
-extern server_link_func_t *slf_list;
-extern unsigned int slf_size, slf_used;
-extern new_user_func_t *nuf_list;
-extern unsigned int nuf_size, nuf_used;
-extern del_user_func_t *duf_list;
-extern unsigned int duf_size, duf_used;
extern time_t boot_time;
void received_ping(void);
void
socket_destroyed(struct io_fd *fd)
{
- if (fd && fd->eof)
+ if (fd && fd->state != IO_CONNECTED)
log_module(MAIN_LOG, LOG_ERROR, "Connection to server lost.");
socket_io_fd = NULL;
cManager.uplink->state = DISCONNECTED;
while (!quit_services) {
if (!replay_connected) {
/* this time fudging is to get some of the logging right */
- self->link = self->boot = now;
+ self->link_time = self->boot = now;
cManager.uplink->state = AUTHENTICATING;
irc_introduce(cManager.uplink->password);
replay_connected = 1;
socket_io_fd->readable_cb = uplink_readable;
socket_io_fd->destroy_cb = socket_destroyed;
socket_io_fd->line_reads = 1;
- socket_io_fd->wants_reads = 1;
log_module(MAIN_LOG, LOG_INFO, "Connection to server established.");
cManager.uplink = target;
target->state = AUTHENTICATING;
replay_connected = 0;
socket_destroyed(socket_io_fd);
} else {
- ioset_close(socket_io_fd->fd, 1);
+ ioset_close(socket_io_fd, 3);
+ socket_io_fd = NULL;
}
}
log_module(MAIN_LOG, LOG_ERROR, "Could not find VERSION origin user %s", origin);
return 0;
}
- irc_numeric(user, 351, "%s %s %s", PACKAGE_TARNAME, PACKAGE_VERSION, self->name);
+ irc_numeric(user, 351, "%s %s+[%s] %s", PACKAGE_TARNAME, PACKAGE_VERSION, cvs_version, self->name);
return 1;
}
static struct chanmsg_func {
chanmsg_func_t func;
struct userNode *service;
+ void *extra;
} chanmsg_funcs[256]; /* indexed by trigger character */
static struct allchanmsg_func {
{
struct privmsg_desc *pd = data;
struct modeNode *mn;
- struct chanmsg_func *cf = &chanmsg_funcs[(unsigned char)pd->text[0]];
+ struct chanmsg_func *cf;
int x;
/* Don't complain if it can't find the modeNode because the channel might
mn->idle_since = now;
/* Never send a NOTICE to a channel to one of the services */
- if (!pd->is_notice && cf->func
- && ((cn->modes & MODE_REGISTERED) || GetUserMode(cn, cf->service)))
- cf->func(pd->user, cn, pd->text+1, cf->service);
+ cf = &chanmsg_funcs[(unsigned char)pd->text[0]];
+ if (!pd->is_notice && cf->func)
+ cf->func(pd->user, cn, pd->text+1, cf->service, pd->is_notice, cf->extra);
+ 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++) {
if (!cf->func)
break; /* end of list */
else
- cf->func(pd->user, cn, pd->text, cf->service);
+ cf->func(pd->user, cn, pd->text, cf->service, pd->is_notice, cf->extra);
}
}
irc_numeric(pd->user, ERR_NOSUCHNICK, "%s@%s :No such nick", name, self->name);
}
+struct part_desc {
+ struct userNode *user;
+ const char *text;
+};
+
static void
part_helper(struct chanNode *cn, void *data)
{
- DelChannelUser(data, cn, false, 0);
+ struct part_desc *desc = data;
+ DelChannelUser(desc->user, cn, desc->text, false);
+}
+
+static CMD_FUNC(cmd_part)
+{
+ struct part_desc desc;
+
+ if (argc < 2)
+ return 0;
+ desc.user = GetUserH(origin);
+ if (!desc.user)
+ return 0;
+ desc.text = (argc > 2) ? argv[argc - 1] : NULL;
+ parse_foreach(argv[1], part_helper, NULL, NULL, NULL, &desc);
+ return 1;
}
void
-reg_chanmsg_func(unsigned char prefix, struct userNode *service, chanmsg_func_t handler)
+reg_chanmsg_func(unsigned char prefix, struct userNode *service, chanmsg_func_t handler, void *extra)
{
if (chanmsg_funcs[prefix].func)
log_module(MAIN_LOG, LOG_WARNING, "Re-registering new chanmsg handler for character `%c'.", prefix);
chanmsg_funcs[prefix].func = handler;
chanmsg_funcs[prefix].service = service;
+ chanmsg_funcs[prefix].extra = extra;
}
void
}
static mode_change_func_t *mcf_list;
+static void **mcf_list_extra;
static unsigned int mcf_size = 0, mcf_used = 0;
void
-reg_mode_change_func(mode_change_func_t handler)
+reg_mode_change_func(mode_change_func_t handler, void *extra)
{
if (mcf_used == mcf_size) {
if (mcf_size) {
mcf_size <<= 1;
mcf_list = realloc(mcf_list, mcf_size*sizeof(mode_change_func_t));
+ mcf_list_extra = realloc(mcf_list_extra, mcf_size*sizeof(void*));
} else {
mcf_size = 8;
mcf_list = malloc(mcf_size*sizeof(mode_change_func_t));
+ mcf_list_extra = malloc(mcf_size*sizeof(void*));
}
}
- mcf_list[mcf_used++] = handler;
+ mcf_list[mcf_used] = handler;
+ mcf_list_extra[mcf_used++] = extra;
+}
+
+static oper_func_t *of_list;
+static void **of_list_extra;
+static unsigned int of_size = 0, of_used = 0;
+
+void
+reg_oper_func(oper_func_t handler, void *extra)
+{
+ if (of_used == of_size) {
+ if (of_size) {
+ of_size <<= 1;
+ of_list = realloc(of_list, of_size*sizeof(oper_func_t));
+ of_list_extra = realloc(of_list_extra, of_size*sizeof(void*));
+ } else {
+ of_size = 8;
+ of_list = malloc(of_size*sizeof(oper_func_t));
+ of_list_extra = malloc(of_size*sizeof(void*));
+ }
+ }
+ of_list[of_used] = handler;
+ of_list_extra[of_used++] = extra;
+}
+
+static void
+call_oper_funcs(struct userNode *user)
+{
+ unsigned int n;
+ if (IsLocal(user))
+ return;
+ for (n=0; (n<of_used) && !user->dead; n++)
+ {
+ of_list[n](user, of_list_extra[n]);
+ }
}
struct mod_chanmode *
mod_chanmode_apply(who, channel, change);
if (flags & MC_NOTIFY)
for (ii = 0; ii < mcf_used; ++ii)
- mcf_list[ii](channel, who, change);
+ mcf_list[ii](channel, who, change, mcf_list_extra[ii]);
mod_chanmode_free(change);
return 1;
}
}
static user_mode_func_t *um_list;
+static void **um_list_extra;
static unsigned int um_size = 0, um_used = 0;
void
-reg_user_mode_func(user_mode_func_t handler)
+reg_user_mode_func(user_mode_func_t handler, void *extra)
{
if (um_used == um_size) {
if (um_size) {
um_size <<= 1;
um_list = realloc(um_list, um_size*sizeof(user_mode_func_t));
+ um_list_extra = realloc(um_list_extra, um_size*sizeof(void*));
} else {
um_size = 8;
um_list = malloc(um_size*sizeof(user_mode_func_t));
+ um_list_extra = malloc(um_size*sizeof(void*));
}
}
- um_list[um_used++] = handler;
+ um_list[um_used] = handler;
+ um_list_extra[um_used++] = extra;
}
void
{
unsigned int n;
for (n=0; n<um_used; n++) {
- um_list[n](user, mode_change);
+ um_list[n](user, mode_change, um_list_extra[n]);
}
}
static channel_mode_func_t *cm_list;
+static void **cm_list_extra;
static unsigned int cm_size = 0, cm_used = 0;
void
-reg_channel_mode_func(channel_mode_func_t handler)
+reg_channel_mode_func(channel_mode_func_t handler, void *extra)
{
if (cm_used == cm_size) {
if (cm_size) {
cm_size <<= 1;
cm_list = realloc(cm_list, cm_size*sizeof(channel_mode_func_t));
+ cm_list_extra = realloc(cm_list_extra, cm_size*sizeof(void*));
} else {
cm_size = 8;
cm_list = malloc(cm_size*sizeof(channel_mode_func_t));
+ cm_list_extra = malloc(cm_size*sizeof(void*));
}
}
- cm_list[cm_used++] = handler;
+ cm_list[cm_used] = handler;
+ cm_list_extra[cm_used++] = extra;
}
void
{
unsigned int n;
for (n=0; n<cm_used; n++) {
- cm_list[n](who, channel, modes, argc);
+ cm_list[n](who, channel, modes, argc, cm_list_extra[n]);
}
}
hostname = user->hostname;
if (IsFakeHost(user) && IsHiddenHost(user) && !(options & GENMASK_NO_HIDING)) {
hostname = user->fakehost;
- } else if (IsHiddenHost(user) && user->handle_info && hidden_host_suffix && !(options & GENMASK_NO_HIDING)) {
- hostname = alloca(strlen(user->handle_info->handle) + strlen(hidden_host_suffix) + 2);
- sprintf(hostname, "%s.%s", user->handle_info->handle, hidden_host_suffix);
+ } else if (IsHiddenHost(user)) {
+ int style = 1;
+ char *data;
+ data = conf_get_data("server/hidden_host_type", RECDB_QSTRING);
+ if (data)
+ style = atoi(data);
+
+ if ((style == 1) && user->handle_info && hidden_host_suffix && !(options & GENMASK_NO_HIDING)) {
+ hostname = alloca(strlen(user->handle_info->handle) + strlen(hidden_host_suffix) + 2);
+ sprintf(hostname, "%s.%s", user->handle_info->handle, hidden_host_suffix);
+ } else if ((style == 2) && !(options & GENMASK_NO_HIDING)) {
+ hostname = alloca(strlen(user->crypthost));
+ sprintf(hostname, "%s", user->crypthost);
+ }
} else if (options & GENMASK_STRICT_HOST) {
if (options & GENMASK_BYIP)
hostname = (char*)irc_ntoa(&user->ip);
for (ii=cnt=0; hostname[ii]; ii++)
if (hostname[ii] == '.')
cnt++;
- if (cnt == 1) {
- /* only a two-level domain name; leave hostname */
+ if (cnt == 0 || cnt == 1) {
+ /* only a one- or two-level domain name; leave hostname */
} else if (cnt == 2) {
for (ii=0; user->hostname[ii] != '.'; ii++) ;
/* Add 3 to account for the *. and \0. */
}
return 1;
}
+
+
+unsigned int
+irc_user_modes(const struct userNode *user, char modes[], size_t length)
+{
+ unsigned int ii, jj;
+
+ for (ii = jj = 0; (jj < length) && (irc_user_mode_chars[ii] != '\0'); ++ii) {
+ if ((user->modes & (1 << ii)) && (irc_user_mode_chars[ii] != ' '))
+ modes[jj++] = irc_user_mode_chars[ii];
+ }
+
+ ii = jj;
+ while (jj < length)
+ modes[jj++] = '\0';
+
+ return ii;
+}
+