diff options
Diffstat (limited to 'modules/m_etrace.c')
| -rw-r--r-- | modules/m_etrace.c | 58 |
1 files changed, 7 insertions, 51 deletions
diff --git a/modules/m_etrace.c b/modules/m_etrace.c index a174804..88ab898 100644 --- a/modules/m_etrace.c +++ b/modules/m_etrace.c @@ -39,7 +39,7 @@ #include "conf_class.h" -static void report_this_status(struct Client *, struct Client *, int); +static void report_this_status(struct Client *, struct Client *); /* * do_etrace() @@ -51,7 +51,6 @@ do_etrace(struct Client *source_p, int parc, char *parv[]) struct Client *target_p = NULL; int wilds = 0; int do_all = 0; - int full_etrace = 0; dlink_node *ptr; sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE, @@ -61,16 +60,6 @@ do_etrace(struct Client *source_p, int parc, char *parv[]) if (parc > 1) { - if (irccmp(parv[1], "-full") == 0) - { - ++parv; - --parc; - full_etrace = 1; - } - } - - if (parc > 1) - { tname = parv[1]; if (tname != NULL) @@ -89,7 +78,7 @@ do_etrace(struct Client *source_p, int parc, char *parv[]) target_p = hash_find_client(tname); if (target_p && MyClient(target_p)) - report_this_status(source_p, target_p, full_etrace); + report_this_status(source_p, target_p); sendto_one(source_p, form_str(RPL_ENDOFTRACE), me.name, source_p->name, tname); @@ -103,10 +92,10 @@ do_etrace(struct Client *source_p, int parc, char *parv[]) if (wilds) { if (!match(tname, target_p->name)) - report_this_status(source_p, target_p, full_etrace); + report_this_status(source_p, target_p); } else - report_this_status(source_p, target_p, full_etrace); + report_this_status(source_p, target_p); } sendto_one(source_p, form_str(RPL_ENDOFTRACE), me.name, @@ -133,43 +122,11 @@ mo_etrace(struct Client *client_p, struct Client *source_p, * side effects - NONE */ static void -report_this_status(struct Client *source_p, struct Client *target_p, - int full_etrace) +report_this_status(struct Client *source_p, struct Client *target_p) { if (target_p->status == STAT_CLIENT) { - if (full_etrace) - { - if (ConfigFileEntry.hide_spoof_ips) - sendto_one(source_p, form_str(RPL_ETRACE_FULL), - me.name, - source_p->name, - HasUMode(target_p, UMODE_OPER) ? "Oper" : "User", - get_client_class(&target_p->localClient->confs), - target_p->name, - target_p->username, - target_p->host, - IsIPSpoof(target_p) ? "255.255.255.255" : target_p->sockhost, - IsIPSpoof(target_p) ? "<hidden>" : target_p->localClient->client_host, - IsIPSpoof(target_p) ? "<hidden>" : target_p->localClient->client_server, - target_p->info); - else - sendto_one(source_p, form_str(RPL_ETRACE_FULL), - me.name, - source_p->name, - HasUMode(target_p, UMODE_OPER) ? "Oper" : "User", - get_client_class(&target_p->localClient->confs), - target_p->name, - target_p->username, - target_p->host, - target_p->sockhost, - target_p->localClient->client_host, - target_p->localClient->client_server, - target_p->info); - } - else - { - if (ConfigFileEntry.hide_spoof_ips) + if (ConfigFileEntry.hide_spoof_ips) sendto_one(source_p, form_str(RPL_ETRACE), me.name, source_p->name, @@ -180,7 +137,7 @@ report_this_status(struct Client *source_p, struct Client *target_p, target_p->host, IsIPSpoof(target_p) ? "255.255.255.255" : target_p->sockhost, target_p->info); - else + else sendto_one(source_p, form_str(RPL_ETRACE), me.name, source_p->name, @@ -191,7 +148,6 @@ report_this_status(struct Client *source_p, struct Client *target_p, target_p->host, target_p->sockhost, target_p->info); - } } } |