Author: Kev <klmitch@mit.edu>

Log message:

wrote some new sendcmdto_* functions

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@188 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index df57877bcbe12f1eb4822ea081b5396803ee0e39..3961f5390164a924bc08c4a584ab77b5419121b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-04-17  Kevin L. Mitchell  <klmitch@mit.edu>
 
+       * ircd/send.c: new sendcmdto_channel_butserv -- note that old
+       sendto_channel_butserv has a subtle bug; also wrote
+       sendcmdto_common_channels.
+
+       * include/send.h: declare new sendcmdto_* functions
+
        * ircd/jupe.c: support local deactivations of jupes
 
        * ircd/gline.c: support local deactivations of glines
@@ -612,7 +618,7 @@
 #
 # ChangeLog for ircu2.10.11
 #
-# $Id: ChangeLog,v 1.94 2000-04-17 19:01:35 kev Exp $
+# $Id: ChangeLog,v 1.95 2000-04-17 20:41:57 kev Exp $
 #
 # Insert new changes at beginning of the change list.
 #

diff --git a/include/send.h b/include/send.h
index b28d2f25c5c9d1d1b580006da80894054baa5242..7e9afa5c43d6ed53bf3f75faea33d53f24036e74 100644 (file)
--- a/include/send.h
+++ b/include/send.h
@@ -75,5 +75,11 @@ extern void vsendcmdto_one(struct Client *one, const char *cmd,
 extern void sendcmdto_serv_butone(struct Client *one, const char *cmd,
                                  const char *tok, struct Client *from,
                                  const char *fmt, ...);
+extern void sendcmdto_common_channels(struct Client *cptr, const char *cmd,
+                                     const char *tok, const char *pattern,
+                                     ...);
+extern void sendcmdto_channel_butserv(struct Channel *chan, const char *cmd,
+                                     const char *tok, struct Client *from,
+                                     const char *pattern, ...);
 
 #endif /* INCLUDED_send_h */

diff --git a/ircd/send.c b/ircd/send.c
index 013c88c43ac9de91ae459190a258e5c6b0d89de4..9561db3b2f875b56d1a8767adb7024606bb6cdf3 100644 (file)
--- a/ircd/send.c
+++ b/ircd/send.c
@@ -605,19 +605,15 @@ void sendcmdto_serv_butone(struct Client *one, const char *cmd,
                           const char *pattern, ...)
 {
   struct VarData vd;
-  va_list vl;
   char sndbuf[IRC_BUFSIZE];
   struct DLink *lp;
 
-  cmd = 0; /* try to suppress compile warning */
-
-  va_start(vl, pattern);
   vd.vd_format = pattern; /* set up the struct VarData for %v */
-  vd.vd_args = vl;
+  va_start(vd.vd_args, pattern);
 
   /* use token */
   ircd_snprintf(&me, sndbuf, sizeof(sndbuf) - 2, "%C %s %v", from, tok, &vd);
-  va_end(vl);
+  va_end(vd.vd_args);
 
   /* send it to our downlinks */
   for (lp = me.serv->down; lp; lp = lp->next) {
@@ -689,11 +685,58 @@ void sendto_common_channels(struct Client *acptr, const char* pattern, ...)
   return;
 }
 
+void sendcmdto_common_channels(struct Client *cptr, const char *cmd,
+                              const char *tok, const char *pattern, ...)
+{
+  struct VarData vd;
+  char sndbuf[IRC_BUFSIZE];
+  struct Membership *chan;
+  struct Membership *member;
+
+  assert(0 != cptr);
+  assert(0 != cptr->from);
+  assert(0 != pattern);
+  assert(!IsServer(cptr));
+
+  vd.vd_format = pattern; /* set up the struct VarData for %v */
+
+  va_start(vd.vd_args, pattern);
+
+  /* build the buffer */
+  ircd_snprintf(0, sndbuf, sizeof(sndbuf) - 2, ":%s!%s@%s %s %v", cptr->name,
+               cptr->user->username, cptr->user->host, cmd, &vd);
+  va_end(vd.vd_args);
+
+  sentalong_marker++;
+  if (-1 < cptr->from->fd)
+    sentalong[cptr->from->fd] = sentalong_marker;
+  /*
+   * loop through cptr's channels, and the members on their channels
+   */
+  for (chan = cptr->user->channel; chan; chan = chan->next_channel)
+    for (member = chan->channel->members; member;
+        member = member->next_member)
+      if (MyConnect(member->user) && -1 < cptr->fd &&
+         sentalong[cptr->fd] != sentalong_marker) {
+       sentalong[cptr->fd] = sentalong_marker;
+       send_buffer(member->user, sndbuf);
+      }
+
+  if (MyConnect(cptr))
+    send_buffer(cptr, sndbuf);
+}
+
 /*
  * sendto_channel_butserv
  *
  * Send a message to all members of a channel that
  * are connected to this server.
+ *
+ * This contains a subtle bug; after the first call to vsendto_prefix_one()
+ * below, vl is in an indeterminate state, according to ANSI; we'd have to
+ * move va_start() and va_end() into the loop to correct the problem.  It's
+ * easier, however, just to use sendcmdto_channel_butserv(), which builds a
+ * buffer and sends that prepared buffer to each channel member.
  */
 void sendto_channel_butserv(struct Channel *chptr, struct Client *from, const char* pattern, ...)
 {
@@ -712,6 +755,33 @@ void sendto_channel_butserv(struct Channel *chptr, struct Client *from, const ch
   return;
 }
 
+void sendcmdto_channel_butserv(struct Channel *chan, const char *cmd,
+                              const char *tok, struct Client *from,
+                              const char *pattern, ...)
+{
+  struct VarData vd;
+  char sndbuf[IRC_BUFSIZE];
+  struct Membership *member;
+
+  vd.vd_format = pattern; /* set up the struct VarData for %v */
+  va_start(vd.vd_args, pattern);
+
+  /* build the buffer */
+  if (IsServer(from) || IsMe(from))
+    ircd_snprintf(0, sndbuf, sizeof(sndbuf) - 2, ":%s %s %v", from->name,
+                 cmd, &vd);
+  else
+    ircd_snprintf(0, sndbuf, sizeof(sndbuf) - 2, ":%s!%s@%s %s %v", from->name,
+                 from->user->username, from->user->host, cmd, &vd);
+  va_end(vd.vd_args);
+
+  /* send the buffer to each local channel member */
+  for (member = chan->members; member; member = member->next_member) {
+    if (MyConnect(member->user) && !IsZombie(member))
+      send_buffer(member->user, sndbuf);
+  }
+}
+
 /*
  * Send a msg to all ppl on servers/hosts that match a specified mask
  * (used for enhanced PRIVMSGs)