Remove debug output that was only useful to me

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6530 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 0 insertions, 34 deletions

diff --git a/src/dns.cpp b/src/dns.cpp
index a3e1a8b17..2eaff68b9 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -541,7 +541,6 @@ int DNS::GetName(const insp_inaddr *ip)
 /** Start lookup of an IP address to a hostname */
 int DNS::GetNameForce(const char *ip, ForceProtocol fp)
 {
-	ServerInstance->Log(DEBUG,"GetNameForce: %s", ip);
 	char query[128];
 	DNSHeader h;
 	int id;
@@ -552,7 +551,6 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp)
 		in6_addr i;
 		if (inet_pton(AF_INET6, ip, &i) > 0)
 		{
-			ServerInstance->Log(DEBUG,"Resolve to ipv6");
 			DNS::MakeIP6Int(query, &i);
 		}
 		else
@@ -565,7 +563,6 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp)
 		in_addr i;
 		if (inet_aton(ip, &i))
 		{
-			ServerInstance->Log(DEBUG,"Resolve to ipv4");
 			unsigned char* c = (unsigned char*)&i.s_addr;
 			sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[3],c[2],c[1],c[0]);
 		}
@@ -625,8 +622,6 @@ DNSResult DNS::GetResult()
 
 	int length = recvfrom(this->GetFd(),buffer,sizeof(DNSHeader),0,from,&x);
 
-	ServerInstance->Log(DEBUG,"Recv %d.", length);
-
 	/* Did we get the whole header? */
 	if (length < 12)
 	{
@@ -670,7 +665,6 @@ DNSResult DNS::GetResult()
 	{
 		if ((port_from != DNS::QUERY_PORT) || (strcasecmp(ipaddr_from, ServerInstance->Config->DNSServer)))
 		{
-			ServerInstance->Log(DEBUG,"Doesnt match security: port_from=%d ipaddr_from=%s",port_from,ipaddr_from);
 			return DNSResult(-1,"",0,"");
 		}
 	}
@@ -1060,7 +1054,6 @@ Module* Resolver::GetCreator()
 /** Process a socket read event */
 void DNS::HandleEvent(EventType et, int errornum)
 {
-	ServerInstance->Log(DEBUG,"Marshall dns reads");
 	/* Fetch the id and result of the next available packet */
 	DNSResult res = this->GetResult();
 	/* Is there a usable request id? */
diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 492cafdd9..4ee51db17 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -595,7 +595,6 @@ bool InspSocket::Poll()
 		break;
 		case I_LISTENING:
 		{
-			Instance->Log(DEBUG,"InspSocket listen event");
 			sockaddr* client = new sockaddr[2];
 			length = sizeof (sockaddr_in);
 			std::string recvip;
@@ -604,9 +603,6 @@ bool InspSocket::Poll()
 				length = sizeof(sockaddr_in6);
 #endif
 			incoming = accept (this->fd, client, &length);
-
-			Instance->Log(DEBUG,"Accepted socket, sockaddr length %d fd %d", length, incoming);
-
 #ifdef IPV6
 			if ((!*this->host) || strchr(this->host, ':'))
 			{
@@ -620,7 +616,6 @@ bool InspSocket::Poll()
 #else
 			recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr);
 #endif
-			Instance->Log(DEBUG,"Call OnIncomingConnection, recvip=%s", recvip.c_str());
 			this->OnIncomingConnection(incoming, (char*)recvip.c_str());
 
 			if (this->IsIOHooked)
diff --git a/src/socket.cpp b/src/socket.cpp
index 69bea3e0a..67931e49b 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -39,7 +39,6 @@ const char inverted_bits[8] = {	0x00, /* 00000000 - 0 bits - never actually used
 ListenSocket::ListenSocket(InspIRCd* Instance, int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) : ServerInstance(Instance), desc("plaintext")
 {
 	this->SetFd(sockfd);
-	Instance->Log(DEBUG,"CRAP");
 	if (!Instance->BindSocket(this->fd,port,addr))
 		this->fd = -1;
 #ifdef IPV6
@@ -326,16 +325,13 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
 #ifdef IPV6
 	if (*addr)
 	{
-		printf("Address %s not empty\n", addr);
 		/* There is an address here. Is it ipv6? */
 		if (strchr(addr,':'))
 		{
-			printf("Address %s is ipv6\n", addr);
 			/* Yes it is */
 			in6_addr addy;
 			if (inet_pton(AF_INET6, addr, &addy) < 1)
 			{
-				printf("Failed to interpret address %s", addr);
 				delete[] server;
 				return false;
 			}
@@ -348,7 +344,6 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
 		else
 		{
 			/* No, its not */
-			printf("Address %s is ipv4\n", addr);
 			in_addr addy;
 			if (inet_pton(AF_INET, addr, &addy) < 1)
 			{
@@ -364,13 +359,11 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
 	}
 	else
 	{
-		printf("Address empty port=%d\n", port);
 		if (port == -1)
 		{
 			/* Port -1: Means UDP IPV4 port binding - Special case
 			 * used by DNS engine.
 			 */
-			printf("Special case AF_INET udp bind to all\n");
 			((sockaddr_in*)server)->sin_family = AF_INET;
 			((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY);
 			((sockaddr_in*)server)->sin_port = 0;
@@ -413,7 +406,6 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
 
 	if (ret < 0)
 	{
-		Log(DEBUG,"Bind fails it! %s", strerror(errno));
 		return false;
 	}
 	else
@@ -445,23 +437,15 @@ int irc::sockets::OpenTCPSocket(char* addr, int socktype)
 	int on = 1;
 	struct linger linger = { 0 };
 #ifdef IPV6
-	printf("IPV6 ENABLED OPENTCPSOCKET\n");
 	if (strchr(addr,':') || (!*addr))
-	{
-		printf("IPV6 OPENTCPSOCKET DO\n");
 		sockfd = socket (PF_INET6, socktype, 0);
-	}
 	else
-	{
-		printf("IPV6->IPV4 OPENTCPSOCKET DO\n");
 		sockfd = socket (PF_INET, socktype, 0);
-	}
 	if (sockfd < 0)
 #else
 	if ((sockfd = socket (PF_INET, socktype, 0)) < 0)
 #endif
 	{
-		printf("SOCKET FAIL: %s\n", strerror(errno));
 		return ERROR;
 	}
 	else
@@ -491,7 +475,6 @@ bool InspIRCd::HasPort(int port, char* addr)
 /* XXX: Probably belongs in class InspIRCd */
 int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_ports)
 {
-	Log(DEBUG,"BINDING PORTS");
 	char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
 	insp_sockaddr client, server;
 	int clientportcount = 0;
@@ -503,7 +486,6 @@ int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_port
 
 	for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
 	{
-		Log(DEBUG,"FOUND PORT");
 		Config->ConfValue(Config->config_data, "bind", "port", count, configToken, MAXBUF);
 		Config->ConfValue(Config->config_data, "bind", "address", count, Addr, MAXBUF);
 		Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF);
@@ -539,11 +521,9 @@ int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_port
 					if (fd == ERROR)
 					{
 						failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
-						Log(DEBUG,"SOCKET FAIL");
 					}
 					else
 					{
-						Log(DEBUG,"BIND");
 						Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]);
 						if (Config->openSockfd[BoundPortCount]->GetFd() > -1)
 						{
@@ -573,12 +553,10 @@ int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_port
 		int fd = OpenTCPSocket(Config->addrs[count]);
 		if (fd == ERROR)
 		{
-			Log(DEBUG,"SOCKET FAIL");
 			failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
 		}
 		else
 		{
-			Log(DEBUG,"BIND");
 			Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]);
 			if (Config->openSockfd[BoundPortCount]->GetFd() > -1)
 			{