X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fproto-common.c;h=bc37f32a13aa945940a109cba3d627f620120c43;hb=HEAD;hp=abb3a91cd74491dc560b70362e753f860d3efab4;hpb=d7c7d5df2965b905f9987c16fc86111b7a1a82a5;p=srvx.git diff --git a/src/proto-common.c b/src/proto-common.c index abb3a91..bc37f32 100644 --- a/src/proto-common.c +++ b/src/proto-common.c @@ -23,6 +23,9 @@ #include "ioset.h" #include "log.h" #include "nickserv.h" +#include "opserv.h" +#include "chanserv.h" +#include "spamserv.h" #include "timeq.h" #ifdef HAVE_SYS_SOCKET_H #include @@ -57,7 +60,7 @@ 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; +extern unsigned long boot_time; void received_ping(void); @@ -105,7 +108,7 @@ void replay_event_loop(void) 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; @@ -155,7 +158,7 @@ void replay_read_line(void) { struct tm timestamp; - time_t new_time; + unsigned long new_time; if (replay_line[0]) return; read_line: @@ -185,7 +188,7 @@ replay_read_line(void) timestamp.tm_year = strtoul(replay_line+16, NULL, 10) - 1900; timestamp.tm_isdst = 0; new_time = mktime(×tamp); - if (new_time == -1) { + if (new_time == (unsigned long)-1) { log_module(MAIN_LOG, LOG_ERROR, "Unable to parse time struct tm_sec=%d tm_min=%d tm_hour=%d tm_mday=%d tm_mon=%d tm_year=%d", timestamp.tm_sec, timestamp.tm_min, timestamp.tm_hour, timestamp.tm_mday, timestamp.tm_mon, timestamp.tm_year); } else { now = new_time; @@ -274,7 +277,7 @@ close_socket(void) replay_connected = 0; socket_destroyed(socket_io_fd); } else { - ioset_close(socket_io_fd, 1); + ioset_close(socket_io_fd, 3); socket_io_fd = NULL; } } @@ -311,11 +314,11 @@ static CMD_FUNC(cmd_pass) return 0; true_pass = cManager.uplink->their_password; if (true_pass && strcmp(true_pass, argv[1])) { - /* It might be good to mark the uplink as unavailable when - this happens, though there should be a way of resetting - the flag. */ - irc_squit(self, "Incorrect password received.", NULL); - return 1; + /* It might be good to mark the uplink as unavailable when + this happens, though there should be a way of resetting + the flag. */ + irc_squit(self, "Incorrect password received.", NULL); + return 1; } cManager.uplink->state = BURSTING; @@ -330,13 +333,13 @@ static CMD_FUNC(cmd_dummy) static CMD_FUNC(cmd_error) { - if (argv[1]) log_module(MAIN_LOG, LOG_ERROR, "Error: %s", argv[1]); + if (argv[1]) log_module(MAIN_LOG, LOG_ERROR, "Error from ircd: %s", argv[1]); log_module(MAIN_LOG, LOG_ERROR, "Error received from uplink, squitting."); if (cManager.uplink->state != CONNECTED) { - /* Error messages while connected should be fine. */ - cManager.uplink->flags |= UPLINK_UNAVAILABLE; - log_module(MAIN_LOG, LOG_ERROR, "Disabling uplink."); + /* Error messages while connected should be fine. */ + cManager.uplink->flags |= UPLINK_UNAVAILABLE; + log_module(MAIN_LOG, LOG_ERROR, "Disabling uplink."); } close_socket(); @@ -353,7 +356,8 @@ static CMD_FUNC(cmd_stats) return 0; switch (argv[1][0]) { case 'u': { - unsigned int uptime = now - boot_time; + unsigned long uptime; + uptime = now - boot_time; irc_numeric(un, RPL_STATSUPTIME, ":Server Up %d days %d:%02d:%02d", uptime/(24*60*60), (uptime/(60*60))%24, (uptime/60)%60, uptime%60); irc_numeric(un, RPL_MAXCONNECTIONS, ":Highest connection count: %d (%d clients)", @@ -429,9 +433,10 @@ struct privmsg_desc { static void privmsg_chan_helper(struct chanNode *cn, void *data) { + extern unsigned short offchannel_allowed[256]; 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 @@ -440,9 +445,13 @@ privmsg_chan_helper(struct chanNode *cn, void *data) 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 (cf->func && !pd->is_notice + && (offchannel_allowed[(unsigned char)pd->text[0]] + || (GetUserMode(cn, cf->service) && !IsDeaf(cf->service)))) + cf->func(pd->user, cn, pd->text+1, cf->service, pd->is_notice); + 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++) { @@ -450,7 +459,7 @@ privmsg_chan_helper(struct chanNode *cn, void *data) 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); } } @@ -474,6 +483,8 @@ part_helper(struct chanNode *cn, void *data) { struct part_desc *desc = data; DelChannelUser(desc->user, cn, desc->text, false); + if (IsOper(desc->user)) + operpart(cn, desc->user); } static CMD_FUNC(cmd_part) @@ -494,7 +505,7 @@ void reg_chanmsg_func(unsigned char prefix, struct userNode *service, chanmsg_func_t handler) { if (chanmsg_funcs[prefix].func) - log_module(MAIN_LOG, LOG_WARNING, "Re-registering new chanmsg handler for character `%c'.", prefix); + 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; } @@ -525,17 +536,75 @@ void reg_mode_change_func(mode_change_func_t handler) { if (mcf_used == mcf_size) { - if (mcf_size) { - mcf_size <<= 1; - mcf_list = realloc(mcf_list, mcf_size*sizeof(mode_change_func_t)); - } else { - mcf_size = 8; - mcf_list = malloc(mcf_size*sizeof(mode_change_func_t)); - } + if (mcf_size) { + mcf_size <<= 1; + mcf_list = realloc(mcf_list, mcf_size*sizeof(mode_change_func_t)); + } else { + mcf_size = 8; + mcf_list = malloc(mcf_size*sizeof(mode_change_func_t)); + } } mcf_list[mcf_used++] = handler; } +static oper_func_t *of_list; +static unsigned int of_size = 0, of_used = 0; + +void +reg_oper_func(oper_func_t handler) +{ + if (of_used == of_size) { + if (of_size) { + of_size <<= 1; + of_list = realloc(of_list, of_size*sizeof(oper_func_t)); + } else { + of_size = 8; + of_list = malloc(of_size*sizeof(oper_func_t)); + } + } + of_list[of_used++] = handler; +} + +static void +call_oper_funcs(struct userNode *user) +{ + unsigned int n; + if (IsLocal(user)) + return; + for (n=0; (ndead; n++) + { + of_list[n](user); + } +} + +static xquery_func_t *xqf_list; +static unsigned int xqf_size = 0, xqf_used = 0; + +void +reg_xquery_func(xquery_func_t handler) +{ + if (xqf_used == xqf_size) { + if (xqf_size) { + xqf_size <<= 1; + xqf_list = realloc(xqf_list, xqf_size*sizeof(xquery_func_t)); + } else { + xqf_size = 8; + xqf_list = malloc(xqf_size*sizeof(xquery_func_t)); + } + } + xqf_list[xqf_used++] = handler; +} + +static void +call_xquery_funcs(struct server *source, const char routing[], const char query[]) +{ + unsigned int n; + for (n=0; n < xqf_used; n++) + { + xqf_list[n](source, routing, query); + } +} + struct mod_chanmode * mod_chanmode_alloc(unsigned int argc) { @@ -562,6 +631,9 @@ mod_chanmode_dup(struct mod_chanmode *orig, unsigned int extra) res->modes_set = orig->modes_set; res->modes_clear = orig->modes_clear; res->new_limit = orig->new_limit; + res->new_access = orig->new_access; + memcpy(res->new_altchan, orig->new_altchan, sizeof(res->new_altchan)); + memcpy(res->new_noflood, orig->new_noflood, sizeof(res->new_noflood)); 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)); @@ -581,8 +653,14 @@ mod_chanmode_apply(struct userNode *who, struct chanNode *channel, struct mod_ch channel->modes = (channel->modes & ~change->modes_clear) | change->modes_set; if (change->modes_set & MODE_LIMIT) channel->limit = change->new_limit; + if (change->modes_set & MODE_ACCESS) + channel->access = change->new_access; if (change->modes_set & MODE_KEY) strcpy(channel->key, change->new_key); + if (change->modes_set & MODE_ALTCHAN) + strcpy(channel->altchan, change->new_altchan); + if (change->modes_set & MODE_NOFLOOD) + strcpy(channel->noflood, change->new_noflood); if (change->modes_set & MODE_UPASS) strcpy(channel->upass, change->new_upass); if (change->modes_set & MODE_APASS) @@ -659,7 +737,7 @@ mod_chanmode(struct userNode *who, struct chanNode *channel, char **modes, unsig base_oplevel = member->oplevel; else base_oplevel = MAXOPLEVEL; - if (!(change = mod_chanmode_parse(channel, modes, argc, flags, base_oplevel))) + if (!(change = mod_chanmode_parse(channel, who, modes, argc, flags, base_oplevel))) return 0; if (flags & MC_ANNOUNCE) mod_chanmode_announce(who, channel, change); @@ -679,6 +757,9 @@ irc_make_chanmode(struct chanNode *chan, char *out) mod_chanmode_init(&change); change.modes_set = chan->modes; change.new_limit = chan->limit; + change.new_access = chan->access; + safestrncpy(change.new_altchan, chan->altchan, sizeof(change.new_altchan)); + safestrncpy(change.new_noflood, chan->noflood, sizeof(change.new_noflood)); 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)); @@ -703,6 +784,8 @@ generate_hostmask(struct userNode *user, int options) ident = user->ident; else if (options & GENMASK_ANY_IDENT) ident = "*"; + else if (IsFakeIdent(user) && IsHiddenHost(user) && !(options & GENMASK_NO_HIDING)) + ident = user->fakeident; else { ident = alloca(strlen(user->ident)+2); ident[0] = '*'; @@ -710,7 +793,12 @@ generate_hostmask(struct userNode *user, int options) } hostname = user->hostname; if (IsFakeHost(user) && IsHiddenHost(user) && !(options & GENMASK_NO_HIDING)) { - hostname = user->fakehost; + if(user->fakehost && user->fakehost[0] == '$') { + hostname = alloca(strlen(user->handle_info->handle) + strlen(user->fakehost)); + sprintf(hostname, "%s%s", user->handle_info->handle, user->fakehost+1); + } else { + 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); @@ -726,7 +814,7 @@ generate_hostmask(struct userNode *user, int options) 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]); + sprintf(hostname, "%x:%x:%x:*", ntohs(user->ip.in6[0]), ntohs(user->ip.in6[1]), ntohs(user->ip.in6[2])); } else { /* Unknown type; just copy IP directly. */ irc_ntop(hostname, IRC_NTOP_MAX_SIZE, &user->ip); @@ -784,3 +872,20 @@ IsChannelName(const char *name) { } 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; +}