diff options
| author |  Sadie Powell | 2023-01-17 02:46:53 +0000 |
|---|---|---|
| committer | Sadie Powell | 2023-01-17 02:46:53 +0000 |
| commit | dad3eaa2da71e3433afbd4e4a28f74e5de5663d4 (patch) | |
| tree | 4f44f6404fdaec3da77490664ae7ebd45e78300d /src/modules | |
| parent | Allow creating a FailedPort without a bindspec. (diff) | |
Add a helper method for determining if a sockaddrs is an IP endpoint.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/extra/m_geo_maxmind.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_cloak_md5.cpp | 5 | ||||
| -rw-r--r-- | src/modules/m_dnsbl.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_ident.cpp | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp index 3cc6ac5f4..b4df78225 100644 --- a/src/modules/extra/m_geo_maxmind.cpp +++ b/src/modules/extra/m_geo_maxmind.cpp @@ -110,7 +110,7 @@ public: Geolocation::Location* GetLocation(irc::sockets::sockaddrs& sa) override { // Skip trying to look up a UNIX socket. - if (sa.family() != AF_INET && sa.family() != AF_INET6) + if (!sa.is_ip()) return nullptr; // Attempt to look up the socket address. diff --git a/src/modules/m_cloak_md5.cpp b/src/modules/m_cloak_md5.cpp index cab08cad9..3ab2300c3 100644 --- a/src/modules/m_cloak_md5.cpp +++ b/src/modules/m_cloak_md5.cpp @@ -251,10 +251,7 @@ struct CloakInfo final std::string Generate(LocalUser* user) override ATTR_NOT_NULL(2) { - if (!Hash) - return {}; - - if (user->client_sa.family() != AF_INET && user->client_sa.family() != AF_INET6) + if (!Hash || !user->client_sa.is_ip()) return {}; return GenCloak(user->client_sa, user->GetIPString(), user->GetRealHost()); diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 71023da37..a5d601024 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -446,7 +446,7 @@ public: return; // Clients can't be in a DNSBL if they aren't connected via IPv4 or IPv6. - if (user->client_sa.family() != AF_INET && user->client_sa.family() != AF_INET6) + if (!user->client_sa.is_ip()) return; if (!user->GetClass()->config->getBool("usednsbl", true)) diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index a3b77010b..9c338c0e9 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -324,7 +324,7 @@ public: } // The ident protocol requires that clients are connecting over a protocol with ports. - if (user->client_sa.family() != AF_INET && user->client_sa.family() != AF_INET6) + if (!user->client_sa.is_ip()) return; // We don't want to look this up once the user has connected. |