Clean up and reorganize our header files

5 files changed, 16 insertions, 15 deletions

diff --git a/modules/extra/m_dnsbl.cpp b/modules/extra/m_dnsbl.cpp
index 285871cc6..0d863ad8d 100644
--- a/modules/extra/m_dnsbl.cpp
+++ b/modules/extra/m_dnsbl.cpp
@@ -43,7 +43,7 @@ class DNSBLResolver : public DNSRequest
 		{
 			sockaddrs sresult;
 			sresult.pton(AF_INET, ans_record.rdata);
-			int result = (sresult.sa4.sin_addr.s_addr & 0xFF000000) >> 24;
+			int result = sresult.sa4.sin_addr.s_addr >> 24;
 
 			if (!this->blacklist.replies.count(result))
 				return;
@@ -57,13 +57,13 @@ class DNSBLResolver : public DNSRequest
 		reason = reason.replace_all_cs("%u", user->GetIdent());
 		reason = reason.replace_all_cs("%g", user->realname);
 		reason = reason.replace_all_cs("%h", user->host);
-		reason = reason.replace_all_cs("%i", user->ip.addr());
+		reason = reason.replace_all_cs("%i", user->ip);
 		reason = reason.replace_all_cs("%r", record_reason);
 		reason = reason.replace_all_cs("%N", Config->NetworkName);
 
 		BotInfo *operserv = findbot(Config->OperServ);
-		Log(operserv) << "DNSBL: " << user->GetMask() << " (" << user->ip.addr() << ") appears in " << this->blacklist.name;
-		XLine *x = new XLine("*@" + user->ip.addr(), Config->OperServ, Anope::CurTime + this->blacklist.bantime, reason, XLineManager::GenerateUID());
+		Log(operserv) << "DNSBL: " << user->GetMask() << " (" << user->ip << ") appears in " << this->blacklist.name;
+		XLine *x = new XLine("*@" + user->ip, Config->OperServ, Anope::CurTime + this->blacklist.bantime, reason, XLineManager::GenerateUID());
 		if (this->add_to_akill && akills)
 		{
 			akills->AddXLine(x);
@@ -133,15 +133,15 @@ class ModuleDNSBL : public Module
 
 		if (!this->check_on_netburst && !user->server->IsSynced())
 			return;
+
 		/* At this time we only support IPv4 */
-		if (user->ip.sa.sa_family != AF_INET)
+		sockaddrs user_ip(user->ip);
+		if (user_ip.sa.sa_family != AF_INET)
 			return;
 
-		unsigned long ip = user->ip.sa4.sin_addr.s_addr;
-		unsigned long reverse_ip = ((ip & 0xFF) << 24) | ((ip & 0xFF00) << 8) | ((ip & 0xFF0000) >> 8) | ((ip & 0xFF000000) >> 24);
+		const unsigned long &ip = user_ip.sa4.sin_addr.s_addr;
+		unsigned long reverse_ip = (ip << 24) | ((ip & 0xFF00) << 8) | ((ip & 0xFF0000) >> 8) | (ip >> 24);
 
-		sockaddrs user_ip;
-		user_ip.sa4.sin_family = AF_INET;
 		user_ip.sa4.sin_addr.s_addr = reverse_ip;
 
 		for (unsigned i = 0; i < this->blacklists.size(); ++i)
diff --git a/modules/extra/m_proxyscan.cpp b/modules/extra/m_proxyscan.cpp
index 6b3153e32..37fd7c432 100644
--- a/modules/extra/m_proxyscan.cpp
+++ b/modules/extra/m_proxyscan.cpp
@@ -343,11 +343,12 @@ class ModuleProxyScan : public Module
 
 	void OnUserConnect(dynamic_reference<User> &user, bool &exempt)
 	{
-		if (exempt || !user || !user->ip() || !Me->IsSynced() || !user->server->IsSynced())
+		if (exempt || !user || !Me->IsSynced() || !user->server->IsSynced())
 			return;
 
+		sockaddrs user_ip(user->ip);
 		/* At this time we only support IPv4 */
-		if (user->ip.sa.sa_family != AF_INET)
+		if (user_ip.sa.sa_family != AF_INET)
 			return;
 
 		if (!this->con_notice.empty() && !this->con_source.empty())
@@ -374,7 +375,7 @@ class ModuleProxyScan : public Module
 							con = new SOCKS5ProxyConnect(p, p.ports[k]);
 						else
 							continue;
-						con->Connect(user->ip.addr(), p.ports[k]);
+						con->Connect(user->ip, p.ports[k]);
 					}
 					catch (const SocketException &ex)
 					{
diff --git a/modules/extra/m_ssl.cpp b/modules/extra/m_ssl.cpp
index 2d89c078d..829d3e532 100644
--- a/modules/extra/m_ssl.cpp
+++ b/modules/extra/m_ssl.cpp
@@ -102,7 +102,6 @@ class SSLModule : public Module
 
 		SSL_library_init();
 		SSL_load_error_strings();
-		SSLeay_add_ssl_algorithms();
 
 		client_ctx = SSL_CTX_new(SSLv23_client_method());
 		server_ctx = SSL_CTX_new(SSLv23_server_method());
diff --git a/modules/extra/m_xmlrpc.cpp b/modules/extra/m_xmlrpc.cpp
index 215be9d77..40a032092 100644
--- a/modules/extra/m_xmlrpc.cpp
+++ b/modules/extra/m_xmlrpc.cpp
@@ -1,3 +1,4 @@
+
 #include "module.h"
 #include "ssl.h"
 #include "xmlrpc.h"
diff --git a/modules/extra/m_xmlrpc_main.cpp b/modules/extra/m_xmlrpc_main.cpp
index 7498a3059..8762872ad 100644
--- a/modules/extra/m_xmlrpc_main.cpp
+++ b/modules/extra/m_xmlrpc_main.cpp
@@ -215,8 +215,8 @@ class MyXMLRPCEvent : public XMLRPCEvent
 				request->reply("vhost", iface->Sanitize(u->vhost));
 			if (!u->chost.empty())
 				request->reply("chost", iface->Sanitize(u->chost));
-			if (u->ip())
-				request->reply("ip", u->ip.addr());
+			if (!u->ip.empty())
+				request->reply("ip", u->ip);
 			request->reply("timestamp", stringify(u->timestamp));
 			request->reply("signon", stringify(u->my_signon));
 			if (u->Account())