From a7fc2fe0dc845ffba1f4575e694aa1bb7f60756b Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Fri, 15 Feb 2019 10:58:43 +0000
Subject: Replace GetServerPort() with server_sa.port().

---
 src/modules/m_close.cpp       | 2 +-
 src/modules/m_hostchange.cpp  | 2 +-
 src/modules/m_httpd_stats.cpp | 2 +-
 src/modules/m_jumpserver.cpp  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index b0b45b4b6..c2a94a6ff 100644
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -44,7 +44,7 @@ class CommandClose : public Command
 			if (user->registered != REG_ALL)
 			{
 				ServerInstance->Users->QuitUser(user, "Closing all unknown connections per request");
-				std::string key = ConvToStr(user->GetIPString())+"."+ConvToStr(user->GetServerPort());
+				std::string key = ConvToStr(user->GetIPString())+"."+ConvToStr(user->server_sa.port());
 				closed[key]++;
 			}
 		}
diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index be503ba6b..895e0f04a 100644
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -76,7 +76,7 @@ class HostRule
 
 	bool Matches(LocalUser* user) const
 	{
-		if (!ports.empty() && !ports.count(user->GetServerPort()))
+		if (!ports.empty() && !ports.count(user->server_sa.port()))
 			return false;
 
 		if (InspIRCd::MatchCIDR(user->MakeHost(), mask))
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 2b28c2628..3be8ec970 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -220,7 +220,7 @@ namespace Stats
 
 		LocalUser* lu = IS_LOCAL(u);
 		if (lu)
-			data << "<local/><port>" << lu->GetServerPort() << "</port><servaddr>"
+			data << "<local/><port>" << lu->server_sa.port() << "</port><servaddr>"
 				<< lu->server_sa.str() << "</servaddr><connectclass>"
 				<< lu->GetClass()->GetName() << "</connectclass><lastmsg>"
 				<< lu->idle_lastmsg << "</lastmsg>";
diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 02950e0e9..80b0a84ab 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -151,7 +151,7 @@ class CommandJumpserver : public Command
 	{
 		int p = (sslapi && sslapi->GetCertificate(user) ? sslport : port);
 		if (p == 0)
-			p = user->GetServerPort();
+			p = user->server_sa.port();
 		return p;
 	}
 };
-- 
cgit v1.3.1-10-gc9f91