* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * $Id$
*/
-
-#include "sys.h"
-#include <stdio.h>
-#include "h.h"
-#include "struct.h"
-#include "s_bsd.h"
-#include "s_serv.h"
#include "send.h"
-#include "s_misc.h"
-#include "common.h"
-#include "match.h"
-#include "s_bsd.h"
-#include "list.h"
-#include "ircd.h"
#include "channel.h"
-#include "bsd.h"
#include "class.h"
+#include "client.h"
+#include "ircd.h"
+#include "ircd_snprintf.h"
+#include "ircd_string.h"
+#include "list.h"
+#include "match.h"
+#include "msg.h"
+#include "numnicks.h"
+#include "s_bsd.h"
+#include "s_debug.h"
+#include "s_misc.h"
#include "s_user.h"
#include "sprintf_irc.h"
+#include "struct.h"
+#include "sys.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
-RCSTAG_CC("$Id$");
-char sendbuf[2048];
static int sentalong[MAXCONNECTIONS];
static int sentalong_marker;
-struct SLink *opsarray[32]; /* don't use highest bit unless you change
+struct SLink *opsarray[32]; /* don't use highest bit unless you change
atoi to strtoul in sendto_op_mask() */
-#ifdef GODMODE
-char sendbuf2[2048];
-int sdbflag;
-#endif /* GODMODE */
-
/*
* dead_link
*
* generate ExitClient from the main loop.
*
* If 'notice' is not NULL, it is assumed to be a format
- * for a message to local opers. I can contain only one
+ * for a message to local opers. It can contain only one
* '%s', which will be replaced by the sockhost field of
* the failing link.
*
* like Persons and yet unknown connections...
*/
-static void dead_link(aClient *to, char *notice)
+static void dead_link(struct Client *to, char *notice)
{
- to->flags |= FLAGS_DEADSOCKET;
+ cli_flags(to) |= FLAGS_DEADSOCKET;
/*
* If because of BUFFERPOOL problem then clean dbuf's now so that
* notices don't hurt operators below.
*/
- DBufClear(&to->recvQ);
- DBufClear(&to->sendQ);
+ DBufClear(&(cli_recvQ(to)));
+ MsgQClear(&(cli_sendQ(to)));
- /* Keep a copy of the last comment, for later use... */
- strncpy(LastDeadComment(to), notice, sizeof(LastDeadComment(to)));
- LastDeadComment(to)[sizeof(LastDeadComment(to)) - 1] = 0;
+ /*
+ * Keep a copy of the last comment, for later use...
+ */
+ ircd_strncpy(cli_info(to), notice, REALLEN);
- if (!IsUser(to) && !IsUnknown(to) && !(to->flags & FLAGS_CLOSING))
- sendto_ops("%s for %s", LastDeadComment(to), get_client_name(to, FALSE));
- Debug((DEBUG_ERROR, LastDeadComment(to)));
+ if (!IsUser(to) && !IsUnknown(to) && !(cli_flags(to) & FLAGS_CLOSING))
+ sendto_opmask_butone(0, SNO_OLDSNO, "%s for %s", cli_info(to), cli_name(to));
+ Debug((DEBUG_ERROR, cli_info(to)));
+}
+
+static int can_send(struct Client* to)
+{
+ assert(0 != to);
+ return (IsDead(to) || IsMe(to) || -1 == cli_fd(to)) ? 0 : 1;
}
/*
* client and try to send it. if we cant send it, it goes into the sendQ
* -avalon
*/
-void flush_connections(int fd)
+void flush_connections(struct Client* cptr)
{
- Reg1 int i;
- Reg2 aClient *cptr;
+ if (cptr) {
+ send_queued(cptr);
+ }
+ else {
+ int i;
+ for (i = HighestFd; i >= 0; i--) {
+ if ((cptr = LocalClientArray[i]))
+ send_queued(cptr);
+ }
+ }
+}
- if (fd == me.fd)
- {
- for (i = highest_fd; i >= 0; i--)
- if ((cptr = loc_clients[i]) && DBufLength(&cptr->sendQ) > 0)
- send_queued(cptr);
+/*
+ * flush_sendq_except - run through local client array and flush
+ * the sendq for each client, if the address of the client sendq
+ * is the same as the one specified, it is skipped. This is used
+ * by dbuf_put to try to get some more memory before bailing and
+ * causing the client to be disconnected.
+ */
+void flush_sendq_except(void)
+{
+ int i;
+ struct Client* cptr;
+ for (i = HighestFd; i >= 0; i--) {
+ if ( (cptr = LocalClientArray[i]))
+ send_queued(cptr);
}
- else if (fd >= 0 && (cptr = loc_clients[fd]) && DBufLength(&cptr->sendQ) > 0)
- send_queued(cptr);
}
/*
* when there is a chance that some output would be possible. This
* attempts to empty the send queue as far as possible...
*/
-void send_queued(aClient *to)
+void send_queued(struct Client *to)
{
-#ifndef pyr
- if (to->flags & FLAGS_BLOCKED)
- return; /* Don't bother */
-#endif
- /*
- * Once socket is marked dead, we cannot start writing to it,
- * even if the error is removed...
- */
- if (IsDead(to))
- {
- /*
- * Actually, we should *NEVER* get here--something is
- * not working correct if send_queued is called for a
- * dead socket... --msa
- *
- * But we DO get here since flush_connections() is called
- * from the main loop when a server still had remaining data
- * in its buffer (not ending on a new-line).
- * I rather leave the test here then move it to the main loop
- * though: It wouldn't save cpu and it might introduce a bug :/.
- * --Run
- */
- return;
- }
- while (DBufLength(&to->sendQ) > 0)
- {
- const char *msg;
- size_t len, rlen;
- int tmp;
-
- msg = dbuf_map(&to->sendQ, &len);
- /* Returns always len > 0 */
- if ((tmp = deliver_it(to, msg, len)) < 0)
- {
- dead_link(to, "Write error, closing link");
- return;
+ assert(0 != to);
+ assert(0 != cli_local(to));
+
+ if (IsBlocked(to) || !can_send(to))
+ return; /* Don't bother */
+
+ while (MsgQLength(&(cli_sendQ(to))) > 0) {
+ unsigned int len;
+
+ if ((len = deliver_it(to, &(cli_sendQ(to))))) {
+ msgq_delete(&(cli_sendQ(to)), len);
+ cli_lastsq(to) = MsgQLength(&(cli_sendQ(to))) / 1024;
+ if (IsBlocked(to))
+ break;
}
- rlen = tmp;
- dbuf_delete(&to->sendQ, rlen);
- to->lastsq = DBufLength(&to->sendQ) / 1024;
- if (rlen < len)
- {
- to->flags |= FLAGS_BLOCKED; /* Wait till select() says
- we can write again */
+ else {
+ if (IsDead(to)) {
+ char tmp[512];
+ sprintf(tmp,"Write error: %s",(strerror(cli_error(to))) ? (strerror(cli_error(to))) : "Unknown error" );
+ dead_link(to, tmp);
+ }
break;
}
}
-
- return;
}
-/*
- * send message to single client
- */
-void sendto_one(aClient *to, char *pattern, ...)
+void send_buffer(struct Client* to, struct MsgBuf* buf, int prio)
{
- va_list vl;
- va_start(vl, pattern);
- vsendto_one(to, pattern, vl);
- va_end(vl);
-}
+ assert(0 != to);
+ assert(0 != buf);
-void vsendto_one(aClient *to, char *pattern, va_list vl)
-{
- vsprintf_irc(sendbuf, pattern, vl);
- sendbufto_one(to);
-}
+ if (cli_from(to))
+ to = cli_from(to);
-void sendbufto_one(aClient *to)
-{
- int len;
-
- Debug((DEBUG_SEND, "Sending [%s] to %s", sendbuf, to->name));
-
- if (to->from)
- to = to->from;
- if (IsDead(to))
- return; /* This socket has already
- been marked as dead */
- if (to->fd < 0)
- {
- /* This is normal when 'to' was being closed (via exit_client
- * and close_connection) --Run
- * Print the debug message anyway...
+ if (!can_send(to))
+ /*
+ * This socket has already been marked as dead
*/
- Debug((DEBUG_ERROR, "Local socket %s with negative fd %d... AARGH!",
- to->name, to->fd));
return;
- }
-
- len = strlen(sendbuf);
- if (sendbuf[len - 1] != '\n')
- {
- if (len > 510)
- len = 510;
- sendbuf[len++] = '\r';
- sendbuf[len++] = '\n';
- sendbuf[len] = '\0';
- }
-
- if (IsMe(to))
- {
- char tmp_sendbuf[sizeof(sendbuf)];
- strcpy(tmp_sendbuf, sendbuf);
- sendto_ops("Trying to send [%s] to myself!", tmp_sendbuf);
- return;
- }
-
- if (DBufLength(&to->sendQ) > get_sendq(to))
- {
+ if (MsgQLength(&(cli_sendQ(to))) > get_sendq(to)) {
if (IsServer(to))
- sendto_ops("Max SendQ limit exceeded for %s: "
- SIZE_T_FMT " > " SIZE_T_FMT,
- get_client_name(to, FALSE), DBufLength(&to->sendQ), get_sendq(to));
+ sendto_opmask_butone(0, SNO_OLDSNO, "Max SendQ limit exceeded for %C: "
+ "%zu > %zu", to, MsgQLength(&(cli_sendQ(to))),
+ get_sendq(to));
dead_link(to, "Max sendQ exceeded");
return;
}
- else if (!dbuf_put(&to->sendQ, sendbuf, len))
- {
- dead_link(to, "Buffer allocation error");
- return;
- }
-#ifdef GODMODE
+ Debug((DEBUG_SEND, "Sending [%p] to %s", buf, cli_name(to)));
- if (!sdbflag && !IsUser(to))
- {
- size_t len = strlen(sendbuf) - 2; /* Remove "\r\n" */
- sdbflag = 1;
- strncpy(sendbuf2, sendbuf, len);
- sendbuf2[len] = '\0';
- if (len > 402)
- {
- char c = sendbuf2[200];
- sendbuf2[200] = 0;
- sendto_ops("SND:%-8.8s(%.4d): \"%s...%s\"",
- to->name, len, sendbuf2, &sendbuf2[len - 200]);
- sendbuf2[200] = c;
- }
- else
- sendto_ops("SND:%-8.8s(%.4d): \"%s\"", to->name, len, sendbuf2);
- strcpy(sendbuf, sendbuf2);
- strcat(sendbuf, "\r\n");
- sdbflag = 0;
- }
+ msgq_add(&(cli_sendQ(to)), buf, prio);
-#endif /* GODMODE */
/*
* Update statistics. The following is slightly incorrect
* because it counts messages even if queued, but bytes
* only really sent. Queued bytes get updated in SendQueued.
*/
- to->sendM += 1;
- me.sendM += 1;
- if (to->acpt != &me)
- to->acpt->sendM += 1;
+ ++(cli_sendM(to));
+ ++(cli_sendM(&me));
/*
* This little bit is to stop the sendQ from growing too large when
* there is no need for it to. Thus we call send_queued() every time
* trying to flood that link with data (possible during the net
* relinking done by servers with a large load).
*/
- if (DBufLength(&to->sendQ) / 1024 > to->lastsq)
+ if (MsgQLength(&(cli_sendQ(to))) / 1024 > cli_lastsq(to))
send_queued(to);
}
-static void vsendto_prefix_one(register aClient *to, register aClient *from,
- char *pattern, va_list vl)
+/*
+ * Send a msg to all ppl on servers/hosts that match a specified mask
+ * (used for enhanced PRIVMSGs)
+ *
+ * addition -- Armin, 8jun90 (gruner@informatik.tu-muenchen.de)
+ */
+
+static int match_it(struct Client *one, const char *mask, int what)
{
- if (to && from && MyUser(to) && IsUser(from))
+ switch (what)
{
- static char sender[HOSTLEN + NICKLEN + USERLEN + 5];
- char *par;
- int flag = 0;
- Reg3 anUser *user = from->user;
-
- par = va_arg(vl, char *);
- strcpy(sender, from->name);
- if (user)
- {
- if (*user->username)
- {
- strcat(sender, "!");
- strcat(sender, user->username);
- }
- if (*user->host && !MyConnect(from))
- {
- strcat(sender, "@");
- strcat(sender, user->host);
- flag = 1;
- }
- }
- /*
- * Flag is used instead of strchr(sender, '@') for speed and
- * also since username/nick may have had a '@' in them. -avalon
- */
- if (!flag && MyConnect(from) && *user->host)
- {
- strcat(sender, "@");
- if (IsUnixSocket(from))
- strcat(sender, user->host);
- else
- strcat(sender, from->sockhost);
- }
- *sendbuf = ':';
- strcpy(&sendbuf[1], sender);
- /* Assuming 'pattern' always starts with ":%s ..." */
- vsprintf_irc(sendbuf + strlen(sendbuf), &pattern[3], vl);
+ case MATCH_HOST:
+ return (match(mask, cli_user(one)->host) == 0);
+ case MATCH_SERVER:
+ default:
+ return (match(mask, cli_name(cli_user(one)->server)) == 0);
}
- else
- vsprintf_irc(sendbuf, pattern, vl);
- sendbufto_one(to);
}
-void sendto_channel_butone(aClient *one, aClient *from, aChannel *chptr,
- char *pattern, ...)
+/*
+ * Send a raw command to a single client; use *ONLY* if you absolutely
+ * must send a command without a prefix.
+ */
+void sendrawto_one(struct Client *to, const char *pattern, ...)
{
+ struct MsgBuf *mb;
va_list vl;
- Reg1 Link *lp;
- Reg2 aClient *acptr;
- Reg3 int i;
va_start(vl, pattern);
-
- ++sentalong_marker;
- for (lp = chptr->members; lp; lp = lp->next)
- {
- acptr = lp->value.cptr;
- if (acptr->from == one || /* ...was the one I should skip */
- (lp->flags & CHFL_ZOMBIE) || IsDeaf(acptr))
- continue;
- if (MyConnect(acptr)) /* (It is always a client) */
- vsendto_prefix_one(acptr, from, pattern, vl);
- else if (sentalong[(i = acptr->from->fd)] != sentalong_marker)
- {
- sentalong[i] = sentalong_marker;
- /* Don't send channel messages to links that are still eating
- the net.burst: -- Run 2/1/1997 */
- if (!IsBurstOrBurstAck(acptr->from))
- vsendto_prefix_one(acptr, from, pattern, vl);
- }
- }
+ mb = msgq_vmake(to, pattern, vl);
va_end(vl);
- return;
+
+ send_buffer(to, mb, 0);
+
+ msgq_clean(mb);
}
-void sendto_lchanops_butone(aClient *one, aClient *from, aChannel *chptr,
- char *pattern, ...)
+/*
+ * Send a (prefixed) command to a single client; select which of <cmd>
+ * <tok> to use depending on if to is a server or not. <from> is the
+ * originator of the command.
+ */
+void sendcmdto_one(struct Client *from, const char *cmd, const char *tok,
+ struct Client *to, const char *pattern, ...)
{
va_list vl;
- Reg1 Link *lp;
- Reg2 aClient *acptr;
va_start(vl, pattern);
-
- for (lp = chptr->members; lp; lp = lp->next)
- {
- acptr = lp->value.cptr;
- if (acptr == one || /* ...was the one I should skip */
- !(lp->flags & CHFL_CHANOP) || /* Skip non chanops */
- (lp->flags & CHFL_ZOMBIE) || IsDeaf(acptr))
- continue;
- if (MyConnect(acptr)) /* (It is always a client) */
- vsendto_prefix_one(acptr, from, pattern, vl);
- }
+ vsendcmdto_one(from, cmd, tok, to, pattern, vl);
va_end(vl);
- return;
}
-void sendto_chanopsserv_butone(aClient *one, aClient *from, aChannel *chptr,
- char *pattern, ...)
+void vsendcmdto_one(struct Client *from, const char *cmd, const char *tok,
+ struct Client *to, const char *pattern, va_list vl)
{
- va_list vl;
- Reg1 Link *lp;
- Reg2 aClient *acptr;
- Reg3 int i;
-#ifndef NO_PROTOCOL9
- char target[128];
- char *source, *tp, *msg;
-#endif
+ struct VarData vd;
+ struct MsgBuf *mb;
- va_start(vl, pattern);
+ to = cli_from(to);
- ++sentalong_marker;
- for (lp = chptr->members; lp; lp = lp->next)
- {
- acptr = lp->value.cptr;
- if (acptr->from == acptr || /* Skip local clients */
-#ifndef NO_PROTOCOL9
- Protocol(acptr->from) < 10 || /* Skip P09 links */
-#endif
- acptr->from == one || /* ...was the one I should skip */
- !(lp->flags & CHFL_CHANOP) || /* Skip non chanops */
- (lp->flags & CHFL_ZOMBIE) || IsDeaf(acptr))
- continue;
- if (sentalong[(i = acptr->from->fd)] != sentalong_marker)
- {
- sentalong[i] = sentalong_marker;
- /* Don't send channel messages to links that are
- still eating the net.burst: -- Run 2/1/1997 */
- if (!IsBurstOrBurstAck(acptr->from))
- vsendto_prefix_one(acptr, from, pattern, vl);
- }
- }
+ vd.vd_format = pattern; /* set up the struct VarData for %v */
+ vd.vd_args = vl;
-#ifndef NO_PROTOCOL9
- /* Send message to all 2.9 servers */
- /* This is a hack, because it assumes that we know how `vl' is build up */
- source = va_arg(vl, char *);
- tp = va_arg(vl, char *); /* Channel */
- msg = va_arg(vl, char *);
- for (lp = chptr->members; lp; lp = lp->next)
- {
- acptr = lp->value.cptr;
- if (acptr->from == acptr || /* Skip local clients */
- Protocol(acptr->from) > 9 || /* Skip P10 servers */
- acptr->from == one || /* ...was the one I should skip */
- !(lp->flags & CHFL_CHANOP) || /* Skip non chanops */
- (lp->flags & CHFL_ZOMBIE) || IsDeaf(acptr))
- continue;
- if (sentalong[(i = acptr->from->fd)] != sentalong_marker)
- {
- sentalong[i] = sentalong_marker;
- /* Don't send channel messages to links that are
- still eating the net.burst: -- Run 2/1/1997 */
- if (!IsBurstOrBurstAck(acptr->from))
- {
- Link *lp2;
- aClient *acptr2;
- tp = target;
- *tp = 0;
- /* Find all chanops in this direction: */
- for (lp2 = chptr->members; lp2; lp2 = lp2->next)
- {
- acptr2 = lp2->value.cptr;
- if (acptr2->from == acptr->from && acptr2->from != one &&
- (lp2->flags & CHFL_CHANOP) && !(lp2->flags & CHFL_ZOMBIE) &&
- !IsDeaf(acptr2))
- {
- int len = strlen(acptr2->name);
- if (tp + len + 2 > target + sizeof(target))
- {
- sendto_prefix_one(acptr, from,
- ":%s NOTICE %s :%s", source, target, msg);
- tp = target;
- *tp = 0;
- }
- if (*target)
- strcpy(tp++, ",");
- strcpy(tp, acptr2->name);
- tp += len;
- }
- }
- sendto_prefix_one(acptr, from,
- ":%s NOTICE %s :%s", source, target, msg);
- }
- }
- }
-#endif
+ mb = msgq_make(to, "%:#C %s %v", from, IsServer(to) || IsMe(to) ? tok : cmd,
+ &vd);
- va_end(vl);
- return;
+ send_buffer(to, mb, 0);
+
+ msgq_clean(mb);
}
/*
- * sendto_server_butone
- *
- * Send a message to all connected servers except the client 'one'.
+ * Send a (prefixed) command to all servers but one, using tok; cmd
+ * is ignored in this particular function.
*/
-void sendto_serv_butone(aClient *one, char *pattern, ...)
+void sendcmdto_serv_butone(struct Client *from, const char *cmd,
+ const char *tok, struct Client *one,
+ const char *pattern, ...)
{
- va_list vl;
- Reg1 Dlink *lp;
+ struct VarData vd;
+ struct MsgBuf *mb;
+ struct DLink *lp;
- va_start(vl, pattern);
- vsprintf_irc(sendbuf, pattern, vl);
- va_end(vl);
+ vd.vd_format = pattern; /* set up the struct VarData for %v */
+ va_start(vd.vd_args, pattern);
- for (lp = me.serv->down; lp; lp = lp->next)
- {
- if (one && lp->value.cptr == one->from)
+ /* 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;
- sendbufto_one(lp->value.cptr);
+ send_buffer(lp->value.cptr, mb, 0);
}
+ msgq_clean(mb);
}
/*
- * sendbufto_serv_butone()
+ * Send a (prefix) command originating from <from> to all channels
+ * <from> is locally on. <from> must be a user. <tok> is ignored in
+ * this function.
+ */
+/* 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
*
- * Send prepared sendbuf to all connected servers except the client 'one'
- * -Ghostwolf 18-May-97
+ * 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
*/
-void sendbufto_serv_butone(aClient *one)
+void sendcmdto_common_channels(struct Client *from, const char *cmd,
+ const char *tok, const char *pattern, ...)
{
- Reg1 Dlink *lp;
+ struct VarData vd;
+ struct MsgBuf *mb;
+ struct Membership *chan;
+ struct Membership *member;
- for (lp = me.serv->down; lp; lp = lp->next)
- {
- if (one && lp->value.cptr == one->from)
- continue;
- sendbufto_one(lp->value.cptr);
- }
-}
+ assert(0 != from);
+ assert(0 != cli_from(from));
+ assert(0 != pattern);
+ assert(!IsServer(from) && !IsMe(from));
-/*
- * sendto_common_channels()
- *
- * Sends a message to all people (inclusing `acptr') on local server
- * who are in same channel with client `acptr'.
- */
-void sendto_common_channels(aClient *acptr, char *pattern, ...)
-{
- va_list vl;
- Reg1 Link *chan;
- Reg2 Link *member;
+ vd.vd_format = pattern; /* set up the struct VarData for %v */
- va_start(vl, pattern);
+ va_start(vd.vd_args, pattern);
+
+ /* build the buffer */
+ mb = msgq_make(0, "%:#C %s %v", from, cmd, &vd);
+ va_end(vd.vd_args);
- ++sentalong_marker;
- if (acptr->fd >= 0)
- sentalong[acptr->fd] = sentalong_marker;
- /* loop through acptr's channels, and the members on their channels */
- if (acptr->user)
- for (chan = acptr->user->channel; chan; chan = chan->next)
- for (member = chan->value.chptr->members; member; member = member->next)
- {
- Reg3 aClient *cptr = member->value.cptr;
- if (MyConnect(cptr) && sentalong[cptr->fd] != sentalong_marker)
- {
- sentalong[cptr->fd] = sentalong_marker;
- vsendto_prefix_one(cptr, acptr, pattern, vl);
- }
+ sentalong_marker++;
+ if (-1 < cli_fd(cli_from(from)))
+ sentalong[cli_fd(cli_from(from))] = sentalong_marker;
+ /*
+ * loop through from's channels, and the members on their channels
+ */
+ for (chan = cli_user(from)->channel; chan; chan = chan->next_channel)
+ for (member = chan->channel->members; member;
+ member = member->next_member)
+ if (MyConnect(member->user) && -1 < cli_fd(cli_from(member->user)) &&
+ sentalong[cli_fd(cli_from(member->user))] != sentalong_marker) {
+ sentalong[cli_fd(cli_from(member->user))] = sentalong_marker;
+ send_buffer(member->user, mb, 0);
}
- if (MyConnect(acptr))
- vsendto_prefix_one(acptr, acptr, pattern, vl);
- va_end(vl);
- return;
-}
-/*
- * sendto_channel_butserv
- *
- * Send a message to all members of a channel that
- * are connected to this server.
- */
-void sendto_channel_butserv(aChannel *chptr, aClient *from, char *pattern, ...)
-{
- va_list vl;
- Reg1 Link *lp;
- Reg2 aClient *acptr;
+ if (MyConnect(from))
+ send_buffer(from, mb, 0);
- for (va_start(vl, pattern), lp = chptr->members; lp; lp = lp->next)
- if (MyConnect(acptr = lp->value.cptr) && !(lp->flags & CHFL_ZOMBIE))
- vsendto_prefix_one(acptr, from, pattern, vl);
- va_end(vl);
- return;
+ msgq_clean(mb);
}
/*
- * Send a msg to all ppl on servers/hosts that match a specified mask
- * (used for enhanced PRIVMSGs)
- *
- * addition -- Armin, 8jun90 (gruner@informatik.tu-muenchen.de)
+ * Send a (prefixed) command to all local users on the channel specified
+ * by <to>; <tok> is ignored by this function
*/
-
-static int match_it(aClient *one, char *mask, int what)
+void sendcmdto_channel_butserv(struct Client *from, const char *cmd,
+ const char *tok, struct Channel *to,
+ const char *pattern, ...)
{
- switch (what)
- {
- case MATCH_HOST:
- return (match(mask, one->user->host) == 0);
- case MATCH_SERVER:
- default:
- return (match(mask, one->user->server->name) == 0);
- }
-}
+ struct VarData vd;
+ struct MsgBuf *mb;
+ struct Membership *member;
-/*
- * sendto_match_butone
- *
- * Send to all clients which match the mask in a way defined on 'what';
- * either by user hostname or user servername.
- */
-void sendto_match_butone(aClient *one, aClient *from,
- char *mask, int what, char *pattern, ...)
-{
- va_list vl;
- Reg1 int i;
- Reg2 aClient *cptr, *acptr;
+ vd.vd_format = pattern; /* set up the struct VarData for %v */
+ va_start(vd.vd_args, pattern);
- va_start(vl, pattern);
- for (i = 0; i <= highest_fd; i++)
- {
- if (!(cptr = loc_clients[i]))
- continue; /* that clients are not mine */
- if (cptr == one) /* must skip the origin !! */
- continue;
- if (IsServer(cptr))
- {
- for (acptr = client; acptr; acptr = acptr->next)
- if (IsUser(acptr) && match_it(acptr, mask, what) && acptr->from == cptr)
- break;
- /* a person on that server matches the mask, so we
- * send *one* msg to that server ...
- */
- if (acptr == NULL)
- continue;
- /* ... but only if there *IS* a matching person */
- }
- /* my client, does he match ? */
- else if (!(IsUser(cptr) && match_it(cptr, mask, what)))
- continue;
- vsendto_prefix_one(cptr, from, pattern, vl);
+ /* build the buffer */
+ mb = msgq_make(0, "%:#C %s %v", from, cmd, &vd);
+ va_end(vd.vd_args);
+
+ /* send the buffer to each local channel member */
+ for (member = to->members; member; member = member->next_member) {
+ if (MyConnect(member->user) && !IsZombie(member))
+ send_buffer(member->user, mb, 0);
}
- va_end(vl);
- return;
+ msgq_clean(mb);
}
/*
- * sendto_lops_butone
- *
- * Send to *local* ops but one.
+ * 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 <skip> argument. <one> will also be skipped.
*/
-void sendto_lops_butone(aClient *one, char *pattern, ...)
-{
- va_list vl;
- Reg1 aClient *cptr;
- aClient **cptrp;
- int i;
- char nbuf[1024];
-
- sprintf_irc(nbuf, ":%s NOTICE %%s :*** Notice -- ", me.name);
- va_start(vl, pattern);
- vsprintf_irc(nbuf + strlen(nbuf), pattern, vl);
- va_end(vl);
- for (cptrp = me.serv->client_list, i = 0; i <= me.serv->nn_mask; ++cptrp, ++i)
- if ((cptr = *cptrp) && cptr != one && SendServNotice(cptr))
- {
- sprintf_irc(sendbuf, nbuf, cptr->name);
- sendbufto_one(cptr);
- }
- return;
-}
-
-/*
- * sendto_op_mask
+/* XXX sentalong_marker used XXX
*
- * Sends message to the list indicated by the bitmask field.
- * Don't try to send to more than one list! That is not supported.
- * Xorath 5/1/97
+ * 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
*/
-void vsendto_op_mask(register snomask_t mask, const char *pattern, va_list vl)
+void sendcmdto_channel_butone(struct Client *from, const char *cmd,
+ const char *tok, struct Channel *to,
+ struct Client *one, unsigned int skip,
+ const char *pattern, ...)
{
- static char fmt[1024];
- char *fmt_target;
- register int i = 0; /* so that 1 points to opsarray[0] */
- Link *opslist;
-
- while ((mask >>= 1))
- i++;
- if (!(opslist = opsarray[i]))
- return;
+ struct Membership *member;
+ struct VarData vd;
+ struct MsgBuf *user_mb;
+ struct MsgBuf *serv_mb;
+
+ vd.vd_format = pattern;
+
+ /* Build buffer to send to users */
+ va_start(vd.vd_args, pattern);
+ user_mb = msgq_make(0, skip & SKIP_NONOPS ? "%:#C %s @%v" : "%:#C %s %v",
+ from, skip & SKIP_NONOPS ? MSG_NOTICE : cmd, &vd);
+ va_end(vd.vd_args);
+
+ /* Build buffer to send to servers */
+ va_start(vd.vd_args, pattern);
+ serv_mb = msgq_make(&me, "%C %s %v", from, tok, &vd);
+ va_end(vd.vd_args);
+
+ /* send buffer along! */
+ sentalong_marker++;
+ for (member = to->members; member; member = member->next_member) {
+ /* skip one, zombies, and deaf users... */
+ if (cli_from(member->user) == one || IsZombie(member) ||
+ (skip & SKIP_DEAF && IsDeaf(member->user)) ||
+ (skip & SKIP_NONOPS && !IsChanOp(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)
+ continue;
+ sentalong[cli_fd(cli_from(member->user))] = sentalong_marker;
- fmt_target = sprintf_irc(fmt, ":%s NOTICE ", me.name);
- do
- {
- strcpy(fmt_target, opslist->value.cptr->name);
- strcat(fmt_target, " :*** Notice -- ");
- strcat(fmt_target, pattern);
- vsendto_one(opslist->value.cptr, fmt, vl);
- opslist = opslist->next;
+ if (MyConnect(member->user)) /* pick right buffer to send */
+ send_buffer(member->user, user_mb, 0);
+ else
+ send_buffer(member->user, serv_mb, 0);
}
- while (opslist);
-}
-/*
- * sendbufto_op_mask
- *
- * Send a prepared sendbuf to the list indicated by the bitmask field.
- * Ghostwolf 16-May-97
- */
-void sendbufto_op_mask(snomask_t mask)
-{
- register int i = 0; /* so that 1 points to opsarray[0] */
- Link *opslist;
- while ((mask >>= 1))
- i++;
- if (!(opslist = opsarray[i]))
- return;
- do
- {
- sendbufto_one(opslist->value.cptr);
- opslist = opslist->next;
- }
- while (opslist);
+ msgq_clean(user_mb);
+ msgq_clean(serv_mb);
}
-
/*
- * sendto_ops
- *
- * Send to *local* ops only.
+ * Send a (prefixed) command to all users except <one> that have
+ * <flag> set.
*/
-void vsendto_ops(const char *pattern, va_list vl)
-{
- Reg1 aClient *cptr;
- Reg2 int i;
- char fmt[1024];
- char *fmt_target;
-
- fmt_target = sprintf_irc(fmt, ":%s NOTICE ", me.name);
-
- for (i = 0; i <= highest_fd; i++)
- if ((cptr = loc_clients[i]) && !IsServer(cptr) && !IsMe(cptr) &&
- SendServNotice(cptr))
- {
- strcpy(fmt_target, cptr->name);
- strcat(fmt_target, " :*** Notice -- ");
- strcat(fmt_target, pattern);
- vsendto_one(cptr, fmt, vl);
- }
-
- return;
-}
-
-void sendto_op_mask(snomask_t mask, const char *pattern, ...)
-{
- va_list vl;
- va_start(vl, pattern);
- vsendto_op_mask(mask, pattern, vl);
- va_end(vl);
-}
-
-void sendto_ops(const char *pattern, ...)
-{
- va_list vl;
- va_start(vl, pattern);
- vsendto_op_mask(SNO_OLDSNO, pattern, vl);
- va_end(vl);
-}
-
-/*
- * sendto_ops_butone
+/* XXX sentalong_marker used XXX
*
- * Send message to all operators.
- * one - client not to send message to
- * from- client which message is from *NEVER* NULL!!
+ * Again, we can solve this use of sentalong_marker by adding a field
+ * to connections--a count of the number of +w users, and another count
+ * of +g users. Then, just walk through the local clients to send
+ * those messages, and another walk through the connected servers list,
+ * sending only if there's a non-zero count. No caveats here, either,
+ * beyond remembering to decrement the count when a user /quit's or is
+ * killed, or a server is squit. -Kev
*/
-void sendto_ops_butone(aClient *one, aClient *from, char *pattern, ...)
+void sendcmdto_flag_butone(struct Client *from, const char *cmd,
+ const char *tok, struct Client *one,
+ unsigned int flag, const char *pattern, ...)
{
- va_list vl;
- Reg1 int i;
- Reg2 aClient *cptr;
-
- va_start(vl, pattern);
- ++sentalong_marker;
- for (cptr = client; cptr; cptr = cptr->next)
- {
- /* if (!SendWallops(cptr)) */
- if (!IsAnOper(cptr))
- continue;
- i = cptr->from->fd; /* find connection oper is on */
- if (sentalong[i] == sentalong_marker) /* sent message along it already ? */
- continue;
- if (cptr->from == one)
- continue; /* ...was the one I should skip */
- sentalong[i] = sentalong_marker;
- vsendto_prefix_one(cptr->from, from, pattern, vl);
+ struct VarData vd;
+ struct Client *cptr;
+ struct MsgBuf *user_mb;
+ struct MsgBuf *serv_mb;
+
+ vd.vd_format = pattern;
+
+ /* Build buffer to send to users */
+ va_start(vd.vd_args, pattern);
+ user_mb = msgq_make(0, "%:#C " MSG_WALLOPS " %v", from, &vd);
+ va_end(vd.vd_args);
+
+ /* Build buffer to send to servers */
+ va_start(vd.vd_args, pattern);
+ serv_mb = msgq_make(&me, "%C %s %v", from, tok, &vd);
+ va_end(vd.vd_args);
+
+ /* send buffer along! */
+ sentalong_marker++;
+ for (cptr = GlobalClientList; cptr; cptr = cli_next(cptr)) {
+ if (cli_from(cptr) == one || IsServer(cptr) || !(cli_flags(cptr) & flag) ||
+ cli_fd(cli_from(cptr)) < 0 ||
+ sentalong[cli_fd(cli_from(cptr))] == sentalong_marker)
+ continue; /* skip it */
+ sentalong[cli_fd(cli_from(cptr))] = sentalong_marker;
+
+ if (MyConnect(cptr)) /* send right buffer */
+ send_buffer(cptr, user_mb, 1);
+ else
+ send_buffer(cptr, serv_mb, 1);
}
- va_end(vl);
- return;
+ msgq_clean(user_mb);
+ msgq_clean(serv_mb);
}
/*
- * sendto_g_serv_butone
- *
- * Send message to all remote +g users (server links).
+ * Send a (prefixed) command to all users who match <to>, under control
+ * of <who>
+ */
+/* XXX sentalong_marker used XXX
*
- * one - server not to send message to.
+ * 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
*/
-void sendto_g_serv_butone(aClient *one, char *pattern, ...)
+void sendcmdto_match_butone(struct Client *from, const char *cmd,
+ const char *tok, const char *to,
+ struct Client *one, unsigned int who,
+ const char *pattern, ...)
{
- va_list vl;
- aClient *cptr;
- int i;
-
- va_start(vl, pattern);
- ++sentalong_marker;
- vsprintf_irc(sendbuf, pattern, vl);
- for (cptr = client; cptr; cptr = cptr->next)
- {
- if (!SendDebug(cptr))
- continue;
- i = cptr->from->fd; /* find connection user is on */
- if (sentalong[i] == sentalong_marker) /* sent message along it already ? */
- continue;
- if (MyConnect(cptr))
- continue;
- sentalong[i] = sentalong_marker;
- if (cptr->from == one)
- continue;
- sendbufto_one(cptr);
+ struct VarData vd;
+ struct Client *cptr;
+ struct MsgBuf *user_mb;
+ struct MsgBuf *serv_mb;
+
+ vd.vd_format = pattern;
+
+ /* Build buffer to send to users */
+ va_start(vd.vd_args, pattern);
+ user_mb = msgq_make(0, "%:#C %s %v", from, cmd, &vd);
+ va_end(vd.vd_args);
+
+ /* Build buffer to send to servers */
+ va_start(vd.vd_args, pattern);
+ serv_mb = msgq_make(&me, "%C %s %v", from, tok, &vd);
+ va_end(vd.vd_args);
+
+ /* send buffer along */
+ sentalong_marker++;
+ for (cptr = GlobalClientList; cptr; cptr = cli_next(cptr)) {
+ if (cli_from(cptr) == one || IsServer(cptr) || IsMe(cptr) ||
+ !match_it(cptr, to, who) || cli_fd(cli_from(cptr)) < 0 ||
+ sentalong[cli_fd(cli_from(cptr))] == sentalong_marker)
+ continue; /* skip it */
+ sentalong[cli_fd(cli_from(cptr))] = sentalong_marker;
+
+ if (MyConnect(cptr)) /* send right buffer */
+ send_buffer(cptr, user_mb, 0);
+ else
+ send_buffer(cptr, serv_mb, 0);
}
- va_end(vl);
- return;
+ msgq_clean(user_mb);
+ msgq_clean(serv_mb);
}
/*
- * sendto_prefix_one
- *
- * to - destination client
- * from - client which message is from
- *
- * NOTE: NEITHER OF THESE SHOULD *EVER* BE NULL!!
- * -avalon
+ * Send a server notice to all users subscribing to the indicated <mask>
+ * except for <one>
*/
-void sendto_prefix_one(Reg1 aClient *to, Reg2 aClient *from, char *pattern, ...)
+void sendto_opmask_butone(struct Client *one, unsigned int mask,
+ const char *pattern, ...)
{
va_list vl;
+
va_start(vl, pattern);
- vsendto_prefix_one(to, from, pattern, vl);
+ vsendto_opmask_butone(one, mask, pattern, vl);
va_end(vl);
}
/*
- * sendto_realops
- *
- * Send to *local* ops only but NOT +s nonopers.
+ * Same as above, except called with a variable argument list
*/
-void sendto_realops(const char *pattern, ...)
+void vsendto_opmask_butone(struct Client *one, unsigned int mask,
+ const char *pattern, va_list vl)
{
- va_list vl;
+ struct VarData vd;
+ struct MsgBuf *mb;
+ int i = 0; /* so that 1 points to opsarray[0] */
+ struct SLink *opslist;
- va_start(vl, pattern);
- vsendto_op_mask(SNO_OLDREALOP, pattern, vl);
+ while ((mask >>= 1))
+ i++;
- va_end(vl);
- return;
-}
+ if (!(opslist = opsarray[i]))
+ return;
-/*
- * Send message to all servers of protocol 'p' and lower.
- */
-void sendto_lowprot_butone(aClient *cptr, int p, char *pattern, ...)
-{
- va_list vl;
- Dlink *lp;
- va_start(vl, pattern);
- for (lp = me.serv->down; lp; lp = lp->next)
- if (lp->value.cptr != cptr && Protocol(lp->value.cptr) <= p)
- vsendto_one(lp->value.cptr, pattern, vl);
- va_end(vl);
-}
+ /*
+ * build string; I don't want to bother with client nicknames, so I hope
+ * this is ok...
+ */
+ vd.vd_format = pattern;
+ vd.vd_args = vl;
+ mb = msgq_make(0, ":%s " MSG_NOTICE " * :*** Notice -- %v", cli_name(&me),
+ &vd);
-/*
- * Send message to all servers of protocol 'p' and higher.
- */
-void sendto_highprot_butone(aClient *cptr, int p, char *pattern, ...)
-{
- va_list vl;
- Dlink *lp;
- va_start(vl, pattern);
- for (lp = me.serv->down; lp; lp = lp->next)
- if (lp->value.cptr != cptr && Protocol(lp->value.cptr) >= p)
- vsendto_one(lp->value.cptr, pattern, vl);
- va_end(vl);
+ for (; opslist; opslist = opslist->next)
+ send_buffer(opslist->value.cptr, mb, 0);
+
+ msgq_clean(mb);
}