#include "hash.h"
#include "common.h"
#include "hash.h"
-#include "irc_string.h"
+#include "match.h"
#include "ircd.h"
#include "numeric.h"
#include "s_serv.h"
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);
+
+static const char *empty_sockhost = "255.255.255.255";
/*
* m_trace
- * parv[0] = sender prefix
* parv[1] = servername
*/
static int
*/
if(target_p != NULL)
{
- report_this_status(source_p, target_p, 0);
+ report_this_status(source_p, target_p);
tname = target_p->name;
}
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)
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)
if(!doall && wilds && !match(tname, target_p->name))
continue;
- report_this_status(source_p, target_p, 0);
+ report_this_status(source_p, target_p);
}
}
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)
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))
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);
}
}
* 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;
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);
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",
- rb_current_time() - target_p->localClient->lasttime,
- rb_current_time() - target_p->localClient->last);
+ 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);
- 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",
- rb_current_time() - target_p->localClient->lasttime,
- rb_current_time() - target_p->localClient->last);
cnt++;
}
break;