[ViewVC] Diff of: svn/ircd-hybrid/branches/8.2.x/src/s

Comparing:
ircd-hybrid-7.3/src/s_bsd.c (file contents), Revision 1123 by michael, Sun Feb 6 21:57:50 2011 UTC vs.
ircd-hybrid/trunk/src/s_bsd.c (file contents), Revision 2229 by michael, Thu Jun 13 20:10:27 2013 UTC

+#include "fdlist.h"
+#include "s_bsd.h"
+#include "client.h"
-–
+#include "common.h"
+#include "dbuf.h"
+#include "event.h"
+#include "irc_string.h"
+#include "irc_res.h"
+#include "restart.h"
+#include "s_auth.h"
-<
+#include "s_conf.h"
-<
+#include "s_log.h"
->
+#include "conf.h"
->
+#include "log.h"
+#include "s_serv.h"
+#include "send.h"
+#include "memory.h"
+  who = (who) ? who : "";
-<
+  sendto_realops_flags(UMODE_DEBUG, level, text, who, strerror(error));
-<
+  log_oper_action(LOG_IOERR_TYPE, NULL, "%s %s %s\n", who, text, strerror(error));
-<
+  ilog(L_ERROR, text, who, strerror(error));
->
+  sendto_realops_flags(UMODE_DEBUG, level, SEND_NOTICE,
->
+                       text, who, strerror(error));
->
+  ilog(LOG_TYPE_IRCD, text, who, strerror(error));
+/*
+void
+close_connection(struct Client *client_p)
-<
+  struct ConfItem *conf;
-<
+  struct AccessItem *aconf;
-<
+  struct ClassItem *aclass;
->
+  dlink_node *ptr = NULL;
-<
+  assert(NULL != client_p);
->
+  assert(client_p);
+  if (!IsDead(client_p))
+    send_queued_write(client_p);
-<
+  if (IsServer(client_p))
->
+  if (IsClient(client_p))
->
+  {
->
+    ++ServerStats.is_cl;
->
+    ServerStats.is_cbs += client_p->localClient->send.bytes;
->
+    ServerStats.is_cbr += client_p->localClient->recv.bytes;
->
+    ServerStats.is_cti += CurrentTime - client_p->localClient->firsttime;
->
+  }
->
+  else if (IsServer(client_p))
+    ++ServerStats.is_sv;
+    ServerStats.is_sbs += client_p->localClient->send.bytes;
+    ServerStats.is_sbr += client_p->localClient->recv.bytes;
-<
+    ServerStats.is_sti += CurrentTime - client_p->firsttime;
->
+    ServerStats.is_sti += CurrentTime - client_p->localClient->firsttime;
-<
+    /* XXX Does this even make any sense at all anymore?
-<
+     * scheduling a 'quick' reconnect could cause a pile of
-<
+     * nick collides under TSora protocol... -db
-<
+     */
-<
+    /*
-<
+     * If the connection has been up for a long amount of time, schedule
-<
+     * a 'quick' reconnect, else reset the next-connect cycle.
-<
+     */
-<
+    if ((conf = find_conf_exact(SERVER_TYPE, client_p->name,
-<
+                                client_p->username, client_p->host)))
->
+    DLINK_FOREACH(ptr, server_items.head)
-+
+      struct MaskItem *conf = ptr->data;
-+
-+
+      if (irccmp(conf->name, client_p->name))
-+
+        continue;
-+
+      /*
-<
+       * Reschedule a faster reconnect, if this was a automatically
-<
+       * connected configuration entry. (Note that if we have had
-<
+       * a rehash in between, the status has been changed to
-<
+       * CONF_ILLEGAL). But only do this if it was a "good" link.
->
+       * Reset next-connect cycle of all connect{} blocks that match
->
+       * this servername.
+       */
-<
+      aconf  = map_to_conf(conf);
-<
+      aclass = map_to_conf(aconf->class_ptr);
-<
+      aconf->hold = time(NULL);
-<
+      aconf->hold += (aconf->hold - client_p->since > HANGONGOODLINK) ?
-<
+        HANGONRETRYDELAY : ConFreq(aclass);
->
+      conf->until = CurrentTime + conf->class->con_freq;
-–
+  else if (IsClient(client_p))
-–
+  {
-–
+    ++ServerStats.is_cl;
-–
+    ServerStats.is_cbs += client_p->localClient->send.bytes;
-–
+    ServerStats.is_cbr += client_p->localClient->recv.bytes;
-–
+    ServerStats.is_cti += CurrentTime - client_p->firsttime;
-–
+  }
+  else
+    ++ServerStats.is_ni;
+  if (client_p->localClient->fd.flags.open)
+    fd_close(&client_p->localClient->fd);
-–
+  if (HasServlink(client_p))
-–
+  {
-–
+    if (client_p->localClient->ctrlfd.flags.open)
-–
+      fd_close(&client_p->localClient->ctrlfd);
-–
+  }
-–
+  dbuf_clear(&client_p->localClient->buf_sendq);
+  dbuf_clear(&client_p->localClient->buf_recvq);
+  MyFree(client_p->localClient->passwd);
-<
+  detach_conf(client_p, CONF_TYPE);
->
+  detach_conf(client_p, CONF_CLIENT|CONF_OPER|CONF_SERVER);
+  client_p->from = NULL; /* ...this should catch them! >:) --msa */
-+
+/*  Base16 encoding is:
-+
+ *  Copyright (c) 2001-2004, Roger Dingledine
-+
+ *  Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
-+
+ *
-+
+ *  Redistribution and use in source and binary forms, with or without
-+
+ *  modification, are permitted provided that the following conditions are
-+
+ *  met:
-+
+ *
-+
+ *  Redistributions of source code must retain the above copyright
-+
+ *  notice, this list of conditions and the following disclaimer.
-+
-+
+ * Redistributions in binary form must reproduce the above copyright notice,
-+
+ * this list of conditions and the following disclaimer
-+
+ * in the documentation and/or other materials provided with the distribution.
-+
+ *
-+
+ * Neither the names of the copyright owners nor the names of its
-+
+ * contributors may be used to endorse or promote products derived from
-+
+ * this software without specific prior written permission.
-+
-+
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
+ */
-+
+static void
-+
+base16_encode(char *dest, size_t destlen, const char *src, size_t srclen)
-+
+{
-+
+  const char *end;
-+
+  char *cp;
-+
-+
+  assert(destlen >= srclen * 2 + 1);
-+
-+
+  cp = dest;
-+
+  end = src + srclen;
-+
-+
+  while (src < end)
-+
+  {
-+
+    *cp++ = "0123456789ABCDEF"[(*(const uint8_t *)src) >>  4];
-+
+    *cp++ = "0123456789ABCDEF"[(*(const uint8_t *)src) & 0xf];
-+
+    ++src;
-+
+  }
-+
-+
+  *cp = '\0';
-+
+}
-+
+#ifdef HAVE_LIBCRYPTO
+/*
+ * ssl_handshake - let OpenSSL initialize the protocol. Register for
+static void
+ssl_handshake(int fd, struct Client *client_p)
-+
+  X509 *cert = NULL;
+  int ret = SSL_accept(client_p->localClient->fd.ssl);
-+
+  int err = SSL_get_error(client_p->localClient->fd.ssl, ret);
-+
-+
+  ilog(LOG_TYPE_IRCD, "SSL Error %d %s", err, ERR_error_string(err, NULL));
-+
-+
+  if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
-+
+  {
-+
+    int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
-+
+    char buf[SHA_DIGEST_LENGTH * 2 + 1] = { '\0' };
-+
-+
+    if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
-+
+        res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
-+
+        res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
-+
+    {
-+
+      base16_encode(buf, sizeof(buf),
-+
+                    (const char *)cert->sha1_hash, sizeof(cert->sha1_hash));
-+
+      client_p->certfp = xstrndup(buf, sizeof(buf));
-+
+    }
-+
+    else
-+
+      ilog(LOG_TYPE_IRCD, "Client %s!%s@%s gave bad SSL client certificate: %d",
-+
+           client_p->name, client_p->username, client_p->host, res);
-+
+    X509_free(cert);
-+
+  }
+  if (ret <= 0)
-+
+  {
+    switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
+      case SSL_ERROR_WANT_WRITE:
+        exit_client(client_p, client_p, "Error during SSL handshake");
+        return;
-+
+  }
-<
+  execute_callback(auth_cb, client_p);
->
+  start_auth(client_p);
+#endif
+              sizeof(new_client->sockhost), NULL, 0, NI_NUMERICHOST);
+  new_client->localClient->aftype = new_client->localClient->ip.ss.ss_family;
-+
+#ifdef HAVE_LIBGEOIP
-+
+  /* XXX IPV6 SUPPORT XXX */
-+
+  if (irn->ss.ss_family == AF_INET && geoip_ctx)
-+
+  {
-+
+    const struct sockaddr_in *v4 = (const struct sockaddr_in *)&new_client->localClient->ip;
-+
+    new_client->localClient->country_id = GeoIP_id_by_ipnum(geoip_ctx, (unsigned long)ntohl(v4->sin_addr.s_addr));
-+
+  }
-+
+#endif
-+
+  if (new_client->sockhost[0] == ':' && new_client->sockhost[1] == ':')
+    strlcpy(new_client->host, "0", sizeof(new_client->host));
+    if ((new_client->localClient->fd.ssl = SSL_new(ServerInfo.server_ctx)) == NULL)
-<
+      ilog(L_CRIT, "SSL_new() ERROR! -- %s",
->
+      ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
+           ERR_error_string(ERR_get_error(), NULL));
+      SetDead(new_client);
+  else
+#endif
-<
+    execute_callback(auth_cb, new_client);
->
+    start_auth(new_client);
+/*

Diff Legend

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

Comparing: ircd-hybrid-7.3/src/s_bsd.c (file contents), Revision 1123 by michael, Sun Feb 6 21:57:50 2011 UTC vs. ircd-hybrid/trunk/src/s_bsd.c (file contents), Revision 2229 by michael, Thu Jun 13 20:10:27 2013 UTC

Diff Legend

Comparing:
ircd-hybrid-7.3/src/s_bsd.c (file contents), Revision 1123 by michael, Sun Feb 6 21:57:50 2011 UTC vs.
ircd-hybrid/trunk/src/s_bsd.c (file contents), Revision 2229 by michael, Thu Jun 13 20:10:27 2013 UTC