X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fproto-p10.c;h=8e00b6a3cd0a48700b1227c88a145a4798676a70;hb=331265c9ef7ea608c352ffa8315878206db6d6e5;hp=4d64e830b9a4a60062a93826c18fc9aaf817b504;hpb=de32b9d4f1ce5452935401196a60799afc3882f2;p=srvx.git diff --git a/src/proto-p10.c b/src/proto-p10.c index 4d64e83..8e00b6a 100644 --- a/src/proto-p10.c +++ b/src/proto-p10.c @@ -21,9 +21,9 @@ #include "proto-common.c" /* Full commands. */ -#define CMD_ACCOUNT "ACCOUNT" +#define CMD_ACCOUNT "ACCOUNT" #define CMD_ADMIN "ADMIN" -#define CMD_ASLL "ASLL" +#define CMD_ASLL "ASLL" #define CMD_AWAY "AWAY" #define CMD_BURST "BURST" #define CMD_CLEARMODE "CLEARMODE" @@ -40,7 +40,7 @@ #define CMD_EOB_ACK "EOB_ACK" #define CMD_ERROR "ERROR" #define CMD_FAKEHOST "FAKE" -#define CMD_GET "GET" +#define CMD_GET "GET" #define CMD_GLINE "GLINE" #define CMD_HASH "HASH" #define CMD_HELP "HELP" @@ -68,18 +68,18 @@ #define CMD_PONG "PONG" #define CMD_POST "POST" #define CMD_PRIVMSG "PRIVMSG" -#define CMD_PRIVS "PRIVS" +#define CMD_PRIVS "PRIVS" #define CMD_PROTO "PROTO" #define CMD_QUIT "QUIT" #define CMD_REHASH "REHASH" -#define CMD_RESET "RESET" +#define CMD_RESET "RESET" #define CMD_RESTART "RESTART" #define CMD_RPING "RPING" #define CMD_RPONG "RPONG" #define CMD_SERVER "SERVER" #define CMD_SERVLIST "SERVLIST" #define CMD_SERVSET "SERVSET" -#define CMD_SET "SET" +#define CMD_SET "SET" #define CMD_SETTIME "SETTIME" #define CMD_SILENCE "SILENCE" #define CMD_SQUERY "SQUERY" @@ -103,9 +103,9 @@ #define CMD_WHOWAS "WHOWAS" /* Tokenized commands. */ -#define TOK_ACCOUNT "AC" +#define TOK_ACCOUNT "AC" #define TOK_ADMIN "AD" -#define TOK_ASLL "LL" +#define TOK_ASLL "LL" #define TOK_AWAY "A" #define TOK_BURST "B" #define TOK_CLEARMODE "CM" @@ -122,7 +122,7 @@ #define TOK_EOB_ACK "EA" #define TOK_ERROR "Y" #define TOK_FAKEHOST "FA" -#define TOK_GET "GET" +#define TOK_GET "GET" #define TOK_GLINE "GL" #define TOK_HASH "HASH" #define TOK_HELP "HELP" @@ -150,18 +150,18 @@ #define TOK_PONG "Z" #define TOK_POST "POST" #define TOK_PRIVMSG "P" -#define TOK_PRIVS "PRIVS" +#define TOK_PRIVS "PRIVS" #define TOK_PROTO "PROTO" #define TOK_QUIT "Q" #define TOK_REHASH "REHASH" -#define TOK_RESET "RESET" +#define TOK_RESET "RESET" #define TOK_RESTART "RESTART" #define TOK_RPING "RI" #define TOK_RPONG "RO" #define TOK_SERVER "S" #define TOK_SERVLIST "SERVSET" #define TOK_SERVSET "SERVSET" -#define TOK_SET "SET" +#define TOK_SET "SET" #define TOK_SETTIME "SE" #define TOK_SILENCE "U" #define TOK_SQUERY "SQUERY" @@ -196,9 +196,9 @@ #define TYPE(NAME) CMD_ ## NAME #endif /* ENABLE_TOKENS */ -#define P10_ACCOUNT TYPE(ACCOUNT) +#define P10_ACCOUNT TYPE(ACCOUNT) #define P10_ADMIN TYPE(ADMIN) -#define P10_ASLL TYPE(ASLL) +#define P10_ASLL TYPE(ASLL) #define P10_AWAY TYPE(AWAY) #define P10_BURST TYPE(BURST) #define P10_CLEARMODE TYPE(CLEARMODE) @@ -215,7 +215,7 @@ #define P10_EOB_ACK TYPE(EOB_ACK) #define P10_ERROR TYPE(ERROR) #define P10_FAKEHOST TYPE(FAKEHOST) -#define P10_GET TYPE(GET) +#define P10_GET TYPE(GET) #define P10_GLINE TYPE(GLINE) #define P10_HASH TYPE(HASH) #define P10_HELP TYPE(HELP) @@ -243,18 +243,18 @@ #define P10_PONG TYPE(PONG) #define P10_POST TYPE(POST) #define P10_PRIVMSG TYPE(PRIVMSG) -#define P10_PRIVS TYPE(PRIVS) +#define P10_PRIVS TYPE(PRIVS) #define P10_PROTO TYPE(PROTO) #define P10_QUIT TYPE(QUIT) #define P10_REHASH TYPE(REHASH) -#define P10_RESET TYPE(RESET) +#define P10_RESET TYPE(RESET) #define P10_RESTART TYPE(RESTART) #define P10_RPING TYPE(RPING) #define P10_RPONG TYPE(RPONG) #define P10_SERVER CMD_SERVER #define P10_SERVLIST TYPE(SERVLIST) #define P10_SERVSET TYPE(SERVSET) -#define P10_SET TYPE(SET) +#define P10_SET TYPE(SET) #define P10_SETTIME TYPE(SETTIME) #define P10_SILENCE TYPE(SILENCE) #define P10_SQUERY TYPE(SQUERY) @@ -289,10 +289,10 @@ static unsigned int num_privmsg_funcs; static privmsg_func_t *notice_funcs; static unsigned int num_notice_funcs; static struct dict *unbursted_channels; -static char *his_servername; -static char *his_servercomment; +static const char *his_servername; +static const char *his_servercomment; -static struct userNode *AddUser(struct server* uplink, const char *nick, const char *ident, const char *hostname, const char *modes, const char *numeric, const char *userinfo, time_t timestamp, const char *realip); +static struct userNode *AddUser(struct server* uplink, const char *nick, const char *ident, const char *hostname, const char *modes, const char *numeric, const char *userinfo, unsigned long timestamp, const char *realip); extern int off_channel; @@ -368,10 +368,10 @@ irc_server(struct server *srv) inttobase64(extranum, srv->num_mask, (srv->numeric[1] || (srv->num_mask >= 64*64)) ? 3 : 2); if (srv == self) { /* The +s, ignored by Run's ircu, means "service" to Undernet's ircu */ - putsock(P10_SERVER " %s %d %li %li J10 %s%s +s6 :%s", + putsock(P10_SERVER " %s %d %lu %lu J10 %s%s +s6 :%s", srv->name, srv->hops+1, srv->boot, srv->link, srv->numeric, extranum, srv->description); } else { - putsock("%s " P10_SERVER " %s %d %li %li %c10 %s%s +s6 :%s", + putsock("%s " P10_SERVER " %s %d %lu %lu %c10 %s%s +s6 :%s", self->numeric, srv->name, srv->hops+1, srv->boot, srv->link, (srv->self_burst ? 'J' : 'P'), srv->numeric, extranum, srv->description); } } @@ -475,16 +475,20 @@ irc_user(struct userNode *user) modes[modelen++] = 'd'; if (IsGlobal(user)) modes[modelen++] = 'g'; + if (IsNoChan(user)) + modes[modelen++] = 'n'; if (IsHiddenHost(user)) modes[modelen++] = 'x'; + if (IsNoIdle(user)) + modes[modelen++] = 'I'; modes[modelen] = 0; /* we don't need to put the + in modes because it's in the format string. */ - putsock("%s " P10_NICK " %s %d %li %s %s +%s %s %s :%s", - user->uplink->numeric, user->nick, user->uplink->hops+1, user->timestamp, user->ident, user->hostname, modes, b64ip, user->numeric, user->info); + putsock("%s " P10_NICK " %s %d %lu %s %s +%s %s %s :%s", + user->uplink->numeric, user->nick, user->uplink->hops+1, (unsigned long)user->timestamp, user->ident, user->hostname, modes, b64ip, user->numeric, user->info); } else { - putsock("%s " P10_NICK " %s %d %li %s %s %s %s :%s", - user->uplink->numeric, user->nick, user->uplink->hops+1, user->timestamp, user->ident, user->hostname, b64ip, user->numeric, user->info); + putsock("%s " P10_NICK " %s %d %lu %s %s %s %s :%s", + user->uplink->numeric, user->nick, user->uplink->hops+1, (unsigned long)user->timestamp, user->ident, user->hostname, b64ip, user->numeric, user->info); } } @@ -509,7 +513,7 @@ irc_regnick(UNUSED_ARG(struct userNode *user)) void irc_nick(struct userNode *user, UNUSED_ARG(const char *old_nick)) { - putsock("%s " P10_NICK " %s "FMT_TIME_T, user->numeric, user->nick, now); + putsock("%s " P10_NICK " %s %lu", user->numeric, user->nick, (unsigned long)now); } void @@ -634,7 +638,7 @@ irc_pong_asll(const char *who, const char *orig_ts) orig.tv_usec = (*delim == '.') ? strtoul(delim + 1, NULL, 10) : 0; gettimeofday(&now, NULL); diff = (now.tv_sec - orig.tv_sec) * 1000 + (now.tv_usec - orig.tv_usec) / 1000; - putsock("%s " P10_PONG " %s %s %d " FMT_TIME_T ".%06u", self->numeric, who, orig_ts, diff, now.tv_sec, (unsigned)now.tv_usec); + putsock("%s " P10_PONG " %s %s %d %lu.%06lu", self->numeric, who, orig_ts, diff, (unsigned long)now.tv_sec, (unsigned long)now.tv_usec); } void @@ -659,20 +663,20 @@ void irc_gline(struct server *srv, struct gline *gline) { if (gline->lastmod) - putsock("%s " P10_GLINE " %s +%s %ld %ld :%s", - self->numeric, (srv ? srv->numeric : "*"), gline->target, gline->expires-now, gline->lastmod, gline->reason); + putsock("%s " P10_GLINE " %s +%s %lu %lu :%s", + self->numeric, (srv ? srv->numeric : "*"), gline->target, (unsigned long)(gline->expires-now), (unsigned long)gline->lastmod, gline->reason); else - putsock("%s " P10_GLINE " %s +%s %ld :%s", - self->numeric, (srv ? srv->numeric : "*"), gline->target, gline->expires-now, gline->reason); + putsock("%s " P10_GLINE " %s +%s %lu :%s", + self->numeric, (srv ? srv->numeric : "*"), gline->target, (unsigned long)(gline->expires-now), gline->reason); } void -irc_settime(const char *srv_name_mask, time_t new_time) +irc_settime(const char *srv_name_mask, unsigned long new_time) { ioset_set_time(new_time); if (!strcmp(srv_name_mask, "*")) srv_name_mask = ""; - putsock("%s " P10_SETTIME " " FMT_TIME_T " %s", self->numeric, new_time, srv_name_mask); + putsock("%s " P10_SETTIME " %lu %s", self->numeric, new_time, srv_name_mask); } void @@ -692,8 +696,9 @@ irc_burst(struct chanNode *chan) unsigned int first_ban; unsigned int n; - base_len = sprintf(burst_line, "%s " P10_BURST " %s " FMT_TIME_T " ", - self->numeric, chan->name, chan->timestamp); + base_len = sprintf(burst_line, "%s " P10_BURST " %s %lu ", + self->numeric, chan->name, + (unsigned long)chan->timestamp); len = irc_make_chanmode(chan, burst_line+base_len); pos = base_len + len; if (len > 0 && chan->members.used > 0) @@ -787,9 +792,9 @@ irc_kill(struct userNode *from, struct userNode *target, const char *message) void irc_mode(struct userNode *from, struct chanNode *target, const char *modes) { - putsock("%s " P10_MODE " %s %s "FMT_TIME_T, + putsock("%s " P10_MODE " %s %s %lu", (from ? from->numeric : self->numeric), - target->name, modes, target->timestamp); + target->name, modes, (unsigned long)target->timestamp); } void @@ -803,9 +808,10 @@ irc_join(struct userNode *who, struct chanNode *what) { if (what->members.used == 1) { putsock("%s " P10_CREATE " %s %lu", - who->numeric, what->name, what->timestamp); + who->numeric, what->name, (unsigned long)what->timestamp); } else { - putsock("%s " P10_JOIN " %s %lu", who->numeric, what->name, what->timestamp); + putsock("%s " P10_JOIN " %s %lu", who->numeric, what->name, + (unsigned long)what->timestamp); } } @@ -828,7 +834,7 @@ irc_stats(struct userNode *from, struct server *target, char type) void irc_svsnick(struct userNode *from, struct userNode *target, const char *newnick) { - putsock("%s " P10_SVSNICK " %s %s "FMT_TIME_T, from->uplink->numeric, target->numeric, newnick, now); + putsock("%s " P10_SVSNICK " %s %s %lu", from->uplink->numeric, target->numeric, newnick, (unsigned long)now); } void @@ -888,6 +894,8 @@ static CMD_FUNC(cmd_whois) { struct userNode *from; struct userNode *who; + char buf[MAXLEN]; + unsigned int i, mlen, len; if (argc < 3) return 0; @@ -895,21 +903,73 @@ static CMD_FUNC(cmd_whois) log_module(MAIN_LOG, LOG_ERROR, "Could not find WHOIS origin user %s", origin); return 0; } - if(!(who = GetUserH(argv[2]))) { + if (!(who = GetUserH(argv[2]))) { irc_numeric(from, ERR_NOSUCHNICK, "%s@%s :No such nick", argv[2], self->name); return 1; } - if (IsHiddenHost(who) && !IsOper(from)) { - /* Just stay quiet. */ - return 1; + + if (IsFakeHost(who) && IsHiddenHost(who)) + irc_numeric(from, RPL_WHOISUSER, "%s %s %s * :%s", who->nick, who->ident, who->fakehost, who->info); + else if (IsHiddenHost(who) && who->handle_info && hidden_host_suffix) + irc_numeric(from, RPL_WHOISUSER, "%s %s %s.%s * :%s", who->nick, who->ident, who->handle_info->handle, hidden_host_suffix, who->info); + else + irc_numeric(from, RPL_WHOISUSER, "%s %s %s * :%s", who->nick, who->ident, who->hostname, who->info); + + if ((!IsService(who) && !IsNoChan(who)) || (from == who)) { + struct modeNode *mn; + mlen = strlen(self->name) + strlen(from->nick) + 12 + strlen(who->nick); + len = 0; + *buf = '\0'; + for (i = who->channels.used; i > 0; ) + { + mn = who->channels.list[--i]; + + if (!IsOper(from) && (mn->channel->modes & (MODE_PRIVATE | MODE_SECRET)) && !GetUserMode(mn->channel, from)) + continue; + + if (len + strlen(mn->channel->name) + mlen > MAXLEN - 5) + { + irc_numeric(from, RPL_WHOISCHANNELS, "%s :%s", who->nick, buf); + *buf = '\0'; + len = 0; + } + + if (IsDeaf(who)) + *(buf + len++) = '-'; + if ((mn->channel->modes & (MODE_PRIVATE | MODE_SECRET)) && !GetUserMode(mn->channel, from)) + *(buf + len++) = '*'; + if (mn->modes & MODE_CHANOP) + *(buf + len++) = '@'; + else if (mn->modes & MODE_VOICE) + *(buf + len++) = '+'; + + if (len) + *(buf + len) = '\0'; + strcpy(buf + len, mn->channel->name); + len += strlen(mn->channel->name); + strcat(buf + len, " "); + len++; + } + if (buf[0] != '\0') + irc_numeric(from, RPL_WHOISCHANNELS, "%s :%s", who->nick, buf); } - irc_numeric(from, RPL_WHOISUSER, "%s %s %s * :%s", who->nick, who->ident, who->hostname, who->info); - if (his_servername && his_servercomment) + + if (his_servername && his_servercomment && !IsOper(from) && from != who) irc_numeric(from, RPL_WHOISSERVER, "%s %s :%s", who->nick, his_servername, his_servercomment); else irc_numeric(from, RPL_WHOISSERVER, "%s %s :%s", who->nick, who->uplink->name, who->uplink->description); + + if (IsAway(who)) + irc_numeric(from, RPL_AWAY, "%s :Away", who->nick); if (IsOper(who)) - irc_numeric(from, RPL_WHOISOPERATOR, "%s :is a megalomaniacal power hungry tyrant", who->nick); + irc_numeric(from, RPL_WHOISOPERATOR, "%s :%s", who->nick, IsLocal(who) ? "is a megalomaniacal power hungry tyrant" : "is an IRC Operator"); + if (who->handle_info) + irc_numeric(from, RPL_WHOISACCOUNT, "%s %s :is logged in as", who->nick, who->handle_info->handle); + if (IsHiddenHost(who) && who->handle_info && (IsOper(from) || from == who)) + irc_numeric(from, RPL_WHOISACTUALLY, "%s %s@%s %s :Actual user@host, Actual IP", who->nick, who->ident, who->hostname, irc_ntoa(&who->ip)); + if (IsLocal(who) && !IsService(who) && (!IsNoIdle(who) || IsOper(from) || from == who)) + irc_numeric(from, RPL_WHOISIDLE, "%s %ld %ld :seconds idle, signon time", who->nick, now - who->idle_since, who->timestamp); + irc_numeric(from, RPL_ENDOFWHOIS, "%s :End of /WHOIS list", who->nick); return 1; } @@ -945,7 +1005,7 @@ static CMD_FUNC(cmd_server) if (srv->boot <= PREHISTORY) { /* Server from the mists of time.. */ if (srv->hops == 1) { - log_module(MAIN_LOG, LOG_ERROR, "Server %s claims to have booted at time "FMT_TIME_T". This is absurd.", srv->name, srv->boot); + log_module(MAIN_LOG, LOG_ERROR, "Server %s claims to have booted at time %lu. This is absurd.", srv->name, (unsigned long)srv->boot); } } else if ((str = conf_get_data("server/reliable_clock", RECDB_QSTRING)) && enabled_string(str)) { @@ -960,7 +1020,7 @@ static CMD_FUNC(cmd_server) } } if (srv == self->uplink) { - extern time_t burst_begin; + extern unsigned long burst_begin; burst_begin = now; } return 1; @@ -992,7 +1052,7 @@ static CMD_FUNC(cmd_eob) static CMD_FUNC(cmd_eob_ack) { - extern time_t burst_begin; + extern unsigned long burst_begin; if (GetServerH(origin) == self->uplink) { burst_length = now - burst_begin; @@ -1033,7 +1093,7 @@ static CMD_FUNC(cmd_error_nick) struct create_desc { struct userNode *user; - time_t when; + unsigned long when; }; static void @@ -1159,7 +1219,7 @@ static CMD_FUNC(cmd_burst) long mode; int oplevel = -1; char *user, *end, sep; - time_t in_timestamp; + unsigned long in_timestamp; if (argc < 3) return 0; @@ -1173,6 +1233,8 @@ static CMD_FUNC(cmd_burst) if ((*pos == 'k') || (*pos == 'l') || (*pos == 'A') || (*pos == 'U')) n_modes++; + if (next + n_modes > argc) + n_modes = argc - next; unsplit_string(argv+next, n_modes, modes); next += n_modes; break; @@ -1316,7 +1378,7 @@ static CMD_FUNC(cmd_clearmode) static CMD_FUNC(cmd_topic) { struct chanNode *cn; - time_t chan_ts, topic_ts; + unsigned long chan_ts, topic_ts; if (argc < 3) return 0; @@ -1375,7 +1437,7 @@ static CMD_FUNC(cmd_num_topic) static CMD_FUNC(cmd_num_gline) { - time_t lastmod; + unsigned long lastmod; if (argc < 6) return 0; lastmod = (argc > 5) ? strtoul(argv[5], NULL, 0) : 0; @@ -1453,13 +1515,13 @@ static CMD_FUNC(cmd_squit) static CMD_FUNC(cmd_privmsg) { struct privmsg_desc pd; - if (argc != 3) + if (argc < 3) return 0; pd.user = GetUserH(origin); if (!pd.user || (IsGagged(pd.user) && !IsOper(pd.user))) return 1; pd.is_notice = 0; - pd.text = argv[2]; + pd.text = argv[argc - 1]; parse_foreach(argv[1], privmsg_chan_helper, NULL, privmsg_user_helper, privmsg_invalid, &pd); return 1; } @@ -1467,13 +1529,13 @@ static CMD_FUNC(cmd_privmsg) static CMD_FUNC(cmd_notice) { struct privmsg_desc pd; - if (argc != 3) + if (argc < 3) return 0; pd.user = GetUserH(origin); if (!pd.user || (IsGagged(pd.user) && !IsOper(pd.user))) return 1; pd.is_notice = 1; - pd.text = argv[2]; + pd.text = argv[argc - 1]; parse_foreach(argv[1], privmsg_chan_helper, NULL, privmsg_user_helper, privmsg_invalid, &pd); return 1; } @@ -1494,7 +1556,7 @@ static CMD_FUNC(cmd_away) static CMD_FUNC(cmd_gline) { - time_t lastmod; + unsigned long lastmod; if (argc < 3) return 0; @@ -1552,6 +1614,8 @@ parse_cleanup(void) static void p10_conf_reload(void) { hidden_host_suffix = conf_get_data("server/hidden_host", RECDB_QSTRING); + his_servername = conf_get_data("server/his_servername", RECDB_QSTRING); + his_servercomment = conf_get_data("server/his_servercomment", RECDB_QSTRING); } static void @@ -1589,11 +1653,6 @@ init_parse(void) else inttobase64(numer, (numnick << 18) + (usermask & 0x3ffff), 5); - str = conf_get_data("server/his_servername", RECDB_QSTRING); - his_servername = str ? strdup(str) : NULL; - str = conf_get_data("server/his_servercomment", RECDB_QSTRING); - his_servercomment = str ? strdup(str) : NULL; - str = conf_get_data("server/hostname", RECDB_QSTRING); desc = conf_get_data("server/description", RECDB_QSTRING); if (!str || !desc) { @@ -1850,7 +1909,7 @@ make_numeric(struct server *svr, int local_num, char *outbuf) } struct server * -AddServer(struct server *uplink, const char *name, int hops, time_t boot, time_t link, const char *numeric, const char *description) +AddServer(struct server *uplink, const char *name, int hops, unsigned long boot, unsigned long link, const char *numeric, const char *description) { struct server* sNode; int slen, mlen; @@ -1937,7 +1996,7 @@ AddLocalUser(const char *nick, const char *ident, const char *hostname, const ch { char numeric[COMBO_NUMERIC_LEN+1]; int local_num = get_local_numeric(); - time_t timestamp = now; + unsigned long timestamp = now; struct userNode *old_user = GetUserH(nick); if (!modes) @@ -1962,7 +2021,7 @@ AddClone(const char *nick, const char *ident, const char *hostname, const char * { char numeric[COMBO_NUMERIC_LEN+1]; int local_num = get_local_numeric(); - time_t timestamp = now; + unsigned long timestamp = now; struct userNode *old_user = GetUserH(nick); if (old_user) { @@ -1994,23 +2053,23 @@ is_valid_nick(const char *nick) { } static struct userNode* -AddUser(struct server* uplink, const char *nick, const char *ident, const char *hostname, const char *modes, const char *numeric, const char *userinfo, time_t timestamp, const char *realip) +AddUser(struct server* uplink, const char *nick, const char *ident, const char *hostname, const char *modes, const char *numeric, const char *userinfo, unsigned long timestamp, const char *realip) { struct userNode *oldUser, *uNode; unsigned int n, ignore_user, dummy; if ((strlen(numeric) < 3) || (strlen(numeric) > 5)) { - log_module(MAIN_LOG, LOG_WARNING, "AddUser(%p, %s, ...): numeric %s wrong length!", uplink, nick, numeric); + log_module(MAIN_LOG, LOG_WARNING, "AddUser(%p, %s, ...): numeric %s wrong length!", (void*)uplink, nick, numeric); return NULL; } if (!uplink) { - log_module(MAIN_LOG, LOG_WARNING, "AddUser(%p, %s, ...): server for numeric %s doesn't exist!", uplink, nick, numeric); + log_module(MAIN_LOG, LOG_WARNING, "AddUser(%p, %s, ...): server for numeric %s doesn't exist!", (void*)uplink, nick, numeric); return NULL; } if (uplink != GetServerN(numeric)) { - log_module(MAIN_LOG, LOG_WARNING, "AddUser(%p, %s, ...): server for numeric %s differs from nominal uplink %s.", uplink, nick, numeric, uplink->name); + log_module(MAIN_LOG, LOG_WARNING, "AddUser(%p, %s, ...): server for numeric %s differs from nominal uplink %s.", (void*)uplink, nick, numeric, uplink->name); return NULL; } @@ -2018,19 +2077,25 @@ AddUser(struct server* uplink, const char *nick, const char *ident, const char * if (dummy) { ++modes; } else if (!is_valid_nick(nick)) { - log_module(MAIN_LOG, LOG_WARNING, "AddUser(%p, %s, ...): invalid nickname detected.", uplink, nick); + log_module(MAIN_LOG, LOG_WARNING, "AddUser(%p, %s, ...): invalid nickname detected.", (void*)uplink, nick); return NULL; } ignore_user = 0; if ((oldUser = GetUserH(nick))) { - if (IsLocal(oldUser) && (IsService(oldUser) || IsPersistent(oldUser))) { - /* The service should collide the new user off. */ + if (IsLocal(oldUser) + && (IsService(oldUser) || IsPersistent(oldUser)) + && !uplink->burst) { + /* The service should collide the new user off - but not + * if the new user is coming in during a burst. (During a + * burst, the bursting server will kill either our user -- + * triggering a ReintroduceUser() -- or its own.) + */ oldUser->timestamp = timestamp - 1; irc_user(oldUser); } if (oldUser->timestamp > timestamp) { - /* "Old" user is really newer; remove them */ + /* "Old" user is really newer; remove them. */ DelUser(oldUser, 0, 1, "Overruled by older nick"); } else { /* User being added is too new; do not add them to @@ -2049,6 +2114,7 @@ AddUser(struct server* uplink, const char *nick, const char *ident, const char * safestrncpy(uNode->numeric, numeric, sizeof(uNode->numeric)); irc_p10_pton(&uNode->ip, realip); uNode->timestamp = timestamp; + uNode->idle_since = timestamp; modeList_init(&uNode->channels); uNode->uplink = uplink; if (++uNode->uplink->clients > uNode->uplink->max_clients) { @@ -2144,29 +2210,31 @@ void mod_usermode(struct userNode *user, const char *mode_change) { while (*word == ' ') word++; while (1) { #define do_user_mode(FLAG) do { if (add) user->modes |= FLAG; else user->modes &= ~FLAG; } while (0) - switch (*mode_change++) { - case 0: case ' ': return; - case '+': add = 1; break; - case '-': add = 0; break; - case 'o': - do_user_mode(FLAGS_OPER); - if (add) { - userList_append(&curr_opers, user); - call_oper_funcs(user); - } else { - userList_remove(&curr_opers, user); - } - break; - case 'i': do_user_mode(FLAGS_INVISIBLE); - if (add) + switch (*mode_change++) { + case 0: case ' ': return; + case '+': add = 1; break; + case '-': add = 0; break; + case 'o': + do_user_mode(FLAGS_OPER); + if (!add) { + userList_remove(&curr_opers, user); + } else if (!userList_contains(&curr_opers, user)) { + userList_append(&curr_opers, user); + call_oper_funcs(user); + } + break; + case 'i': do_user_mode(FLAGS_INVISIBLE); + if (add) invis_clients++; else invis_clients--; - break; - case 'w': do_user_mode(FLAGS_WALLOP); break; - case 'd': do_user_mode(FLAGS_DEAF); break; - case 'k': do_user_mode(FLAGS_SERVICE); break; - case 'g': do_user_mode(FLAGS_GLOBAL); break; + break; + case 'w': do_user_mode(FLAGS_WALLOP); break; + case 'd': do_user_mode(FLAGS_DEAF); break; + case 'k': do_user_mode(FLAGS_SERVICE); break; + case 'g': do_user_mode(FLAGS_GLOBAL); break; + case 'n': do_user_mode(FLAGS_NOCHAN); break; + case 'I': do_user_mode(FLAGS_NOIDLE); break; case 'x': do_user_mode(FLAGS_HIDDEN_HOST); break; case 'r': if (*word) { @@ -2192,7 +2260,7 @@ void mod_usermode(struct userNode *user, const char *mode_change) { assign_fakehost(user, host, 0); } break; - } + } #undef do_user_mode } } @@ -2229,14 +2297,14 @@ mod_chanmode_parse(struct chanNode *channel, char **modes, unsigned int argc, un case 'r': do_chan_mode(MODE_REGONLY); break; case 's': do_chan_mode(MODE_SECRET); break; case 't': do_chan_mode(MODE_TOPICLIMIT); break; - case 'z': - if (!(flags & MCP_REGISTERED)) { - do_chan_mode(MODE_REGISTERED); - } else { - mod_chanmode_free(change); - return NULL; - } - break; + case 'z': + if (!(flags & MCP_REGISTERED)) { + do_chan_mode(MODE_REGISTERED); + } else { + mod_chanmode_free(change); + return NULL; + } + break; #undef do_chan_mode case 'l': if (add) { @@ -2444,7 +2512,7 @@ mod_chanmode_announce(struct userNode *who, struct chanNode *channel, struct mod mod_chanmode_append(&chbuf, 'k', channel->key); if (change->modes_clear & channel->modes & MODE_UPASS) mod_chanmode_append(&chbuf, 'U', channel->upass); - if (change->modes_clear * channel->modes & MODE_APASS) + if (change->modes_clear & channel->modes & MODE_APASS) mod_chanmode_append(&chbuf, 'A', channel->apass); } for (arg = 0; arg < change->argc; ++arg) { @@ -2689,9 +2757,10 @@ reg_privmsg_func(struct userNode *user, privmsg_func_t handler) { unsigned int numeric = user->num_local; if (numeric >= num_privmsg_funcs) { - int newnum = numeric + 8; + int newnum = numeric + 8, ii; privmsg_funcs = realloc(privmsg_funcs, newnum*sizeof(privmsg_func_t)); - memset(privmsg_funcs+num_privmsg_funcs, 0, (newnum-num_privmsg_funcs)*sizeof(privmsg_func_t)); + for (ii = num_privmsg_funcs; ii < newnum; ++ii) + privmsg_funcs[ii] = NULL; num_privmsg_funcs = newnum; } if (privmsg_funcs[numeric]) @@ -2700,20 +2769,12 @@ reg_privmsg_func(struct userNode *user, privmsg_func_t handler) } void -unreg_privmsg_func(struct userNode *user, privmsg_func_t handler) +unreg_privmsg_func(struct userNode *user) { - unsigned int x; + if (!IsLocal(user) || user->num_local >= num_privmsg_funcs) + return; /* this really only works with users */ - if (!user || handler) - return; /* this really only works with users */ - - memset(privmsg_funcs+user->num_local, 0, sizeof(privmsg_func_t)); - - for (x = user->num_local+1; x < num_privmsg_funcs; x++) - memmove(privmsg_funcs+x-1, privmsg_funcs+x, sizeof(privmsg_func_t)); - - privmsg_funcs = realloc(privmsg_funcs, num_privmsg_funcs*sizeof(privmsg_func_t)); - num_privmsg_funcs--; + privmsg_funcs[user->num_local] = NULL; } @@ -2722,9 +2783,10 @@ reg_notice_func(struct userNode *user, privmsg_func_t handler) { unsigned int numeric = user->num_local; if (numeric >= num_notice_funcs) { - int newnum = numeric + 8; + int newnum = numeric + 8, ii; notice_funcs = realloc(notice_funcs, newnum*sizeof(privmsg_func_t)); - memset(notice_funcs+num_notice_funcs, 0, (newnum-num_notice_funcs)*sizeof(privmsg_func_t)); + for (ii = num_privmsg_funcs; ii < newnum; ++ii) + privmsg_funcs[ii] = NULL; num_notice_funcs = newnum; } if (notice_funcs[numeric]) @@ -2733,34 +2795,25 @@ reg_notice_func(struct userNode *user, privmsg_func_t handler) } void -unreg_notice_func(struct userNode *user, privmsg_func_t handler) +unreg_notice_func(struct userNode *user) { - unsigned int x; - - if (!user || handler) - return; /* this really only works with users */ - - memset(notice_funcs+user->num_local, 0, sizeof(privmsg_func_t)); + if (!IsLocal(user) || user->num_local >= num_privmsg_funcs) + return; /* this really only works with users */ - for (x = user->num_local+1; x < num_notice_funcs; x++) - memmove(notice_funcs+x-1, notice_funcs+x, sizeof(privmsg_func_t)); - - memset(notice_funcs+user->num_local, 0, sizeof(privmsg_func_t)); - notice_funcs = realloc(notice_funcs, num_notice_funcs*sizeof(privmsg_func_t)); - num_notice_funcs--; + notice_funcs[user->num_local] = NULL; } 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)); - } + 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; } @@ -2772,7 +2825,7 @@ call_oper_funcs(struct userNode *user) if (IsLocal(user)) return; for (n=0; n