summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/client.h3
-rw-r--r--include/numeric.h1
-rw-r--r--modules/m_etrace.c58
-rw-r--r--modules/m_user.c4
-rw-r--r--src/numeric.c2
5 files changed, 8 insertions, 60 deletions
diff --git a/include/client.h b/include/client.h
index 3db7242..e21314a 100644
--- a/include/client.h
+++ b/include/client.h
@@ -313,9 +313,6 @@ struct LocalUser
{
dlink_node lclient_node;
- char client_host[HOSTLEN + 1];
- char client_server[HOSTLEN + 1];
-
unsigned int registration;
unsigned int cap_client; /**< Client capabilities (from us) */
unsigned int cap_active; /**< Active capabilities (to us) */
diff --git a/include/numeric.h b/include/numeric.h
index 6e9cad9..a87c493 100644
--- a/include/numeric.h
+++ b/include/numeric.h
@@ -250,7 +250,6 @@ extern const char *form_str(unsigned int);
#define RPL_HELPSTART 704
#define RPL_HELPTXT 705
#define RPL_ENDOFHELP 706
-#define RPL_ETRACE_FULL 708
#define RPL_ETRACE 709
#define RPL_KNOCK 710
#define RPL_KNOCKDLVR 711
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);
- }
}
}
diff --git a/modules/m_user.c b/modules/m_user.c
index 9db36b4..9b00c29 100644
--- a/modules/m_user.c
+++ b/modules/m_user.c
@@ -58,10 +58,6 @@ do_local_user(struct Client *source_p,
strlcpy(source_p->info, realname, sizeof(source_p->info));
- /* stash for later */
- strlcpy(source_p->localClient->client_host, host, sizeof(source_p->localClient->client_host));
- strlcpy(source_p->localClient->client_server, server, sizeof(source_p->localClient->client_server));
-
if (!IsGotId(source_p))
strlcpy(source_p->username, username, sizeof(source_p->username));
diff --git a/src/numeric.c b/src/numeric.c
index 857d185..23d7e41 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -735,7 +735,7 @@ static const char *replies[] = {
/* 705 RPL_HELPTXT */ ":%s 705 %s %s :%s",
/* 706 RPL_ENDOFHELP */ ":%s 706 %s %s :End of /HELP.",
/* 707 */ NULL,
-/* 708 RPL_ETRACE_FULL */ ":%s 708 %s %s %s %s %s %s %s %s %s :%s",
+/* 708 */ NULL,
/* 709 RPL_ETRACE */ ":%s 709 %s %s %s %s %s %s %s :%s",
/* 710 RPL_KNOCK */ ":%s 710 %s %s %s!%s@%s :has asked for an invite.",
/* 711 RPL_KNOCKDLVR */ ":%s 711 %s %s :Your KNOCK has been delivered.",
generated by cgit (git 2.34.1) at 2025-07-16 08:11:35 +0000