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

Comparing ircd-hybrid/trunk/src/s_serv.c (file contents):
Revision 2182 by michael, Tue Jun 4 12:19:04 2013 UTC vs.
Revision 2463 by michael, Sat Aug 17 20:38:00 2013 UTC

+write_links_file(void *notused)
+  FILE *file = NULL;
-<
+  dlink_node *ptr = NULL, *ptr_next = NULL;;
->
+  dlink_node *ptr = NULL, *ptr_next = NULL;
+  char buff[IRCD_BUFSIZE] = { '\0' };
+  if ((file = fopen(LIPATH, "w")) == NULL)
+     */
+    snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
+             me.name, target_p->info);
-<
+    dlinkAdd(xstrdup(buff), make_dlink_node(), &flatten_links);
->
+    dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
+    snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
+             me.name, target_p->info);
+  fclose(file);
-+
+void
-+
+read_links_file(void)
-+
+{
-+
+  FILE *file = NULL;
-+
+  char *p = NULL;
-+
+  char buff[IRCD_BUFSIZE] = { '\0' };
-+
-+
+  if ((file = fopen(LIPATH, "r")) == NULL)
-+
+    return;
-+
-+
+  while (fgets(buff, sizeof(buff), file))
-+
+  {
-+
+    if ((p = strchr(buff, '\n')) != NULL)
-+
+      *p = '\0';
-+
-+
+    dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
-+
+  }
-+
-+
+  fclose(file);
-+
+}
-+
+/* hunt_server()
+ *      Do the basic thing in delivering the message (command)
+ *      across the relays to the specific server (server) for
+               parv[1], parv[2], parv[3], parv[4],
+               parv[5], parv[6], parv[7], parv[8]);
+    return HUNTED_PASS;
-<
+  }
->
+  }
+  sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
+             me.name, source_p->name, parv[server]);
+    assert(conf->type == CONF_SERVER);
-<
+    /* Also when already connecting! (update holdtimes) --SRB
->
+    /* Also when already connecting! (update holdtimes) --SRB
+     */
+    if (!conf->port ||!IsConfAllowAutoConn(conf))
+      continue;
+    /* XXX: Fix me for IPv6                    */
+    /* XXX sockhost is the IPv4 ip as a string */
-<
+    if (!match(conf->host, client_p->host) ||
->
+    if (!match(conf->host, client_p->host) ||
+        !match(conf->host, client_p->sockhost))
+      error = -2;
+      if (!match_conf_password(client_p->localClient->passwd, conf))
+        return -2;
-+
+      if (!EmptyString(conf->certfp))
-+
+        if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
-+
+          return -4;
-+
+      server_conf = conf;
+    switch (server_conf->aftype)
+#ifdef IPV6
-<
+      case AF_INET6:
->
+      case AF_INET6:
+        v6 = (struct sockaddr_in6 *)&server_conf->addr;
+        if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
+        v4 = (struct sockaddr_in *)&server_conf->addr;
+        if (v4->sin_addr.s_addr == INADDR_NONE)
-<
+          memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
->
+          memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
+        break;
+/* sendnick_TS()
-<
+ *
->
+ *
+ * inputs       - client (server) to send nick towards
+ *          - client to send nick for
+ * output       - NONE
+                 target_p->servptr->name, target_p->info);
-+
+  if (!EmptyString(target_p->certfp))
-+
+    sendto_one(client_p, ":%s CERTFP %s",
-+
+               ID_or_name(target_p, client_p), target_p->certfp);
-+
+  if (target_p->away[0])
+    sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
+               target_p->away);
+ * side effects - build up string representing capabilities of server listed
+ */
+const char *
-<
+show_capabilities(struct Client *target_p)
->
+show_capabilities(const struct Client *target_p)
-<
+  static char msgbuf[IRCD_BUFSIZE];
-<
+  char *t = msgbuf;
-<
+  dlink_node *ptr;
->
+  static char msgbuf[IRCD_BUFSIZE] = "";
->
+  const dlink_node *ptr = NULL;
-<
+  t += sprintf(msgbuf, "TS ");
->
+  strlcpy(msgbuf, "TS", sizeof(msgbuf));
+  DLINK_FOREACH(ptr, cap_list.head)
+    const struct Capability *cap = ptr->data;
-<
+    if (IsCapable(target_p, cap->cap))
-<
+      t += sprintf(t, "%s ", cap->name);
->
+    if (!IsCapable(target_p, cap->cap))
->
+      continue;
->
->
+    strlcat(msgbuf,       " ", sizeof(msgbuf));
->
+    strlcat(msgbuf, cap->name, sizeof(msgbuf));
-–
+  *(t - 1) = '\0';
+  return msgbuf;
+  /* If there is something in the serv_list, it might be this
+   * connecting server..
+   */
-<
+  if (!ServerInfo.hub && serv_list.head)
->
+  if (!ServerInfo.hub && serv_list.head)
+    if (client_p != serv_list.head->data || serv_list.head->next)
+                 IsHidden(client_p) ? "(H) " : "",
+                 client_p->info);
+    else
-<
+      sendto_one(target_p,":%s SERVER %s 2 :%s%s",
->
+      sendto_one(target_p,":%s SERVER %s 2 :%s%s",
+                 me.name, client_p->name,
+                 IsHidden(client_p) ? "(H) " : "",
+                 client_p->info);
-<
+  /* Pass on my client information to the new server
-<
+  **
-<
+  ** First, pass only servers (idea is that if the link gets
-<
+  ** cancelled beacause the server was already there,
-<
+  ** there are no NICK's to be cancelled...). Of course,
-<
+  ** if cancellation occurs, all this info is sent anyway,
-<
+  ** and I guess the link dies when a read is attempted...? --msa
-<
+  **
-<
+  ** Note: Link cancellation to occur at this point means
-<
+  ** that at least two servers from my fragment are building
-<
+  ** up connection this other fragment at the same time, it's
-<
+  ** a race condition, not the normal way of operation...
-<
+  **
-<
+  ** ALSO NOTE: using the get_client_name for server names--
-<
+  **    see previous *WARNING*!!! (Also, original inpath
-<
+  **    is destroyed...)
-<
+  */
->
+  /*
->
+   * Pass on my client information to the new server
->
+   *
->
+   * First, pass only servers (idea is that if the link gets
->
+   * cancelled beacause the server was already there,
->
+   * there are no NICK's to be cancelled...). Of course,
->
+   * if cancellation occurs, all this info is sent anyway,
->
+   * and I guess the link dies when a read is attempted...? --msa
->
+   *
->
+   * Note: Link cancellation to occur at this point means
->
+   * that at least two servers from my fragment are building
->
+   * up connection this other fragment at the same time, it's
->
+   * a race condition, not the normal way of operation...
->
+   *
->
+   * ALSO NOTE: using the get_client_name for server names--
->
+   *    see previous *WARNING*!!! (Also, original inpath
->
+   *    is destroyed...)
->
+   */
+  DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
+                   IsHidden(target_p) ? "(H) " : "", target_p->info);
+    else
-<
+      sendto_one(client_p, ":%s SERVER %s %d :%s%s",
->
+      sendto_one(client_p, ":%s SERVER %s %d :%s%s",
+                 target_p->servptr->name, target_p->name, target_p->hopcount+1,
+                 IsHidden(target_p) ? "(H) " : "", target_p->info);
+/* burst_all()
-<
+ * inputs       - pointer to server to send burst to
->
+ * inputs       - pointer to server to send burst to
+ * output       - NONE
+ * side effects - complete burst of channels/nicks is sent to client_p
+ */
+    if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
+      sendnick_TS(client_p, target_p);
-<
->
+    DelFlag(target_p, FLAGS_BURSTED);
+/* serv_connect() - initiate a server connection
-<
+ * inputs       - pointer to conf
->
+ * inputs       - pointer to conf
+ *              - pointer to client doing the connect
+ * output       -
+ * side effects -
+   * Note: conf should ALWAYS be a valid C: line
+   */
+  if ((client_p = hash_find_server(conf->name)) != NULL)
-<
+  {
->
+  {
+    sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
+                         "Server %s already present from %s",
+                         conf->name, get_client_name(client_p, SHOW_IP));
+                 get_client_name(client_p, MASK_IP));
+    return 0;
-<
->
+  /* Create a local client */
+  client_p = make_client(NULL);
+  /* We already converted the ip once, so lets use it - stu */
+  strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
-<
+  /* create a socket for the server connection */
->
+  /* create a socket for the server connection */
+  if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
+                SOCK_STREAM, 0, NULL) < 0)
+    sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+                         "Host %s is not enabled for connecting: no connect{} block",
+                         conf->name);
-<
+    if (by && IsClient(by) && !MyClient(by))
->
+    if (by && IsClient(by) && !MyClient(by))
+      sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
+                 me.name, by->name, client_p->name);
+    SetDead(client_p);
+  client_p->localClient->aftype = conf->aftype;
+  /* Now, initiate the connection */
-<
+  /* XXX assume that a non 0 type means a specific bind address
->
+  /* XXX assume that a non 0 type means a specific bind address
+   * for this connect.
+   */
+  switch (conf->aftype)
+        ipn.ss_port = 0;
+        memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
+        comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
-<
+                         (struct sockaddr *)&ipn, ipn.ss_len,
->
+                         (struct sockaddr *)&ipn, ipn.ss_len,
+                         serv_connect_callback, client_p, conf->aftype,
+                         CONNECTTIMEOUT);
+                         CONNECTTIMEOUT);
+      else
-<
+        comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
-<
+                         NULL, 0, serv_connect_callback, client_p, conf->aftype,
->
+        comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
->
+                         NULL, 0, serv_connect_callback, client_p, conf->aftype,
+                         CONNECTTIMEOUT);
+      break;
+#ifdef IPV6
+          ipn.ss_port = 0;
+          comm_connect_tcp(&client_p->localClient->fd,
+                           conf->host, conf->port,
-<
+                           (struct sockaddr *)&ipn, ipn.ss_len,
->
+                           (struct sockaddr *)&ipn, ipn.ss_len,
+                           serv_connect_callback, client_p,
+                           conf->aftype, CONNECTTIMEOUT);
+        else
+          comm_connect_tcp(&client_p->localClient->fd,
-<
+                           conf->host, conf->port,
->
+                           conf->host, conf->port,
+                           NULL, 0, serv_connect_callback, client_p,
+                           conf->aftype, CONNECTTIMEOUT);
+static void
+ssl_server_handshake(fde_t *fd, struct Client *client_p)
-<
+  int ret;
-<
+  int err;
-<
-<
+  ret = SSL_connect(client_p->localClient->fd.ssl);
->
+  X509 *cert = NULL;
->
+  int ret = 0;
-<
+  if (ret <= 0)
->
+  if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
-<
+    switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
->
+    switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
+      case SSL_ERROR_WANT_WRITE:
+        comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
-+
+  if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
-+
+  {
-+
+    int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
-+
+    char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
-+
+    unsigned char md[EVP_MAX_MD_SIZE] = { '\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)
-+
+    {
-+
+      unsigned int i = 0, n = 0;
-+
-+
+      if (X509_digest(cert, EVP_sha256(), md, &n))
-+
+      {
-+
+        for (; i < n; ++i)
-+
+          snprintf(buf + 2 * i, 3, "%02X", md[i]);
-+
+        client_p->certfp = xstrdup(buf);
-+
+      }
-+
+    }
-+
+    else
-+
+      ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
-+
+           client_p->name, client_p->username, client_p->host, res);
-+
+    X509_free(cert);
-+
+  }
-+
+  finish_ssl_server_handshake(client_p);
+#endif
+/* serv_connect_callback() - complete a server connection.
-<
+ *
->
+ *
+ * This routine is called after the server connection attempt has
+ * completed. If unsucessful, an error is sent to ops and the client
+ * is closed. If sucessful, it goes through the initialisation/check
+  /* If we've been marked dead because a send failed, just exit
+   * here now and save everyone the trouble of us ever existing.
+   */
-<
+  if (IsDead(client_p))
->
+  if (IsDead(client_p))
+      sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
+                           "%s[%s] went dead during handshake",
+      if (!match(name, cptr->name))
+        return cptr;
-<
->
+  return NULL;

Diff Legend

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

Comparing ircd-hybrid/trunk/src/s_serv.c (file contents): Revision 2182 by michael, Tue Jun 4 12:19:04 2013 UTC vs. Revision 2463 by michael, Sat Aug 17 20:38:00 2013 UTC

Diff Legend

Comparing ircd-hybrid/trunk/src/s_serv.c (file contents):
Revision 2182 by michael, Tue Jun 4 12:19:04 2013 UTC vs.
Revision 2463 by michael, Sat Aug 17 20:38:00 2013 UTC