m_trace.c fixed
This commit is contained in:
parent
3664572833
commit
a4da8e48cd
1 changed files with 21 additions and 28 deletions
|
@ -61,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);
|
||||
|
||||
static const char *empty_sockhost = "255.255.255.255";
|
||||
|
||||
|
@ -174,7 +174,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;
|
||||
}
|
||||
|
||||
|
@ -195,7 +195,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)
|
||||
|
@ -205,7 +205,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)
|
||||
|
@ -217,7 +217,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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -245,7 +245,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)
|
||||
|
@ -255,7 +255,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))
|
||||
|
@ -267,7 +267,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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -332,7 +332,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;
|
||||
|
@ -380,26 +380,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 = 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;
|
||||
|
||||
case STAT_SERVER:
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue