[ViewVC] Diff of: svn/ircd-hybrid/trunk/src/send.c

Comparing ircd-hybrid/trunk/src/send.c (file contents):
Revision 3189 by michael, Fri Mar 21 18:18:00 2014 UTC vs.
Revision 3312 by michael, Tue Apr 15 12:13:07 2014 UTC

+                           get_sendq(&to->localClient->confs));
+    if (IsClient(to))
+      SetSendQExceeded(to);
-+
+    dead_link_on_write(to, 0);
+    return;
+  dbuf_add(&to->localClient->buf_sendq, buf);
+  /*
-<
+   ** 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.
->
+   * Update statistics. The following is slightly incorrect because
->
+   * it counts messages even if queued, but bytes only really sent.
->
+   * Queued bytes get updated in send_queued_write().
+   */
+  ++to->localClient->send.messages;
+  ++me.localClient->send.messages;
+sendq_unblocked(fde_t *fd, struct Client *client_p)
+  assert(fd == &client_p->localClient->fd);
-+
-+
+  DelFlag(client_p, FLAGS_BLOCKED);
+  send_queued_write(client_p);
+   ** Once socket is marked dead, we cannot start writing to it,
+   ** even if the error is removed...
+   */
-<
+  if (IsDead(to))
->
+  if (IsDead(to) || HasFlag(to, FLAGS_BLOCKED))
+    return;  /* no use calling send() now */
+  /* Next, lets try to write some data */
+    if ((retlen < 0) && (ignoreErrno(errno)))
-+
+      AddFlag(to, FLAGS_BLOCKED);
+      /* we have a non-fatal error, reschedule a write */
+      comm_setselect(&to->localClient->fd, COMM_SELECT_WRITE,
+                     (PF *)sendq_unblocked, to, 0);
+        (one && target_p->from == one->from))
+      continue;
-<
+    if (type != 0 && (ms->flags & type) == 0)
->
+    if (type && (ms->flags & type) == 0)
+      continue;
+    if (MyConnect(target_p))
+    if (IsDead(client_p))
+      continue;
+    /* check against 'one' */
-<
+    if (one != NULL && (client_p == one->from))
->
+    if (one && (client_p == one->from))
+      continue;
+    /* check we have required capabs */
+    if ((client_p->localClient->caps & caps) != caps)
+      continue;
+    /* check we don't have any forbidden capabs */
-<
+    if ((client_p->localClient->caps & nocaps) != 0)
->
+    if ((client_p->localClient->caps & nocaps))
+      continue;
+    send_message(client_p, buffer);
+  DLINK_FOREACH(cptr, user->channel.head)
+    chptr = ((struct Membership *)cptr->data)->chptr;
-–
+    assert(chptr != NULL);
+    DLINK_FOREACH(uptr, chptr->members.head)
+      ms = uptr->data;
+      target_p = ms->client_p;
-–
+      assert(target_p != NULL);
+      if (!MyConnect(target_p) || target_p == user || IsDefunct(target_p) ||
+          target_p->localClient->serial == current_serial)
+    struct Membership *ms = ptr->data;
+    struct Client *target_p = ms->client_p;
-<
+    if (type != 0 && (ms->flags & type) == 0)
->
+    if (type && (ms->flags & type) == 0)
+      continue;
+    if (!MyConnect(target_p) || IsDefunct(target_p) ||
+    struct Membership *ms = ptr->data;
+    struct Client *target_p = ms->client_p;
-<
+    if (type != 0 && (ms->flags & type) == 0)
->
+    if (type && (ms->flags & type) == 0)
+      continue;
+    if (!MyConnect(target_p) || (one && target_p == one->from))
+  const char *ntype = NULL;
+  dlink_node *ptr = NULL;
-<
+  char nbuf[IRCD_BUFSIZE];
->
+  char nbuf[IRCD_BUFSIZE] = "";
+  va_list args;
+  va_start(args, pattern);
-+
+/* ts_warn()
-+
+ *
-+
+ * inputs       - var args message
-+
+ * output       - NONE
-+
+ * side effects - Call sendto_realops_flags, with some flood checking
-+
+ *                (at most 5 warnings every 5 seconds)
-+
+ */
-+
+void
-+
+sendto_realops_flags_ratelimited(const char *pattern, ...)
-+
+{
-+
+  va_list args;
-+
+  char buffer[IRCD_BUFSIZE] = "";
-+
+  static time_t last = 0;
-+
+  static int warnings = 0;
-+
-+
+  /*
-+
+   ** if we're running with TS_WARNINGS enabled and someone does
-+
+   ** something silly like (remotely) connecting a nonTS server,
-+
+   ** we'll get a ton of warnings, so we make sure we don't send
-+
+   ** more than 5 every 5 seconds.  -orabidoo
-+
+   */
-+
-+
+  if (CurrentTime - last < 5)
-+
+  {
-+
+    if (++warnings > 5)
-+
+      return;
-+
+  }
-+
+  else
-+
+  {
-+
+    last = CurrentTime;
-+
+    warnings = 0;
-+
+  }
-+
-+
+  va_start(args, pattern);
-+
+  vsnprintf(buffer, sizeof(buffer), pattern, args);
-+
+  va_end(args);
-+
-+
+  sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s", buffer);
-+
+  ilog(LOG_TYPE_IRCD, "%s", buffer);
-+
+}
-+
+/* sendto_wallops_flags()
+ * inputs       - flag types of messages to show to real opers
+  dbuf_ref_free(buffer);
-–
-–
+/* ts_warn()
-–
+ *
-–
+ * inputs       - var args message
-–
+ * output       - NONE
-–
+ * side effects - Call sendto_realops_flags, with some flood checking
-–
+ *                (at most 5 warnings every 5 seconds)
-–
+ */
-–
+void
-–
+sendto_realops_flags_ratelimited(const char *pattern, ...)
-–
+{
-–
+  va_list args;
-–
+  char buffer[IRCD_BUFSIZE];
-–
+  static time_t last = 0;
-–
+  static int warnings = 0;
-–
-–
+  /*
-–
+   ** if we're running with TS_WARNINGS enabled and someone does
-–
+   ** something silly like (remotely) connecting a nonTS server,
-–
+   ** we'll get a ton of warnings, so we make sure we don't send
-–
+   ** more than 5 every 5 seconds.  -orabidoo
-–
+   */
-–
-–
+  if (CurrentTime - last < 5)
-–
+  {
-–
+    if (++warnings > 5)
-–
+      return;
-–
+  }
-–
+  else
-–
+  {
-–
+    last = CurrentTime;
-–
+    warnings = 0;
-–
+  }
-–
-–
+  va_start(args, pattern);
-–
+  vsnprintf(buffer, sizeof(buffer), pattern, args);
-–
+  va_end(args);
-–
-–
+  sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s", buffer);
-–
+  ilog(LOG_TYPE_IRCD, "%s", buffer);
-–
+}

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines (old)
->
+Changed lines (new)

Comparing ircd-hybrid/trunk/src/send.c (file contents): Revision 3189 by michael, Fri Mar 21 18:18:00 2014 UTC vs. Revision 3312 by michael, Tue Apr 15 12:13:07 2014 UTC

Diff Legend

Comparing ircd-hybrid/trunk/src/send.c (file contents):
Revision 3189 by michael, Fri Mar 21 18:18:00 2014 UTC vs.
Revision 3312 by michael, Tue Apr 15 12:13:07 2014 UTC