X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fproto-common.c;h=ee089ad4ecaa9368b3d28fdccbbab1bfabc1c384;hb=b179b2c1631c053404b888f0bef816aed43995c4;hp=7226977f7a01cf4871212f0b99987d6d1819d096;hpb=48b08787286d7d777611c7b1658d42d424b7df59;p=srvx.git diff --git a/src/proto-common.c b/src/proto-common.c index 7226977..ee089ad 100644 --- a/src/proto-common.c +++ b/src/proto-common.c @@ -1,5 +1,5 @@ /* proto-common.c - common IRC protocol parsing/sending support - * Copyright 2000-2004 srvx Development Team + * Copyright 2000-2006 srvx Development Team * * This file is part of srvx. * @@ -92,7 +92,7 @@ uplink_readable(struct io_fd *fd) { 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; @@ -134,7 +134,7 @@ create_socket_client(struct uplinkNode *target) 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; @@ -144,7 +144,6 @@ create_socket_client(struct uplinkNode *target) 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; @@ -275,7 +274,8 @@ close_socket(void) 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; } } @@ -311,11 +311,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 +330,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(); @@ -431,7 +431,7 @@ privmsg_chan_helper(struct chanNode *cn, void *data) { 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,8 +440,8 @@ 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 = &chanmsg_funcs[(unsigned char)pd->text[0]]; + if (!pd->is_notice && cf->func && GetUserMode(cn, cf->service) && !IsDeaf(cf->service)) cf->func(pd->user, cn, pd->text+1, cf->service); /* This catches *all* text sent to the channel that the services server sees */ @@ -464,17 +464,37 @@ privmsg_invalid(char *name, void *data) 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) { 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; } @@ -505,13 +525,13 @@ 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; } @@ -543,6 +563,8 @@ mod_chanmode_dup(struct mod_chanmode *orig, unsigned int extra) 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])); } @@ -561,6 +583,10 @@ mod_chanmode_apply(struct userNode *who, struct chanNode *channel, struct mod_ch 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: @@ -569,9 +595,10 @@ mod_chanmode_apply(struct userNode *who, struct chanNode *channel, struct mod_ch * to be more specific than an existing ban. */ for (jj=0; jjbanlist.used; ++jj) { - if (match_ircglobs(change->args[ii].u.hostmask, channel->banlist.list[jj]->ban)) { - banList_remove(&channel->banlist, channel->banlist.list[jj]); - free(channel->banlist.list[jj]); + bn = channel->banlist.list[jj]; + if (match_ircglobs(change->args[ii].u.hostmask, bn->ban)) { + banList_remove(&channel->banlist, bn); + free(bn); jj--; } } @@ -586,10 +613,11 @@ mod_chanmode_apply(struct userNode *who, struct chanNode *channel, struct mod_ch break; case MODE_REMOVE|MODE_BAN: for (jj=0; jjbanlist.used; ++jj) { - if (strcmp(channel->banlist.list[jj]->ban, change->args[ii].u.hostmask)) + bn = channel->banlist.list[jj]; + if (strcmp(bn->ban, change->args[ii].u.hostmask)) continue; - free(channel->banlist.list[jj]); - banList_remove(&channel->banlist, channel->banlist.list[jj]); + free(bn); + banList_remove(&channel->banlist, bn); break; } break; @@ -620,12 +648,18 @@ mod_chanmode_free(struct mod_chanmode *change) 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; if (flags & MC_ANNOUNCE) mod_chanmode_announce(who, channel, change); @@ -646,14 +680,16 @@ irc_make_chanmode(struct chanNode *chan, char *out) 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)); } 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 */ @@ -680,30 +716,20 @@ generate_hostmask(struct userNode *user, int options) 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_SRVXMASK) { - 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; @@ -711,8 +737,8 @@ generate_hostmask(struct userNode *user, int options) 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. */