X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fsend.c;h=b9309b85337fb67f7a5a41f3459c759721648ea3;hb=c13fbd5384338be6c99d529db9b6ba787afcb1c0;hp=0ba355522275c33eb559dc2ccf49d52080d46519;hpb=522addf0bccff2db2f0cf12f064b8fce3a2a4927;p=ircu2.10.12-pk.git diff --git a/ircd/send.c b/ircd/send.c index 0ba3555..b9309b8 100644 --- a/ircd/send.c +++ b/ircd/send.c @@ -29,6 +29,7 @@ #include "client.h" #include "ircd.h" #include "ircd_features.h" +#include "ircd_log.h" #include "ircd_snprintf.h" #include "ircd_string.h" #include "list.h" @@ -43,13 +44,10 @@ #include "struct.h" #include "sys.h" -#include +/* #include -- Now using assert in ircd_log.h */ #include #include - -/** Marker values for last message sent to a particular connection. */ -static int sentalong[MAXCONNECTIONS]; /** Last used marker value. */ static int sentalong_marker; /** Array of users with the corresponding server notice mask bit set. */ @@ -154,7 +152,10 @@ kill_highest_sendq(int servers_too) */ void flush_connections(struct Client* cptr) { + struct SSLConnection *ssl = cli_connect(cptr)->con_ssl; if (cptr) { + if(ssl) + ssl_connection_flush(ssl); send_queued(cptr); } else { @@ -163,6 +164,7 @@ void flush_connections(struct Client* cptr) assert(0 < MsgQLength(&(con_sendQ(con)))); send_queued(con_client(con)); } + ssl_connection_flush(NULL); } } @@ -365,6 +367,47 @@ void sendcmdto_prio_one(struct Client *from, const char *cmd, const char *tok, msgq_clean(mb); } +/** + * Send a (prefixed) command to all servers matching or not matching a + * flag but one. + * @param[in] from Client sending the command. + * @param[in] cmd Long name of command (ignored). + * @param[in] tok Short name of command. + * @param[in] one Client direction to skip (or NULL). + * @param[in] require Only send to servers with this Flag bit set. + * @param[in] forbid Do not send to servers with this Flag bit set. + * @param[in] pattern Format string for command arguments. + */ +void sendcmdto_flag_serv_butone(struct Client *from, const char *cmd, + const char *tok, struct Client *one, + int require, int forbid, + const char *pattern, ...) +{ + struct VarData vd; + struct MsgBuf *mb; + struct DLink *lp; + + vd.vd_format = pattern; /* set up the struct VarData for %v */ + va_start(vd.vd_args, pattern); + + /* use token */ + mb = msgq_make(&me, "%C %s %v", from, tok, &vd); + va_end(vd.vd_args); + + /* send it to our downlinks */ + for (lp = cli_serv(&me)->down; lp; lp = lp->next) { + if (one && lp->value.cptr == cli_from(one)) + continue; + if ((require < FLAG_LAST_FLAG) && !HasFlag(lp->value.cptr, require)) + continue; + if ((forbid < FLAG_LAST_FLAG) && HasFlag(lp->value.cptr, forbid)) + continue; + send_buffer(lp->value.cptr, mb, 0); + } + + msgq_clean(mb); +} + /** * Send a (prefixed) command to all servers but one. * @param[in] from Client sending the command. @@ -398,18 +441,28 @@ void sendcmdto_serv_butone(struct Client *from, const char *cmd, msgq_clean(mb); } -/* XXX sentalong_marker used XXX - * - * There is not an easy way to revoke the need for sentalong_marker - * from this function. Thoughts and ideas would be welcome... -Kev - * - * One possibility would be to internalize the sentalong array; that - * could be prohibitively big, though. We could get around that by - * making one that's the number of connected servers or something... - * or perhaps by adding a special flag to the servers we've sent a - * message to, and then a final loop through the connected servers - * to delete the flag. -Kev +/** Safely increment the sentalong marker. + * This increments the sentalong marker. Since new connections will + * have con_sentalong() == 0, and to avoid confusion when the counter + * wraps, we reset all sentalong markers to zero when the sentalong + * marker hits zero. + * @param[in,out] one Client to mark with new sentalong marker (if any). */ +static void +bump_sentalong(struct Client *one) +{ + if (!++sentalong_marker) + { + int ii; + for (ii = 0; ii < HighestFd; ++ii) + if (LocalClientArray[ii]) + cli_sentalong(LocalClientArray[ii]) = 0; + ++sentalong_marker; + } + if (one) + cli_sentalong(one) = sentalong_marker; +} + /** Send a (prefixed) command to all channels that \a from is on. * @param[in] from Client originating the command. * @param[in] cmd Long name of command. @@ -439,9 +492,7 @@ void sendcmdto_common_channels_butone(struct Client *from, const char *cmd, mb = msgq_make(0, "%:#C %s %v", from, cmd, &vd); va_end(vd.vd_args); - sentalong_marker++; - if (-1 < cli_fd(cli_from(from))) - sentalong[cli_fd(cli_from(from))] = sentalong_marker; + bump_sentalong(from); /* * loop through from's channels, and the members on their channels */ @@ -450,10 +501,11 @@ void sendcmdto_common_channels_butone(struct Client *from, const char *cmd, continue; for (member = chan->channel->members; member; member = member->next_member) - if (MyConnect(member->user) && -1 < cli_fd(cli_from(member->user)) && - member->user != one && - sentalong[cli_fd(cli_from(member->user))] != sentalong_marker) { - sentalong[cli_fd(cli_from(member->user))] = sentalong_marker; + if (MyConnect(member->user) + && -1 < cli_fd(cli_from(member->user)) + && member->user != one + && cli_sentalong(member->user) != sentalong_marker) { + cli_sentalong(member->user) = sentalong_marker; send_buffer(member->user, mb, 0); } } @@ -504,19 +556,14 @@ void sendcmdto_channel_butserv_butone(struct Client *from, const char *cmd, msgq_clean(mb); } -/* - * Send a (prefixed) command to all servers with users on the channel - * specified by ; and are ignored by this function. - * - * XXX sentalong_marker used XXX - */ /** Send a (prefixed) command to all servers with users on \a to. + * Skip \a from and \a one plus those indicated in \a skip. * @param[in] from Client originating the command. * @param[in] cmd Long name of command (ignored). * @param[in] tok Short name of command. * @param[in] to Destination channel. * @param[in] one Client direction to skip (or NULL). - * @param[in] skip Ignored field. + * @param[in] skip Bitmask of SKIP_NONOPS and SKIP_NONVOICES indicating which clients to skip. * @param[in] pattern Format string for command arguments. */ void sendcmdto_channel_servers_butone(struct Client *from, const char *cmd, @@ -535,40 +582,26 @@ void sendcmdto_channel_servers_butone(struct Client *from, const char *cmd, va_end(vd.vd_args); /* send the buffer to each server */ - sentalong_marker++; + bump_sentalong(one); + cli_sentalong(from) = sentalong_marker; for (member = to->members; member; member = member->next_member) { - if (cli_from(member->user) == one - || MyConnect(member->user) + if (MyConnect(member->user) || IsZombie(member) || cli_fd(cli_from(member->user)) < 0 - || sentalong[cli_fd(cli_from(member->user))] == sentalong_marker) + || cli_sentalong(member->user) == sentalong_marker + || (skip & SKIP_NONOPS && !IsChanOp(member)) + || (skip & SKIP_NONVOICES && !IsChanOp(member) && !HasVoice(member))) continue; - sentalong[cli_fd(cli_from(member->user))] = sentalong_marker; + cli_sentalong(member->user) = sentalong_marker; send_buffer(member->user, serv_mb, 0); } msgq_clean(serv_mb); } -/* - * Send a (prefixed) command to all users on this channel, including - * remote users; users to skip may be specified by setting appropriate - * flags in the argument. will also be skipped. - */ -/* XXX sentalong_marker used XXX - * - * We can drop sentalong_marker from this function by adding a field to - * channels and to connections; what we do is make a user's connection - * a "member" of the channel by adding it to the new list, and we use - * the struct Membership status as a reference count. Then, to implement - * this function, we just walk the list of connections. Unfortunately, - * this doesn't account for sending only to channel ops, or for not - * sending to +d users; we could account for that by splitting those - * counts out, but that would imply adding two more fields (at least) to - * the struct Membership... -Kev - */ /** Send a (prefixed) command to all users on this channel, except for * \a one and those matching \a skip. + * @warning \a pattern must not contain %v. * @param[in] from Client originating the command. * @param[in] cmd Long name of command. * @param[in] tok Short name of command. @@ -601,18 +634,18 @@ void sendcmdto_channel_butone(struct Client *from, const char *cmd, va_end(vd.vd_args); /* send buffer along! */ - sentalong_marker++; + bump_sentalong(one); for (member = to->members; member; member = member->next_member) { /* skip one, zombies, and deaf users... */ - if (cli_from(member->user) == one || IsZombie(member) || + if (IsZombie(member) || (skip & SKIP_DEAF && IsDeaf(member->user)) || (skip & SKIP_NONOPS && !IsChanOp(member)) || (skip & SKIP_NONVOICES && !IsChanOp(member) && !HasVoice(member)) || (skip & SKIP_BURST && IsBurstOrBurstAck(cli_from(member->user))) || cli_fd(cli_from(member->user)) < 0 || - sentalong[cli_fd(cli_from(member->user))] == sentalong_marker) + cli_sentalong(member->user) == sentalong_marker) continue; - sentalong[cli_fd(cli_from(member->user))] = sentalong_marker; + cli_sentalong(member->user) = sentalong_marker; if (MyConnect(member->user)) /* pick right buffer to send */ send_buffer(member->user, user_mb, 0); @@ -625,6 +658,7 @@ void sendcmdto_channel_butone(struct Client *from, const char *cmd, } /** Send a (prefixed) WALL of type \a type to all users except \a one. + * @warning \a pattern must not contain %v. * @param[in] from Source of the command. * @param[in] type One of WALL_DESYNCH, WALL_WALLOPS or WALL_WALLUSERS. * @param[in] one Client direction to skip (or NULL). @@ -639,6 +673,7 @@ void sendwallto_group_butone(struct Client *from, int type, struct Client *one, struct DLink *lp; char *prefix=NULL; char *tok=NULL; + int his_wallops; int i; vd.vd_format = pattern; @@ -665,15 +700,15 @@ void sendwallto_group_butone(struct Client *from, int type, struct Client *one, va_end(vd.vd_args); /* send buffer along! */ + his_wallops = feature_bool(FEAT_HIS_WALLOPS); for (i = 0; i <= HighestFd; i++) { if (!(cptr = LocalClientArray[i]) || (cli_fd(cli_from(cptr)) < 0) || - (type == WALL_DESYNCH && !HasFlag(cptr, FLAG_DEBUG)) || + (type == WALL_DESYNCH && !SendDebug(cptr)) || (type == WALL_WALLOPS && - (!HasFlag(cptr, FLAG_WALLOP) || (feature_bool(FEAT_HIS_WALLOPS) && - !IsAnOper(cptr)))) || - (type == WALL_WALLUSERS && !HasFlag(cptr, FLAG_WALLOP))) + (!SendWallops(cptr) || (his_wallops && !IsAnOper(cptr)))) || + (type == WALL_WALLUSERS && !SendWallops(cptr))) continue; /* skip it */ send_buffer(cptr, mb, 1); } @@ -695,25 +730,8 @@ void sendwallto_group_butone(struct Client *from, int type, struct Client *one, msgq_clean(mb); } -/* - * Send a (prefixed) command to all users who match , under control - * of - */ -/* XXX sentalong_marker used XXX - * - * This is also a difficult one to solve. The basic approach would be - * to walk the client list of each connected server until we find a - * match--but then, we also have to walk the client list of all the - * servers behind that one. We could implement this recursively--or we - * could add (yet another) field to the connection struct that would be - * a linked list of clients introduced through that link, and just walk - * that, making this into an iterative implementation. Unfortunately, - * we probably would not be able to use tail recursion for the recursive - * solution, so a deep network could exhaust our stack space; therefore - * I favor the extra linked list, even though that increases the - * complexity of the database. -Kev - */ /** Send a (prefixed) command to all users matching \a to as \a who. + * @warning \a pattern must not contain %v. * @param[in] from Source of the command. * @param[in] cmd Long name of command. * @param[in] tok Short name of command. @@ -745,13 +763,13 @@ void sendcmdto_match_butone(struct Client *from, const char *cmd, va_end(vd.vd_args); /* send buffer along */ - sentalong_marker++; + bump_sentalong(one); for (cptr = GlobalClientList; cptr; cptr = cli_next(cptr)) { - if (!IsRegistered(cptr) || cli_from(cptr) == one || IsServer(cptr) || - IsMe(cptr) || !match_it(from, cptr, to, who) || cli_fd(cli_from(cptr)) < 0 || - sentalong[cli_fd(cli_from(cptr))] == sentalong_marker) + if (!IsRegistered(cptr) || IsServer(cptr) || cli_fd(cli_from(cptr)) < 0 || + cli_sentalong(cptr) == sentalong_marker || + !match_it(from, cptr, to, who)) continue; /* skip it */ - sentalong[cli_fd(cli_from(cptr))] = sentalong_marker; + cli_sentalong(cptr) = sentalong_marker; if (MyConnect(cptr)) /* send right buffer */ send_buffer(cptr, user_mb, 0);