X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnntp%2Fnntplistener.cpp;h=a34fc15bb15f6eba8448092455b132ddbe911655;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=860da2cc064fdbecb62e6273f08bba3714740ff2;hpb=023b2219068d481cd6a300982427c99bacd88a12;p=fms.git

diff --git a/src/nntp/nntplistener.cpp b/src/nntp/nntplistener.cpp
index 860da2c..a34fc15 100644
--- a/src/nntp/nntplistener.cpp
+++ b/src/nntp/nntplistener.cpp
@@ -40,6 +40,8 @@ void NNTPListener::run()
 
 	m_log->debug("NNTPListener::run thread started.");
 
+	LoadDatabase();
+
 	StartListen();
 
 	do
@@ -104,19 +106,22 @@ void NNTPListener::run()
 void NNTPListener::StartListen()
 {
 	
-	std::string bindaddresses;
 	std::vector<std::string> listenaddresses;
+	std::string bindaddresses;	
 	std::string nntpport;
-	if(Option::Instance()->Get("NNTPListenPort",nntpport)==false)
+	Option option(m_db);
+
+	if(option.Get("NNTPListenPort",nntpport)==false)
 	{
 		nntpport="1119";
-		Option::Instance()->Set("NNTPListenPort",nntpport);
+		option.Set("NNTPListenPort",nntpport);
 	}
-	if(Option::Instance()->Get("NNTPBindAddresses",bindaddresses)==false)
+	if(option.Get("NNTPBindAddresses",bindaddresses)==false)
 	{
 		bindaddresses="127.0.0.1";
-		Option::Instance()->Set("NNTPBindAddresses",bindaddresses);
+		option.Set("NNTPBindAddresses",bindaddresses);
 	}
+
 	StringFunctions::Split(bindaddresses,",",listenaddresses);
 	
 	for(std::vector<std::string>::iterator i=listenaddresses.begin(); i!=listenaddresses.end(); i++)
@@ -129,32 +134,47 @@ void NNTPListener::StartListen()
 		hint.ai_socktype=SOCK_STREAM;
 		hint.ai_protocol=IPPROTO_TCP;
 		hint.ai_flags=AI_PASSIVE;
+
+		m_log->trace("NNTPListener::StartListen getting address info for "+(*i));
 		
 		rval=getaddrinfo((*i).c_str(),nntpport.c_str(),&hint,&result);
 		if(rval==0)
 		{
 			for(current=result; current!=NULL; current=current->ai_next)
 			{
-				Poco::Net::SocketAddress sa(current->ai_addr,current->ai_addrlen);
-				m_log->debug("NNTPListener::StartListen trying to create socket, bind, and listen on "+sa.toString());
-
-				sock=socket(current->ai_family,current->ai_socktype,current->ai_protocol);
-				if(sock!=INVALID_SOCKET)
+				try
 				{
-					#ifndef _WIN32
-					const char optval='1';
-					setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&optval,sizeof(optval));
-					#endif
-					if(bind(sock,current->ai_addr,current->ai_addrlen)==0)
+					Poco::Net::SocketAddress sa(current->ai_addr,current->ai_addrlen);
+
+					m_log->debug("NNTPListener::StartListen trying to create socket, bind, and listen on "+sa.toString());
+
+					sock=socket(current->ai_family,current->ai_socktype,current->ai_protocol);
+					if(sock!=INVALID_SOCKET)
 					{
-						if(listen(sock,10)==0)
+						#ifndef _WIN32
+						const char optval='1';
+						setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&optval,sizeof(optval));
+						#endif
+						if(bind(sock,current->ai_addr,current->ai_addrlen)==0)
 						{
-							m_log->information("NNTPListener::StartListen started listening on "+sa.toString());
-							m_listensockets.push_back(sock);
+							if(listen(sock,10)==0)
+							{
+								m_log->information("NNTPListener::StartListen started listening on "+sa.toString());
+								m_listensockets.push_back(sock);
+							}
+							else
+							{
+								m_log->error("NNTPListener::StartListen socket listen failed on "+sa.toString());
+								#ifdef _WIN32
+								closesocket(sock);
+								#else
+								close(sock);
+								#endif
+							}
 						}
 						else
 						{
-							m_log->error("NNTPListener::StartListen socket listen failed");
+							m_log->error("NNTPListener::StartListen socket bind failed on "+sa.toString());
 							#ifdef _WIN32
 							closesocket(sock);
 							#else
@@ -164,17 +184,18 @@ void NNTPListener::StartListen()
 					}
 					else
 					{
-						m_log->error("NNTPListener::StartListen socket bind failed");
-						#ifdef _WIN32
-						closesocket(sock);
-						#else
-						close(sock);
-						#endif
+						m_log->error("NNTPListener::StartListen couldn't create socket on "+sa.toString());
 					}
 				}
-				else
+				catch(Poco::Exception &e)
+				{
+					m_log->error("NNTPListener::StartListen caught "+e.displayText());
+					continue;
+				}
+				catch(...)
 				{
-					m_log->error("NNTPListener::StartListen couldn't create socket");
+					m_log->error("NNTPListener::StartListen caught unknown exception");
+					continue;
 				}
 			}
 		}
@@ -185,6 +206,6 @@ void NNTPListener::StartListen()
 	}
 	if(m_listensockets.size()==0)
 	{
-		m_log->fatal("NNTPListener::StartListen couldn't start listening on any sockets");
+		m_log->fatal("NNTPListener::StartListen couldn't start listening on any interfaces");
 	}
 }