X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnntp%2Fnntpconnection.h;h=d048375669b40cc2d3547aab0ae469c2062d5297;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=d2bf16792a0df418be7f7a46086d740b6354a067;hpb=6b896a9e1dc143bba86795be1e9336549db9b85f;p=fms.git

diff --git a/include/nntp/nntpconnection.h b/include/nntp/nntpconnection.h
index d2bf167..d048375 100644
--- a/include/nntp/nntpconnection.h
+++ b/include/nntp/nntpconnection.h
@@ -1,15 +1,28 @@
 #ifndef _nntpconnection_
 #define _nntpconnection_
 
+#include "../threadwrapper/cancelablerunnable.h"
 #include "../socketdefines.h"
 #include "../ilogger.h"
 #include "../message.h"
+#include "../localidentity.h"
+#include "../ithreaddatabase.h"
 
 #include <string>
 #include <vector>
-#include <zthread/Runnable.h>
 
-class NNTPConnection:public ZThread::Runnable,public ILogger//,public IDatabase
+#ifdef _WIN32
+
+#else
+	#include <sys/socket.h>
+	#include <sys/select.h>
+	#include <sys/types.h>
+	#include <netdb.h>
+	#include <netinet/in.h>
+	#include <arpa/inet.h>
+#endif
+
+class NNTPConnection:public CancelableRunnable,public ILogger,public IThreadDatabase
 {
 public:
 	NNTPConnection(SOCKET sock);
@@ -34,11 +47,15 @@ private:
 	};
 	struct ClientStatus
 	{
+		ClientStatus(SQLite3DB::DB *db):m_authuser(db)		{}
+
 		ClientMode m_mode;
 		bool m_allowpost;
 		bool m_isposting;
 		long m_boardid;
 		long m_messageid;
+		LocalIdentity m_authuser;		// -1 if user not authenticated, otherwise id of user from tblLocalIdentity
+		bool m_authenticated;
 	};
 
 	void SendBuffered(const std::string &data);
@@ -51,7 +68,7 @@ private:
 	void HandlePostedMessage(const std::string &message);
 
 	void SendArticleParts(const NNTPCommand &command);
-	void SendArticleOverInfo(const Message &message);
+	void SendArticleOverInfo(Message &message);
 
 	// various NNTP commands to handle
 	const bool HandleQuitCommand(const NNTPCommand &command);
@@ -71,6 +88,10 @@ private:
 	const bool HandleNewGroupsCommand(const NNTPCommand &command);
 	const bool HandlePostCommand(const NNTPCommand &command);
 	const bool HandleOverCommand(const NNTPCommand &command);
+	const bool HandleAuthInfoCommand(const NNTPCommand &command);
+	const bool HandleGetTrustCommand(const NNTPCommand &command);
+	const bool HandleSetTrustCommand(const NNTPCommand &command);
+	const bool HandleGetTrustListCommand(const NNTPCommand &command);
 
 	SOCKET m_socket;
 	ClientStatus m_status;