X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/af7c236800d8aa369835ff5db6623b9f0a63c6b3..133755685ef38d8f9ac79ac27c4505b9e96f81fd:/modules/m_trace.c

diff --git a/modules/m_trace.c b/modules/m_trace.c
index 1c01229..e2c0e0b 100644
--- a/modules/m_trace.c
+++ b/modules/m_trace.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_trace.c 3183 2007-02-01 01:07:42Z jilles $
  */
 
 #include "stdinc.h"
@@ -63,9 +62,10 @@ DECLARE_MODULE_AV1(trace, NULL, NULL, trace_clist, trace_hlist, NULL, "$Revision
 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);
 
+static const char *empty_sockhost = "255.255.255.255";
+
 /*
  * m_trace
- *      parv[0] = sender prefix
  *      parv[1] = servername
  */
 static int
@@ -172,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;
 		}
 
@@ -193,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)
@@ -203,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)
@@ -215,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);
 			}
 		}
 
@@ -243,7 +243,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
 				IsInvisible(target_p))
 			continue;
 
-		cnt = report_this_status(source_p, target_p, dow);
+		cnt = report_this_status(source_p, target_p);
 	}
 
 	RB_DLINK_FOREACH(ptr, serv_list.head)
@@ -253,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))
@@ -265,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);
 		}
 	}
 
@@ -330,7 +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;
@@ -378,26 +378,19 @@ report_this_status(struct Client *source_p, struct Client *target_p, int dow)
 		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))
-                {
-                        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;
+		{
+			int tnumeric;
+
+			tnumeric = IsOper(target_p) ? RPL_TRACEOPERATOR : RPL_TRACEUSER;
+			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;
 
 	case STAT_SERVER:
 		{