summaryrefslogtreecommitdiff
path: root/modules/m_trace.c
diff options
context:
space:
mode:
Diffstat (limited to 'modules/m_trace.c')
-rw-r--r--modules/m_trace.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/modules/m_trace.c b/modules/m_trace.c
index 03f277b..3c1be75 100644
--- a/modules/m_trace.c
+++ b/modules/m_trace.c
@@ -71,7 +71,7 @@ m_trace(struct Client *client_p, struct Client *source_p,
else
tname = me.name;
- sendto_one(source_p, RPL_ENDOFTRACE,
+ sendto_one(source_p, form_str(RPL_ENDOFTRACE),
me.name, source_p->name, tname);
}
@@ -128,10 +128,10 @@ mo_trace(struct Client *client_p, struct Client *source_p,
}
if (ac2ptr != NULL)
- sendto_one(source_p, RPL_TRACELINK, from, to,
+ sendto_one(source_p, form_str(RPL_TRACELINK), from, to,
ircd_version, tname, ac2ptr->from->name);
else
- sendto_one(source_p, RPL_TRACELINK, from, to,
+ sendto_one(source_p, form_str(RPL_TRACELINK), from, to,
ircd_version, tname, "ac2ptr_is_NULL!!");
return;
}
@@ -214,7 +214,7 @@ do_actual_trace(struct Client *source_p, int parc, char *parv[])
if (HasUMode(target_p, UMODE_OPER))
{
- sendto_one(source_p, RPL_TRACEOPERATOR,
+ sendto_one(source_p, form_str(RPL_TRACEOPERATOR),
from, to, get_client_class(&target_p->localClient->confs), name,
IsIPSpoof(target_p) ? "255.255.255.255" : target_p->sockhost,
CurrentTime - target_p->localClient->lasttime,
@@ -222,7 +222,7 @@ do_actual_trace(struct Client *source_p, int parc, char *parv[])
}
else
{
- sendto_one(source_p, RPL_TRACEUSER,
+ sendto_one(source_p,form_str(RPL_TRACEUSER),
from, to, get_client_class(&target_p->localClient->confs), name,
IsIPSpoof(target_p) ? "255.255.255.255" : target_p->sockhost,
CurrentTime - target_p->localClient->lasttime,
@@ -230,7 +230,7 @@ do_actual_trace(struct Client *source_p, int parc, char *parv[])
}
}
- sendto_one(source_p, RPL_ENDOFTRACE,
+ sendto_one(source_p, form_str(RPL_ENDOFTRACE),
from, to, tname);
return;
}
@@ -282,11 +282,11 @@ do_actual_trace(struct Client *source_p, int parc, char *parv[])
const struct ClassItem *class = ptr->data;
if (class->ref_count > 0)
- sendto_one(source_p, RPL_TRACECLASS,
+ sendto_one(source_p, form_str(RPL_TRACECLASS),
from, to, class->name, class->ref_count);
}
- sendto_one(source_p, RPL_ENDOFTRACE, from, to, tname);
+ sendto_one(source_p, form_str(RPL_ENDOFTRACE), from, to, tname);
}
/* report_this_status()
@@ -322,12 +322,12 @@ report_this_status(struct Client *source_p, struct Client *target_p, int dow)
switch (target_p->status)
{
case STAT_CONNECTING:
- sendto_one(source_p, RPL_TRACECONNECTING,
+ sendto_one(source_p, form_str(RPL_TRACECONNECTING),
from, to, class_name,
HasUMode(source_p, UMODE_ADMIN) ? name : target_p->name);
break;
case STAT_HANDSHAKE:
- sendto_one(source_p, RPL_TRACEHANDSHAKE,
+ sendto_one(source_p, form_str(RPL_TRACEHANDSHAKE),
from, to, class_name,
HasUMode(source_p, UMODE_ADMIN) ? name : target_p->name);
break;
@@ -335,7 +335,7 @@ report_this_status(struct Client *source_p, struct Client *target_p, int dow)
break;
case STAT_UNKNOWN:
/* added time -Taner */
- sendto_one(source_p, RPL_TRACEUNKNOWN,
+ sendto_one(source_p, form_str(RPL_TRACEUNKNOWN),
from, to, class_name, name, target_p->sockhost,
target_p->localClient->firsttime ? /* TBD: can't be 0 */
CurrentTime - target_p->localClient->firsttime : -1);
@@ -350,7 +350,7 @@ report_this_status(struct Client *source_p, struct Client *target_p, int dow)
|| !dow || HasUMode(target_p, UMODE_OPER))
{
if (HasUMode(target_p, UMODE_ADMIN) && !ConfigFileEntry.hide_spoof_ips)
- sendto_one(source_p, RPL_TRACEOPERATOR,
+ sendto_one(source_p, form_str(RPL_TRACEOPERATOR),
from, to, class_name, name,
HasUMode(source_p, UMODE_ADMIN) ? target_p->sockhost : "255.255.255.255",
CurrentTime - target_p->localClient->lasttime,
@@ -359,13 +359,13 @@ report_this_status(struct Client *source_p, struct Client *target_p, int dow)
else if (HasUMode(target_p, UMODE_OPER))
{
if (ConfigFileEntry.hide_spoof_ips)
- sendto_one(source_p, RPL_TRACEOPERATOR,
+ sendto_one(source_p, form_str(RPL_TRACEOPERATOR),
from, to, class_name, name,
IsIPSpoof(target_p) ? "255.255.255.255" : target_p->sockhost,
CurrentTime - target_p->localClient->lasttime,
idle_time_get(source_p, target_p));
else
- sendto_one(source_p, RPL_TRACEOPERATOR,
+ sendto_one(source_p, form_str(RPL_TRACEOPERATOR),
from, to, class_name, name,
MyOper(source_p) ? target_p->sockhost :
(IsIPSpoof(target_p) ? "255.255.255.255" : target_p->sockhost),
@@ -375,13 +375,13 @@ report_this_status(struct Client *source_p, struct Client *target_p, int dow)
else
{
if (ConfigFileEntry.hide_spoof_ips)
- sendto_one(source_p, RPL_TRACEUSER,
+ sendto_one(source_p, form_str(RPL_TRACEUSER),
from, to, class_name, name,
IsIPSpoof(target_p) ? "255.255.255.255" : target_p->sockhost,
CurrentTime - target_p->localClient->lasttime,
idle_time_get(source_p, target_p));
else
- sendto_one(source_p, RPL_TRACEUSER,
+ sendto_one(source_p, form_str(RPL_TRACEUSER),
from, to, class_name, name,
MyOper(source_p) ? target_p->sockhost :
(IsIPSpoof(target_p) ? "255.255.255.255" : target_p->sockhost),
@@ -400,7 +400,7 @@ report_this_status(struct Client *source_p, struct Client *target_p, int dow)
if (!HasUMode(source_p, UMODE_ADMIN))
name = get_client_name(target_p, MASK_IP);
- sendto_one(source_p, RPL_TRACESERVER,
+ sendto_one(source_p, form_str(RPL_TRACESERVER),
from, to, class_name, servers,
clients, name, *(target_p->serv->by) ?
target_p->serv->by : "*", "*",
@@ -409,7 +409,7 @@ report_this_status(struct Client *source_p, struct Client *target_p, int dow)
}
default: /* ...we actually shouldn't come here... --msa */
- sendto_one(source_p, RPL_TRACENEWTYPE,
+ sendto_one(source_p, form_str(RPL_TRACENEWTYPE),
from, to, name);
break;
}