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
if(ac2ptr == NULL)
{
- RB_DLINK_FOREACH(ptr, global_client_list.head)
+ RB_DLINK_FOREACH(ptr, global_serv_list.head)
{
ac2ptr = ptr->data;
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:
- 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);
+ {
+ sendto_one_numeric(source_p,
+ IsOper(target_p) ? RPL_TRACEOPERATOR : RPL_TRACEUSER,
+ IsOper(target_p) ? form_str(RPL_TRACEOPERATOR) : form_str(RPL_TRACEUSER),
+ class_name, name,
+ show_ip(source_p, target_p) ? ip : empty_sockhost,
+ (unsigned long)(rb_current_time() - target_p->localClient->lasttime),
+ (unsigned long)(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++;
+ cnt++;
+ }
break;
case STAT_SERVER:
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, rb_current_time() - target_p->localClient->lasttime);
+ me.name,
+ (unsigned long)(rb_current_time() - target_p->localClient->lasttime));
cnt++;
}
default: /* ...we actually shouldn't come here... --msa */
sendto_one_numeric(source_p, RPL_TRACENEWTYPE,
- form_str(RPL_TRACENEWTYPE),
- me.name, source_p->name, name);
+ form_str(RPL_TRACENEWTYPE), name);
cnt++;
break;
}