diff options
Diffstat (limited to 'modules/m_trace.c')
-rw-r--r-- | modules/m_trace.c | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/modules/m_trace.c b/modules/m_trace.c index 160b6ac..4b86162 100644 --- a/modules/m_trace.c +++ b/modules/m_trace.c @@ -206,7 +206,7 @@ do_actual_trace(struct Client *source_p, int parc, char *parv[]) { const char *name; target_p = hash_find_client(tname); - + if (target_p && IsClient(target_p)) { name = get_client_name(target_p, HIDE_IP); @@ -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, form_str(RPL_TRACEOPERATOR), - from, to, get_client_class(&target_p->localClient->confs), name, + 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, idle_time_get(source_p, target_p)); @@ -223,12 +223,12 @@ do_actual_trace(struct Client *source_p, int parc, char *parv[]) { 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, + IsIPSpoof(target_p) ? "255.255.255.255" : target_p->sockhost, CurrentTime - target_p->localClient->lasttime, idle_time_get(source_p, target_p)); } } - + sendto_one(source_p, form_str(RPL_ENDOFTRACE), from, to, tname); return; @@ -240,8 +240,8 @@ do_actual_trace(struct Client *source_p, int parc, char *parv[]) target_p = ptr->data; if (HasUMode(target_p, UMODE_INVISIBLE) && dow && - !(MyConnect(source_p) && HasUMode(source_p, UMODE_OPER)) && - !HasUMode(target_p, UMODE_OPER) && (target_p != source_p)) + !(MyConnect(source_p) && HasUMode(source_p, UMODE_OPER)) && + !HasUMode(target_p, UMODE_OPER) && (target_p != source_p)) continue; if (!doall && wilds && match(tname, target_p->name)) continue; @@ -322,12 +322,12 @@ report_this_status(struct Client *source_p, struct Client *target_p, int dow) { case STAT_CONNECTING: sendto_one(source_p, form_str(RPL_TRACECONNECTING), - from, to, class_name, - HasUMode(source_p, UMODE_ADMIN) ? name : target_p->name); + from, to, class_name, + HasUMode(source_p, UMODE_ADMIN) ? name : target_p->name); break; case STAT_HANDSHAKE: sendto_one(source_p, form_str(RPL_TRACEHANDSHAKE), - from, to, class_name, + from, to, class_name, HasUMode(source_p, UMODE_ADMIN) ? name : target_p->name); break; case STAT_ME: @@ -335,8 +335,8 @@ report_this_status(struct Client *source_p, struct Client *target_p, int dow) case STAT_UNKNOWN: /* added time -Taner */ 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 */ + from, to, class_name, name, target_p->sockhost, + target_p->localClient->firsttime ? /* TBD: can't be 0 */ CurrentTime - target_p->localClient->firsttime : -1); break; case STAT_CLIENT: @@ -345,49 +345,49 @@ report_this_status(struct Client *source_p, struct Client *target_p, int dow) * but anyone can see all the opers. */ if ((HasUMode(source_p, UMODE_OPER) && - (MyClient(source_p) || !(dow && HasUMode(target_p, UMODE_INVISIBLE)))) - || !dow || HasUMode(target_p, UMODE_OPER)) - { + (MyClient(source_p) || !(dow && HasUMode(target_p, UMODE_INVISIBLE)))) + || !dow || HasUMode(target_p, UMODE_OPER)) + { if (HasUMode(target_p, UMODE_ADMIN) && !ConfigFileEntry.hide_spoof_ips) - sendto_one(source_p, form_str(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, idle_time_get(source_p, target_p)); - - else if (HasUMode(target_p, UMODE_OPER)) + + else if (HasUMode(target_p, UMODE_OPER)) { - if (ConfigFileEntry.hide_spoof_ips) - 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 + if (ConfigFileEntry.hide_spoof_ips) + 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, 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), CurrentTime - target_p->localClient->lasttime, idle_time_get(source_p, target_p)); - } - else + } + else { if (ConfigFileEntry.hide_spoof_ips) - sendto_one(source_p, form_str(RPL_TRACEUSER), - from, to, class_name, name, + 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 + CurrentTime - target_p->localClient->lasttime, + idle_time_get(source_p, target_p)); + else 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), CurrentTime - target_p->localClient->lasttime, idle_time_get(source_p, target_p)); - } - } + } + } break; case STAT_SERVER: { @@ -400,14 +400,14 @@ report_this_status(struct Client *source_p, struct Client *target_p, int dow) name = get_client_name(target_p, MASK_IP); sendto_one(source_p, form_str(RPL_TRACESERVER), - from, to, class_name, servers, - clients, name, *(target_p->serv->by) ? - target_p->serv->by : "*", "*", - me.name, CurrentTime - target_p->localClient->lasttime); + from, to, class_name, servers, + clients, name, *(target_p->serv->by) ? + target_p->serv->by : "*", "*", + me.name, CurrentTime - target_p->localClient->lasttime); break; } - default: /* ...we actually shouldn't come here... --msa */ + default: /* ...we actually shouldn't come here... --msa */ sendto_one(source_p, form_str(RPL_TRACENEWTYPE), from, to, name); break; |