Author: Isomer <isomer@coders.net>

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

diff --git a/ircd/s_serv.c b/ircd/s_serv.c
index 93baf6a72a67de42f636cb5eeaf51adfbb3ca476..4084c54229087e53a50724e81798606cf2c12a40 100644 (file)
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -33,6 +33,7 @@
 #include "ircd_alloc.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
+#include "ircd_snprintf.h"
 #include "ircd_xopen.h"
 #include "jupe.h"
 #include "list.h"
@@ -59,7 +60,7 @@
 
 unsigned int max_connection_count = 0;
 unsigned int max_client_count = 0;
-
+#if 0
 int exit_new_server(struct Client* cptr, struct Client* sptr,
                     const char* host, time_t timestamp, const char* fmt, ...)
 {
@@ -72,11 +73,31 @@ int exit_new_server(struct Client* cptr, struct Client* sptr,
     return vexit_client_msg(cptr, cptr, &me, fmt, vl);
   sprintf_irc(buf, ":%s " TOK_SQUIT " %s " TIME_T_FMT " :", me.name, host, timestamp);
   strcat(buf, fmt);
-  vsendto_one(cptr, buf, vl);
+  vsendto_one(cptr, buf, vl); /* XXX DEAD */
   va_end(vl);
   MyFree(buf);
   return 0;
 }
+#endif /* 0 */
+
+int exit_new_server(struct Client *cptr, struct Client *sptr, const char *host,
+                   time_t timestamp, const char *pattern, ...)
+{
+  struct VarData vd;
+  int retval = 0;
+
+  vd.vd_format = pattern;
+  va_start(vd.vd_args, pattern);
+
+  if (!IsServer(sptr))
+    retval = vexit_client_msg(cptr, cptr, &me, pattern, vd.vd_args);
+  else
+    sendcmdto_one(&me, CMD_SQUIT, cptr, "%s %Tu :%v", host, timestamp, &vd);
+
+  va_end(vd.vd_args);
+
+  return retval;
+}
 
 int a_kills_b_too(struct Client *a, struct Client *b)
 {
@@ -90,7 +111,8 @@ int a_kills_b_too(struct Client *a, struct Client *b)
  * May only be called after a SERVER was received from cptr,
  * and thus make_server was called, and serv->prot set. --Run
  */
-int server_estab(struct Client *cptr, struct ConfItem *aconf)
+int server_estab(struct Client *cptr, struct ConfItem *aconf,
+                struct Jupe *ajupe)
 {
   struct Client* acptr = 0;
   const char*    inpath;
@@ -105,20 +127,13 @@ int server_estab(struct Client *cptr, struct ConfItem *aconf)
 
   if (IsUnknown(cptr)) {
     if (aconf->passwd[0])
-      sendto_one(cptr, "PASS :%s", aconf->passwd);
+      sendrawto_one(cptr, MSG_PASS " :%s", aconf->passwd);
     /*
      *  Pass my info to the new server
      */
-    sendto_one(cptr, "SERVER %s 1 " TIME_T_FMT " " TIME_T_FMT " J%s %s%s :%s",
-        me.name, me.serv->timestamp, cptr->serv->timestamp,
-        MAJOR_PROTOCOL, NumServCap(&me),
-        (me.info[0]) ? (me.info) : "IRCers United");
-    /*
-     * Don't charge this IP# for connecting
-     * XXX - if this comes from a server port, it will not have been added
-     * to the IP check registry, see add_connection in s_bsd.c 
-     */
-    IPcheck_connect_fail(cptr->ip);
+    sendrawto_one(cptr, MSG_SERVER " %s 1 %Tu %Tu J%s %s%s :%s", me.name,
+                 me.serv->timestamp, cptr->serv->timestamp, MAJOR_PROTOCOL,
+                 NumServCap(&me), *me.info ? me.info : "IRCers United");
   }
 
   det_confs_butmask(cptr, CONF_LEAF | CONF_HUB | CONF_SERVER | CONF_UWORLD);
@@ -172,9 +187,16 @@ int server_estab(struct Client *cptr, struct ConfItem *aconf)
       continue;
     if (!match(me.name, cptr->name))
       continue;
-    sendcmdto_one(&me, CMD_SERVER, acptr, "%s 2 0 %Tu J%02u %s%s 0 :%s",
-                 cptr->name, cptr->serv->timestamp, Protocol(cptr),
-                 NumServCap(cptr), cptr->info);
+    if (ajupe)
+      sendcmdto_one(&me, CMD_SERVER, acptr,
+                   "%s 2 0 %Tu J%02u %s%s 0 %%%Tu :%s", cptr->name,
+                   cptr->serv->timestamp, Protocol(cptr), NumServCap(cptr),
+                   JupeLastMod(ajupe), cptr->info);
+    else
+      sendcmdto_one(&me, CMD_SERVER, acptr,
+                   "%s 2 0 %Tu J%02u %s%s 0 :%s", cptr->name,
+                   cptr->serv->timestamp, Protocol(cptr), NumServCap(cptr),
+                   cptr->info);
   }
 
   /*
@@ -209,10 +231,18 @@ int server_estab(struct Client *cptr, struct ConfItem *aconf)
       split = (MyConnect(acptr) && 
                0 != ircd_strcmp(acptr->name, acptr->sockhost) &&
                0 != ircd_strncmp(acptr->info, "JUPE", 4));
-      sendcmdto_one(&me, CMD_SERVER, cptr, "%s %d 0 %Tu %s%u %s%s 0 :%s",
-                   acptr->name, acptr->hopcount + 1, acptr->serv->timestamp,
-                   protocol_str, Protocol(acptr), NumServCap(acptr),
-                   acptr->info);
+      if ((ajupe = jupe_find(acptr->name)) && !JupeIsLocal(ajupe))
+       sendcmdto_one(acptr->serv->up, CMD_SERVER, cptr,
+                     "%s %d 0 %Tu %s%u %s%s 0 %%%Tu :%s", acptr->name,
+                     acptr->hopcount + 1, acptr->serv->timestamp,
+                     protocol_str, Protocol(acptr), NumServCap(acptr),
+                     JupeLastMod(ajupe), acptr->info);
+      else
+       sendcmdto_one(acptr->serv->up, CMD_SERVER, cptr,
+                     "%s %d 0 %Tu %s%u %s%s 0 :%s", acptr->name,
+                     acptr->hopcount + 1, acptr->serv->timestamp,
+                     protocol_str, Protocol(acptr), NumServCap(acptr),
+                     acptr->info);
     }
   }
 
@@ -225,13 +255,25 @@ int server_estab(struct Client *cptr, struct ConfItem *aconf)
     {
       char xxx_buf[8];
       char *s = umode_str(acptr);
-      sendcmdto_one(acptr->user->server, CMD_NICK, cptr, *s ?
-                   "%s %d %Tu %s %s +%s %s %s%s :%s" :
-                   "%s %d %Tu %s %s %s%s %s%s :%s",
-                   acptr->name, acptr->hopcount + 1, acptr->lastnick,
-                   acptr->user->username, acptr->user->host, s,
-                   inttobase64(xxx_buf, ntohl(acptr->ip.s_addr), 6),
-                   NumNick(acptr), acptr->info);
+      struct Gline *agline = 0;
+      if ((agline = gline_lookup(acptr, GLINE_GLOBAL | GLINE_LASTMOD)))
+       sendcmdto_one(acptr->user->server, CMD_NICK, cptr,
+                     "%s %d %Tu %s %s %s%s%s%%%Tu:%s@%s %s %s%s :%s",
+                     acptr->name, acptr->hopcount + 1, acptr->lastnick,
+                     acptr->user->username, acptr->user->host,
+                     *s ? "+" : "", s, *s ? " " : "",
+                     GlineLastMod(agline), GlineUser(agline),
+                     GlineHost(agline),
+                     inttobase64(xxx_buf, ntohl(acptr->ip.s_addr), 6),
+                     NumNick(acptr), acptr->info);
+      else
+       sendcmdto_one(acptr->user->server, CMD_NICK, cptr,
+                     "%s %d %Tu %s %s %s%s%s%s %s%s :%s",
+                     acptr->name, acptr->hopcount + 1, acptr->lastnick,
+                     acptr->user->username, acptr->user->host,
+                     *s ? "+" : "", s, *s ? " " : "",
+                     inttobase64(xxx_buf, ntohl(acptr->ip.s_addr), 6),
+                     NumNick(acptr), acptr->info);
     }
   }
   /*