[ZNC-commits] SF.net SVN: znc:[1955] trunk

[<ps...@us...>]

Revision: 1955
          http://znc.svn.sourceforge.net/znc/?rev=1955&view=rev
Author:   psychon
Date:     2010-04-30 10:50:33 +0000 (Fri, 30 Apr 2010)

Log Message:
-----------
Don't use "ip:port" but "ip port" for display purposes

With ipv6 addresses, ip:port just looks wrong.

Found by KiNgMaR, thanks.

Modified Paths:
--------------
    trunk/DCCBounce.cpp
    trunk/modules/extra/log.cpp
    trunk/znc.cpp

Modified: trunk/DCCBounce.cpp
===================================================================
--- trunk/DCCBounce.cpp	2010-04-29 20:00:03 UTC (rev 1954)
+++ trunk/DCCBounce.cpp	2010-04-30 10:50:33 UTC (rev 1955)
@@ -111,7 +111,7 @@
 	if (IsRemote()) {
 		CString sHost = Csock::GetHostName();
 		if (!sHost.empty()) {
-			sHost = " to [" + sHost + ":" + CString(Csock::GetPort()) + "]";
+			sHost = " to [" + sHost + " " + CString(Csock::GetPort()) + "]";
 		} else {
 			sHost = ".";
 		}
@@ -128,7 +128,7 @@
 	CString sType = (m_bIsChat) ? "Chat" : "Xfer";
 	CString sHost = Csock::GetHostName();
 	if (!sHost.empty()) {
-		sHost = " to [" + sHost + ":" + CString(Csock::GetPort()) + "]";
+		sHost = " to [" + sHost + " " + CString(Csock::GetPort()) + "]";
 	} else {
 		sHost = ".";
 	}
@@ -143,7 +143,7 @@
 	if (IsRemote()) {
 		CString sHost = Csock::GetHostName();
 		if (!sHost.empty()) {
-			sHost = "[" + sHost + ":" + CString(Csock::GetPort()) + "]";
+			sHost = "[" + sHost + " " + CString(Csock::GetPort()) + "]";
 		}
 
 		m_pUser->PutStatus("DCC " + sType + " Bounce (" + m_sRemoteNick + "): Socket error [" + CString(strerror(iErrno)) + "]" + sHost);

Modified: trunk/modules/extra/log.cpp
===================================================================
--- trunk/modules/extra/log.cpp	2010-04-29 20:00:03 UTC (rev 1954)
+++ trunk/modules/extra/log.cpp	2010-04-30 10:50:33 UTC (rev 1955)
@@ -97,7 +97,7 @@
 
 	if (pServer->IsSSL())
 		sSSL = "+";
-	return pServer->GetName() + ":" + sSSL + CString(pServer->GetPort());
+	return pServer->GetName() + " " + sSSL + CString(pServer->GetPort());
 }
 
 void CLogMod::OnIRCConnected()

Modified: trunk/znc.cpp
===================================================================
--- trunk/znc.cpp	2010-04-29 20:00:03 UTC (rev 1954)
+++ trunk/znc.cpp	2010-04-30 10:50:33 UTC (rev 1955)
@@ -151,8 +151,8 @@
 
 	m_sConnectThrottle.AddItem(pServer->GetName());
 
-	DEBUG("User [" << pUser->GetUserName() << "] is connecting to [" << pServer->GetName() << ":" << pServer->GetPort() << "] ...");
-	pUser->PutStatus("Attempting to connect to [" + pServer->GetName() + ":" + CString(pServer->GetPort()) + "] ...");
+	DEBUG("User [" << pUser->GetUserName() << "] is connecting to [" << pServer->GetName() << " " << pServer->GetPort() << "] ...");
+	pUser->PutStatus("Attempting to connect to [" + pServer->GetName() + " " + CString(pServer->GetPort()) + "] ...");
 
 	pIRCSock = new CIRCSock(pUser);
 	pIRCSock->SetPass(pServer->GetPass());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.