Author: Kev <klmitch@mit.edu>

[ircu2.10.12-pk.git] / ircd / send.c

diff --git a/ircd/send.c b/ircd/send.c
index 2c9fb7bc346ddfcc2d39dacf5492259c47aa011c..bf8335dc7b26ab951f409a54c22be4b9369947d6 100644 (file)
--- a/ircd/send.c
+++ b/ircd/send.c
@@ -19,6 +19,8 @@
  *
  * $Id$
  */
+#include "config.h"
+
 #include "send.h"
 #include "channel.h"
 #include "class.h"
@@ -138,8 +140,10 @@ void send_queued(struct Client *to)
     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))
+      if (IsBlocked(to)) {
+       update_write(to);
         return;
+      }
     }
     else {
       if (IsDead(to)) {
@@ -153,6 +157,7 @@ void send_queued(struct Client *to)
 
   /* Ok, sendq is now empty... */
   client_drop_sendq(cli_connect(to));
+  update_write(to);
 }
 
 void send_buffer(struct Client* to, struct MsgBuf* buf, int prio)
@@ -182,6 +187,7 @@ void send_buffer(struct Client* to, struct MsgBuf* buf, int prio)
 
   msgq_add(&(cli_sendQ(to)), buf, prio);
   client_add_sendq(cli_connect(to), &send_queues);
+  update_write(to);
 
   /*
    * Update statistics. The following is slightly incorrect
@@ -456,25 +462,16 @@ void sendcmdto_channel_butone(struct Client *from, const char *cmd,
  * Send a (prefixed) command to all users except <one> that have
  * <flag> set.
  */
-/* XXX sentalong_marker used XXX
- *
- * 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 sendcmdto_flag_butone(struct Client *from, const char *cmd,
                           const char *tok, struct Client *one,
                           unsigned int flag, const char *pattern, ...)
 {
   struct VarData vd;
   struct Client *cptr;
-  struct MsgBuf *user_mb;
-  struct MsgBuf *serv_mb;
+  struct MsgBuf *mb;
+  struct DLink *lp;
   unsigned int oper_fl = 0;
+  int i;
 
   if (flag & FLAGS_OPER) {
     flag &= ~FLAGS_OPER;
@@ -485,32 +482,32 @@ void sendcmdto_flag_butone(struct Client *from, const char *cmd,
 
   /* Build buffer to send to users */
   va_start(vd.vd_args, pattern);
-  user_mb = msgq_make(0, "%:#C " MSG_WALLOPS " %v", from, &vd);
+  mb = msgq_make(0, "%:#C " MSG_WALLOPS " %v", from, &vd);
   va_end(vd.vd_args);
 
+  /* send buffer along! */
+  for (i = 0; i <= HighestFd; i++) {
+    if (!(cptr = LocalClientArray[i]) || !(cli_flags(cptr) & flag) ||
+       (oper_fl && !IsAnOper(cptr)) || cli_fd(cli_from(cptr)) < 0)
+      continue; /* skip it */
+    send_buffer(cptr, mb, 1);
+  }
+
+  msgq_clean(mb);
+
   /* Build buffer to send to servers */
   va_start(vd.vd_args, pattern);
-  serv_mb = msgq_make(&me, "%C %s %v", from, tok, &vd);
+  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) ||
-       (MyConnect(cptr) && oper_fl && !IsAnOper(cptr)) ||
-       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);
+  for (lp = cli_serv(&me)->down; lp; lp = lp->next) {
+    if (one && lp->value.cptr == cli_from(one))
+      continue;
+    send_buffer(lp->value.cptr, mb, 0);
   }
 
-  msgq_clean(user_mb);
-  msgq_clean(serv_mb);
+  msgq_clean(mb);
 }
 
 /*