X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fm_map.c;h=ffbcb183ab0d8ead99605c2b3985759c8daffe14;hb=refs%2Fheads%2Fupstream-ssl;hp=1e4e48b097ff6bdb10d9cf087a06f8d700124f7d;hpb=84ba698af2f5d420a276ffe44d2ab010f0af6e54;p=ircu2.10.12-pk.git

diff --git a/ircd/m_map.c b/ircd/m_map.c
index 1e4e48b..ffbcb18 100644
--- a/ircd/m_map.c
+++ b/ircd/m_map.c
@@ -84,7 +84,8 @@
 #include "client.h"
 #include "ircd.h"
 #include "ircd_defs.h"
-#include "ircd_policy.h"
+#include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
 #include "ircd_string.h"
@@ -96,12 +97,71 @@
 #include "s_serv.h"
 #include "send.h"
 #include "querycmds.h"
-#include "map.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdio.h>
 #include <string.h>
 
+static void dump_map(struct Client *cptr, struct Client *server, char *mask, int prompt_length)
+{
+  const char *chr;
+  static char prompt[64];
+  struct DLink *lp;
+  char *p = prompt + prompt_length;
+  int cnt = 0;
+  
+  *p = '\0';
+  if (prompt_length > 60)
+    send_reply(cptr, RPL_MAPMORE, prompt, cli_name(server));
+  else
+  {
+    char lag[512];
+    if (cli_serv(server)->lag>10000)
+      lag[0]=0;
+    else if (cli_serv(server)->lag<0)
+      strcpy(lag,"(0s)");
+    else
+      sprintf(lag,"(%is)",cli_serv(server)->lag);
+    if (IsBurst(server))
+      chr = "*";
+    else if (IsBurstAck(server))
+      chr = "!";
+    else
+      chr = "";
+    send_reply(cptr, RPL_MAP, prompt, chr, cli_name(server),
+               lag, (server == &me) ? UserStats.local_clients :
+                                      cli_serv(server)->clients);
+  }
+  if (prompt_length > 0)
+  {
+    p[-1] = ' ';
+    if (p[-2] == '`')
+      p[-2] = ' ';
+  }
+  if (prompt_length > 60)
+    return;
+  strcpy(p, "|-");
+  for (lp = cli_serv(server)->down; lp; lp = lp->next)
+    if (match(mask, cli_name(lp->value.cptr)))
+      ClrFlag(lp->value.cptr, FLAG_MAP);
+    else
+    {
+      SetFlag(lp->value.cptr, FLAG_MAP);
+      cnt++;
+    }
+  for (lp = cli_serv(server)->down; lp; lp = lp->next)
+  {
+    if (!HasFlag(lp->value.cptr, FLAG_MAP))
+      continue;
+    if (--cnt == 0)
+      *p = '`';
+    dump_map(cptr, lp->value.cptr, mask, prompt_length + 2);
+  }
+  if (prompt_length > 0)
+    p[-1] = '-';
+}
+
+
 /*
  * m_map - generic message handler
  * -- by Run
@@ -111,13 +171,16 @@
  */
 int m_map(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
-#ifdef HEAD_IN_SAND_MAP
-  map_dump_head_in_sand(sptr);
-#else
-  if(parc < 2)
+  if (feature_bool(FEAT_HIS_MAP) && !IsAnOper(sptr))
+  {
+    sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s %s", sptr,
+                  "/MAP has been disabled, from CFV-165.  "
+                  "Visit ", feature_str(FEAT_HIS_URLSERVERS));
+    return 0;
+  }
+  if (parc < 2)
     parv[1] = "*";
-  map_dump(sptr, &me, parv[1], 0);
-#endif /* HEAD_IN_SAND_MAP */
+  dump_map(sptr, &me, parv[1], 0);
   send_reply(sptr, RPL_MAPEND);
 
   return 0;
@@ -128,7 +191,7 @@ int mo_map(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   if (parc < 2)
     parv[1] = "*";
 
-  map_dump(sptr, &me, parv[1], 0);
+  dump_map(sptr, &me, parv[1], 0);
   send_reply(sptr, RPL_MAPEND);
 
   return 0;