X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fsend.c;h=b9309b85337fb67f7a5a41f3459c759721648ea3;hb=7fbfc390d32f9acc3192d011b813f66f35370faa;hp=672f608163fb4cf975d0279dc9461af0feeaa42c;hpb=f8d6049993bf3581029b42ce7b528d77a0dfd0bd;p=ircu2.10.12-pk.git diff --git a/ircd/send.c b/ircd/send.c index 672f608..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,7 +44,7 @@ #include "struct.h" #include "sys.h" -#include +/* #include -- Now using assert in ircd_log.h */ #include #include @@ -151,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 { @@ -160,6 +164,7 @@ void flush_connections(struct Client* cptr) assert(0 < MsgQLength(&(con_sendQ(con)))); send_queued(con_client(con)); } + ssl_connection_flush(NULL); } } @@ -362,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. @@ -511,12 +557,13 @@ void sendcmdto_channel_butserv_butone(struct Client *from, const char *cmd, } /** 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, @@ -536,12 +583,14 @@ void sendcmdto_channel_servers_butone(struct Client *from, const char *cmd, /* send the buffer to each server */ bump_sentalong(one); - sentalong_marker++; + cli_sentalong(from) = sentalong_marker; for (member = to->members; member; member = member->next_member) { if (MyConnect(member->user) || IsZombie(member) || cli_fd(cli_from(member->user)) < 0 - || cli_sentalong(member->user) == sentalong_marker) + || cli_sentalong(member->user) == sentalong_marker + || (skip & SKIP_NONOPS && !IsChanOp(member)) + || (skip & SKIP_NONVOICES && !IsChanOp(member) && !HasVoice(member))) continue; cli_sentalong(member->user) = sentalong_marker; send_buffer(member->user, serv_mb, 0); @@ -552,6 +601,7 @@ void sendcmdto_channel_servers_butone(struct Client *from, const char *cmd, /** 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. @@ -608,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). @@ -622,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; @@ -648,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); } @@ -679,6 +731,7 @@ void sendwallto_group_butone(struct Client *from, int type, struct Client *one, } /** 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. @@ -712,9 +765,9 @@ void sendcmdto_match_butone(struct Client *from, const char *cmd, /* send buffer along */ bump_sentalong(one); for (cptr = GlobalClientList; cptr; cptr = cli_next(cptr)) { - if (!IsRegistered(cptr) || IsServer(cptr) || - !match_it(from, cptr, to, who) || cli_fd(cli_from(cptr)) < 0 || - cli_sentalong(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 */ cli_sentalong(cptr) = sentalong_marker;