diff options
Diffstat (limited to 'modules/commands')
| -rw-r--r-- | modules/commands/os_defcon.cpp | 4 | ||||
| -rw-r--r-- | modules/commands/os_list.cpp | 2 | ||||
| -rw-r--r-- | modules/commands/os_session.cpp | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/modules/commands/os_defcon.cpp b/modules/commands/os_defcon.cpp index afd5dc7d6..c5074fd44 100644 --- a/modules/commands/os_defcon.cpp +++ b/modules/commands/os_defcon.cpp @@ -502,7 +502,7 @@ class OSDefcon : public Module if (DConfig.sessionlimit <= 0 || !session_service) return; - Session *session = session_service->FindSession(u->ip); + Session *session = session_service->FindSession(u->ip.addr()); Exception *exception = session_service->FindException(u); if (DConfig.Check(DEFCON_REDUCE_SESSION) && !exception) @@ -511,7 +511,7 @@ class OSDefcon : public Module { if (!DConfig.sle_reason.empty()) { - Anope::string message = DConfig.sle_reason.replace_all_cs("%IP%", u->ip); + Anope::string message = DConfig.sle_reason.replace_all_cs("%IP%", u->ip.addr()); u->SendMessage(OperServ, message); } if (!DConfig.sle_detailsloc.empty()) diff --git a/modules/commands/os_list.cpp b/modules/commands/os_list.cpp index 7bafd8b4d..b0c5fb339 100644 --- a/modules/commands/os_list.cpp +++ b/modules/commands/os_list.cpp @@ -180,7 +180,7 @@ class CommandOSUserList : public Command if (!pattern.empty()) { - Anope::string mask = u2->nick + "!" + u2->GetIdent() + "@" + u2->GetDisplayedHost(), mask2 = u2->nick + "!" + u2->GetIdent() + "@" + u2->host, mask3 = u2->nick + "!" + u2->GetIdent() + "@" + (!u2->ip.empty() ? u2->ip : u2->host); + Anope::string mask = u2->nick + "!" + u2->GetIdent() + "@" + u2->GetDisplayedHost(), mask2 = u2->nick + "!" + u2->GetIdent() + "@" + u2->host, mask3 = u2->nick + "!" + u2->GetIdent() + "@" + u2->ip.addr(); if (!Anope::Match(mask, pattern) && !Anope::Match(mask2, pattern) && !Anope::Match(mask3, pattern)) continue; if (!modes.empty()) diff --git a/modules/commands/os_session.cpp b/modules/commands/os_session.cpp index edf9458f8..40412494e 100644 --- a/modules/commands/os_session.cpp +++ b/modules/commands/os_session.cpp @@ -64,10 +64,10 @@ class MySessionService : public SessionService for (std::vector<Exception *>::const_iterator it = this->Exceptions->begin(), it_end = this->Exceptions->end(); it != it_end; ++it) { Exception *e = *it; - if (Anope::Match(u->host, e->mask) || Anope::Match(u->ip, e->mask)) + if (Anope::Match(u->host, e->mask) || Anope::Match(u->ip.addr(), e->mask)) return e; - if (cidr(e->mask).match(sockaddrs(u->ip))) + if (cidr(e->mask).match(u->ip)) return e; } return NULL; @@ -109,9 +109,9 @@ class MySessionService : public SessionService return NULL; } - SessionMap::iterator FindSessionIterator(const Anope::string &ip) + SessionMap::iterator FindSessionIterator(const sockaddrs &ip) { - cidr c(ip, ip.find(':') != Anope::string::npos ? ipv6_cidr : ipv4_cidr); + cidr c(ip, ip.ipv6() ? ipv6_cidr : ipv4_cidr); if (!c.valid()) return this->Sessions.end(); return this->Sessions.find(c); @@ -668,7 +668,7 @@ class OSSession : public Module if (u->Quitting() || !session_limit || exempt || !u->server || u->server->IsULined()) return; - cidr u_ip(u->ip, u->ip.find(':') != Anope::string::npos ? ipv6_cidr : ipv4_cidr); + cidr u_ip(u->ip, u->ip.ipv6() ? ipv6_cidr : ipv4_cidr); if (!u_ip.valid()) return; @@ -705,7 +705,7 @@ class OSSession : public Module { if (!sle_reason.empty()) { - Anope::string message = sle_reason.replace_all_cs("%IP%", u->ip); + Anope::string message = sle_reason.replace_all_cs("%IP%", u->ip.addr()); u->SendMessage(OperServ, message); } if (!sle_detailsloc.empty()) @@ -729,7 +729,7 @@ class OSSession : public Module } else { - session = new Session(u->ip, u->ip.find(':') != Anope::string::npos ? ipv6_cidr : ipv4_cidr); + session = new Session(u->ip, u->ip.ipv6() ? ipv6_cidr : ipv4_cidr); } } |