#include "hook.h"
#include "client.h"
#include "hash.h"
-#include "common.h"
#include "hash.h"
#include "match.h"
#include "ircd.h"
#include "parse.h"
#include "modules.h"
-static int m_trace(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
static const char trace_desc[] =
"Provides the TRACE command to trace the route to a client or server";
+static void m_trace(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
static void trace_spy(struct Client *, struct Client *);
struct Message trace_msgtab = {
* m_trace
* parv[1] = servername
*/
-static int
+static void
m_trace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct Client *target_p = NULL;
struct Class *cltmp;
const char *tname;
- int doall = 0;
- int cnt = 0, wilds, dow;
+ bool doall = false, wilds, dow;
+ int cnt = 0;
rb_dlink_node *ptr;
if(parc > 1)
{
if(hunt_server(client_p, source_p, ":%s TRACE %s :%s", 2, parc, parv) !=
HUNTED_ISME)
- return 0;
+ return;
}
}
else
ac2ptr ? ac2ptr->name : tname,
ac2ptr ? ac2ptr->from->name : "EEK!");
- return 0;
+ return;
}
case HUNTED_ISME:
break;
default:
- return 0;
+ return;
}
}
if(match(tname, me.name))
{
- doall = 1;
+ doall = true;
}
/* if theyre tracing our SID, we need to move tname to our name so
* we dont give the sid in ENDOFTRACE
*/
else if(!MyClient(source_p) && !strcmp(tname, me.id))
{
- doall = 1;
+ doall = true;
tname = me.name;
}
dow = wilds || doall;
/* specific trace */
- if(dow == 0)
+ if(!dow)
{
if(MyClient(source_p) || parc > 2)
target_p = find_named_person(tname);
sendto_one_numeric(source_p, RPL_ENDOFTRACE,
form_str(RPL_ENDOFTRACE), tname);
- return 0;
+ return;
}
trace_spy(source_p, NULL);
if(!doall && wilds && (match(tname, target_p->name) == 0))
continue;
+ if(!SeesOper(target_p, source_p))
+ continue;
+
report_this_status(source_p, target_p);
}
sendto_one_numeric(source_p, RPL_ENDOFTRACE,
form_str(RPL_ENDOFTRACE), tname);
- return 0;
+ return;
}
/* source_p is opered */
target_p = ptr->data;
/* dont show invisible users to remote opers */
- if(IsInvisible(target_p) && dow && !MyConnect(source_p) && !IsOper(target_p))
+ if(IsInvisible(target_p) && dow && !MyConnect(source_p) && !SeesOper(target_p, source_p))
continue;
if(!doall && wilds && !match(tname, target_p->name))
continue;
/* remote opers may not see invisible normal users */
- if(dow && !MyConnect(source_p) && !IsOper(target_p) &&
+ if(dow && !MyConnect(source_p) && !SeesOper(target_p, source_p) &&
IsInvisible(target_p))
continue;
*/
sendto_one_numeric(source_p, RPL_ENDOFTRACE,
form_str(RPL_ENDOFTRACE), tname);
- return 0;
+ return;
}
if(doall)
}
sendto_one_numeric(source_p, RPL_ENDOFTRACE, form_str(RPL_ENDOFTRACE), tname);
-
- return 0;
}
/*
case STAT_CLIENT:
{
sendto_one_numeric(source_p,
- IsOper(target_p) ? RPL_TRACEOPERATOR : RPL_TRACEUSER,
- IsOper(target_p) ? form_str(RPL_TRACEOPERATOR) : form_str(RPL_TRACEUSER),
+ SeesOper(target_p, source_p) ? RPL_TRACEOPERATOR : RPL_TRACEUSER,
+ SeesOper(target_p, source_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),