Applied svn diff from ratbox3 r21458:21470

[irc/rqf/shadowircd.git] / modules / m_trace.c

diff --git a/modules/m_trace.c b/modules/m_trace.c
index d99cd5aa2e651d11ae36aa8c244c5e17f65409a8..e173d21168903180419837b109c4482e50325f81 100644 (file)
--- a/modules/m_trace.c
+++ b/modules/m_trace.c
@@ -31,10 +31,9 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "s_newconf.h"
@@ -62,7 +61,7 @@ mapi_hlist_av1 trace_hlist[] = {
 DECLARE_MODULE_AV1(trace, NULL, NULL, trace_clist, trace_hlist, NULL, "$Revision: 3183 $");
 
 static void count_downlinks(struct Client *server_p, int *pservcount, int *pusercount);
-static int report_this_status(struct Client *source_p, struct Client *target_p, int dow);
+static int report_this_status(struct Client *source_p, struct Client *target_p);
 
 /*
  * m_trace
@@ -173,7 +172,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
                 */
                if(target_p != NULL)
                {
-                       report_this_status(source_p, target_p, 0);
+                       report_this_status(source_p, target_p);
                        tname = target_p->name;
                }
 
@@ -194,7 +193,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
                if(MyClient(source_p))
                {
                        if(doall || (wilds && match(tname, source_p->name)))
-                               report_this_status(source_p, source_p, 0);
+                               report_this_status(source_p, source_p);
                }
 
                RB_DLINK_FOREACH(ptr, local_oper_list.head)
@@ -204,7 +203,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
                        if(!doall && wilds && (match(tname, target_p->name) == 0))
                                continue;
 
-                       report_this_status(source_p, target_p, 0);
+                       report_this_status(source_p, target_p);
                }
 
                if (IsExemptShide(source_p) || !ConfigServerHide.flatten_links)
@@ -216,7 +215,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
                                if(!doall && wilds && !match(tname, target_p->name))
                                        continue;
 
-                               report_this_status(source_p, target_p, 0);
+                               report_this_status(source_p, target_p);
                        }
                }
 
@@ -239,7 +238,12 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
                if(!doall && wilds && !match(tname, target_p->name))
                        continue;
 
-               cnt = report_this_status(source_p, target_p, dow);
+               /* remote opers may not see invisible normal users */
+               if(dow && !MyConnect(source_p) && !IsOper(target_p) &&
+                               IsInvisible(target_p))
+                       continue;
+
+               cnt = report_this_status(source_p, target_p);
        }
 
        RB_DLINK_FOREACH(ptr, serv_list.head)
@@ -249,7 +253,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
                if(!doall && wilds && !match(tname, target_p->name))
                        continue;
 
-               cnt = report_this_status(source_p, target_p, dow);
+               cnt = report_this_status(source_p, target_p);
        }
 
        if(MyConnect(source_p))
@@ -261,7 +265,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
                        if(!doall && wilds && !match(tname, target_p->name))
                                continue;
 
-                       cnt = report_this_status(source_p, target_p, dow);
+                       cnt = report_this_status(source_p, target_p);
                }
        }
 
@@ -326,8 +330,7 @@ count_downlinks(struct Client *server_p, int *pservcount, int *pusercount)
  * side effects - NONE
  */
 static int
-report_this_status(struct Client *source_p, struct Client *target_p,
-                  int dow)
+report_this_status(struct Client *source_p, struct Client *target_p)
 {
        const char *name;
        const char *class_name;
@@ -338,11 +341,11 @@ report_this_status(struct Client *source_p, struct Client *target_p,
        if(!MyConnect(target_p))
                return 0;
 
-       inetntop_sock((struct sockaddr *)&target_p->localClient->ip, ip, sizeof(ip));
+       rb_inet_ntop_sock((struct sockaddr *)&target_p->localClient->ip, ip, sizeof(ip));
        class_name = get_client_class(target_p);
 
        if(IsAnyServer(target_p))
-               name = get_server_name(target_p, HIDE_IP);
+               name = target_p->name;
        else
                name = get_client_name(target_p, HIDE_IP);
 
@@ -370,36 +373,31 @@ report_this_status(struct Client *source_p, struct Client *target_p,
                sendto_one_numeric(source_p, RPL_TRACEUNKNOWN,
                                   form_str(RPL_TRACEUNKNOWN),
                                   class_name, name, ip,
-                                  CurrentTime - target_p->localClient->firsttime);
+                                  rb_current_time() - target_p->localClient->firsttime);
                cnt++;
                break;
 
        case STAT_CLIENT:
-               /* Only opers see users if there is a wildcard
-                * but anyone can see all the opers.
-                */
-               if((IsOper(source_p) &&
-                   (MyClient(source_p) || !(dow && IsInvisible(target_p))))
-                  || !dow || IsOper(target_p) || (source_p == target_p))
-               {
-                       if(IsOper(target_p))
-                               sendto_one_numeric(source_p, RPL_TRACEOPERATOR,
-                                                  form_str(RPL_TRACEOPERATOR),
-                                                  class_name, name,
-                                                  show_ip(source_p, target_p) ? ip : "255.255.255.255",
-                                                  CurrentTime - target_p->localClient->lasttime,
-                                                  CurrentTime - target_p->localClient->last);
+                /* Only opers see users if there is a wildcard
+                 * but anyone can see all the opers.
+                 */
+                if((IsOper(source_p) &&
+                    (MyClient(source_p) || !(dow && IsInvisible(target_p))))
+                   || !dow || IsOper(target_p) || (source_p == target_p))
+                {
+                        int tnumeric = RPL_TRACEUSER;
+                        if(IsOper(target_p))
+                                tnumeric = RPL_TRACEOPERATOR;
+                        
+                        sendto_one_numeric(source_p, tnumeric, form_str(tnumeric),
+                                        class_name, name,
+                                        show_ip(source_p, target_p) ? ip : empty_sockhost,
+                                        rb_current_time() - target_p->localClient->lasttime,
+                                        rb_current_time() - target_p->localClient->last);
+                        cnt++;
+                }
+                break;
 
-                       else
-                               sendto_one_numeric(source_p, RPL_TRACEUSER, 
-                                                  form_str(RPL_TRACEUSER),
-                                                  class_name, name,
-                                                  show_ip(source_p, target_p) ? ip : "255.255.255.255",
-                                                  CurrentTime - target_p->localClient->lasttime,
-                                                  CurrentTime - target_p->localClient->last);
-                       cnt++;
-               }
-               break;
 
        case STAT_SERVER:
                {
@@ -411,7 +409,7 @@ report_this_status(struct Client *source_p, struct Client *target_p,
                        sendto_one_numeric(source_p, RPL_TRACESERVER, form_str(RPL_TRACESERVER),
                                   class_name, servcount, usercount, name,
                                   *(target_p->serv->by) ? target_p->serv->by : "*", "*",
-                                  me.name, CurrentTime - target_p->localClient->lasttime);
+                                  me.name, rb_current_time() - target_p->localClient->lasttime);
                        cnt++;
 
                }