merge cmeerw NewsCache 1.3.ipv6-11

AUTHORS

@@ -9,6 +9,8 @@ Other Authors
 
 2001-2004 Herbert Straub <h.straub@aon.at>
 	See ChangeLog file for details.
+2008 Christof Meerwald <cmeerw@web.de>
+	IPv6 support, removed libsocket++ dependency
 
 
 Author of Program Parts

NEWS

@@ -1,3 +1,13 @@
+Release 1.3.ipv6:
+Christof Meerwald
+
+New functions:
+* IPv6 support
+
+* new ConnectTimeout, ConnectBackoff and LimitGroupSize options
+
+* client support for SSL connections
+
 Release 1.2:
 Herbert Straub - 2004-09-28
 New functions:

NServer-0.9.1/ActiveDB.cc

@@ -7,3 +7,11 @@ ActiveDB::ActiveDB()
 ActiveDB::~ActiveDB()
 {
 }
+
+/*
+ * Local Variables:
+ * mode: c++
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

NServer-0.9.1/ActiveDB.h

@@ -12,9 +12,10 @@
 #include "VirtualIterator.h"
 
 class ActiveDB {
-      protected:
+  protected:
 	ActiveDB();
-      public:
+
+  public:
 	virtual ~ ActiveDB();
 	// Used for set
 	enum {
@@ -57,3 +58,11 @@ class ActiveDB {
 };
 
 #endif
+
+/*
+ * Local Variables:
+ * mode: c++
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

NServer-0.9.1/ArtSpooler.cc

@@ -176,3 +176,11 @@ string ArtSpooler::extractID(Article & a)
 	ID.replace(ID.length() - 1, 1, "");
 	return ID;
 }
+
+/*
+ * Local Variables:
+ * mode: c++
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

NServer-0.9.1/ArtSpooler.h

@@ -37,15 +37,15 @@
  *   \li .resourceSpooler.lock (LockFile).
  */
 class ArtSpooler {
-      public:
+  public:
 	/**
 	 * If the spool directory doesn't exists, the contstructor creates
 	 * it. It uses ObjLock to manage the access to the Spool.
 	 * \param spoolDir Spool Directory
 	 * \throw Error
 	 * \todo Das ist ein Testpunkt
 	 */
-	ArtSpooler(const string & spoolDir);
+	ArtSpooler(const std::string & spoolDir);
 
 	~ArtSpooler();
 
@@ -81,26 +81,34 @@ class ArtSpooler {
 	 * Create a unique ID
 	 * \return The ID String
 	 */
-	 string createID(void);
+	std::string createID(void);
 
 	/**
 	 * Extract ID from article message id
 	 * \return The ID String
 	 */
-	string extractID(Article & a);
+	std::string extractID(Article & a);
 
 	/**
 	 * store Article in path
 	 * return 0 success, 1 duplicated
 	 */
-	int storeArticle(const string & path, Article & a);
+	int storeArticle(const std::string & path, Article & a);
 
-      private:
-	 string spoolDir;
-	string artSpool;
-	string badArticles;
+  private:
+	std::string spoolDir;
+	std::string artSpool;
+	std::string badArticles;
 	ObjLock *pLock;
 };
 
 
 #endif
+
+/*
+ * Local Variables:
+ * mode: c++
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

NServer-0.9.1/Article.cc

@@ -26,22 +26,18 @@
 using namespace std;
 
 InvalidArticleError::InvalidArticleError(const char *txt, const char *file,
-			    const char *function, int line):NSError(txt,
-								    file,
-								    function,
-								    line)
+										 const char *function, int line)
+	: NSError(txt, file, function, line)
 {
 }
 
 InvalidArticleError::InvalidArticleError(const string & txt, const char *file,
-			      const char *function, int line):NSError(txt,
-								      file,
-								      function,
-								      line)
+										 const char *function, int line)
+	: NSError(txt, file, function, line)
 {
 }
 
-void InvalidArticleError::print(void) 
+void InvalidArticleError::print(void) const
 {
 	slog << "Exception!\n"
 	    << "  Type: InvalidArticle\n"
@@ -53,21 +49,15 @@ Article::Article()
 }
 
 Article::Article(Article * a)
-	//: _nbr(a->getnbr()), _text(a->GetText()), _ctext(_text.c_str())
-{
-	_nbr = a->getnbr();
-	_text = a->GetText();
-	_ctext = _text.c_str();
-
-}
+	: _nbr(a->getnbr()), _text(a->GetText()), _ctext(_text.c_str())
+{ }
 
 Article::Article(int artnbr)
 {
 	setnbr(artnbr);
 }
 
 Article::Article(int artnbr, const char *text, int textlen)
-	//: setnbr(artnbr), _text.assign(text, textlen), _ctext = _text.c_str()
 {
 	setnbr(artnbr);
 	_text.assign(text, textlen);
@@ -373,3 +363,11 @@ ostream & operator <<(ostream & os, Article & art)
 	os << art._text;
 	return os;
 }
+
+/*
+ * Local Variables:
+ * mode: c++
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

NServer-0.9.1/Article.h

@@ -16,14 +16,14 @@
  * Syntactic error in Article dectected
  */
 class InvalidArticleError:public NSError {
-      public:
+  public:
 	InvalidArticleError(const char *txt, const char *file,
-			    const char *function, int line);
+						const char *function, int line);
 
 	InvalidArticleError(const std::string & txt, const char *file,
-			      const char *function, int line);
+						const char *function, int line);
 
-	virtual void print(void);
+	virtual void print(void) const;
 };
 
 /**
@@ -34,7 +34,7 @@ class InvalidArticleError:public NSError {
  * \bug Method documentation is missing.
  */
 class Article {
-      private:
+  private:
 
 	/**
 	 * Return the position of a given field in the article's header.
@@ -43,12 +43,12 @@ class Article {
 	 */
 	const char *find_field(const char *ifld) const;
 
-      protected:
+  protected:
 	int _nbr;
 	std::string _text;
 	const char *_ctext;
 
-      public:
+  public:
 	enum {
 		Head = 0x1,
 		Body = 0x2
@@ -96,3 +96,11 @@ class Article {
 };
 
 #endif
+
+/*
+ * Local Variables:
+ * mode: c++
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

NServer-0.9.1/CNewsgroup.cc

@@ -23,7 +23,7 @@ void CNewsgroup::listgroup(char *lstgrp, unsigned int f, unsigned int l)
 }
 
 void CNewsgroup::sUpdateGroupInfo(unsigned int *infofp,
-				  unsigned int *infolp)
+								  unsigned int *infolp)
 {
 	GroupInfo *info;
 	unsigned int f, l, infof, infol;
@@ -79,40 +79,54 @@ void CNewsgroup::sUpdateOverview(void)
 	try {
 		listgroup(lstgrp, infof, infol);
 
-		f = infof;
-		while (f <= infol) {
-			if ((NVArray::shas_element(f) && lstgrp[f - infof])
-			    || (!NVArray::shas_element(f)
-				&& !lstgrp[f - infof])) {
-				f++;
-				continue;
-			}
-			if (lstgrp[f - infof]) {
-				// We do not have this article
-				l = f;
-				for (i = l + 1; i < l + 8 && i <= infol;
-				     i++) {
-					if (!NVArray::shas_element(i)
-					    && lstgrp[i - infof])
-						l = i;
+		if (_RServer->getnntpflags() & MPListEntry::F_LISTGROUP) {
+			f = infof;
+			while (f <= infol) {
+				if ((NVArray::shas_element(f) && lstgrp[f - infof])
+				    || (!NVArray::shas_element(f)
+					&& !lstgrp[f - infof])) {
+					f++;
+					continue;
 				}
-				_RServer->overviewdb(this, f, l);
-				f = i;
-			} else {
-				i = f - infof;
-				// We do have this article, but it has been deleted
-				if (*(mem_p + arrtab[i] + sizeof(long)) ==
-				    bigarticle) {
-					// Remove article from disk
-					sprintf(fn, "%s/.art%ud",
-						_SpoolDirectory, i);
-					unlink(fn);
+				if (lstgrp[f - infof]) {
+					// We do not have this article
+					l = f;
+					for (i = l + 1; i < l + 8 && i <= infol;
+					     i++) {
+						if (!NVArray::shas_element(i)
+						    && lstgrp[i - infof])
+							l = i;
+					}
+					_RServer->overviewdb(this, f, l);
+					f = i;
+				} else {
+					i = f - infof;
+					// We do have this article, but it has been deleted
+					if (*(mem_p + arrtab[i] + sizeof(long)) ==
+					    bigarticle) {
+						// Remove article from disk
+						sprintf(fn, "%s/.art%ud",
+							_SpoolDirectory, i);
+						unlink(fn);
+					}
+					nvfree(arrtab[i]);
+					arrtab[i] = 0;
+					f++;
 				}
-				nvfree(arrtab[i]);
-				arrtab[i] = 0;
-				f++;
 			}
+		} else {
+			f = infol;
+			while ((f >= infof) && !NVArray::shas_element(f)) {
+				f--;
+			}
+
+			/* do we have at least one new article? */
+			if (f < infol)
+			{
+				_RServer->overviewdb(this, f + 1, infol);
+                        }
 		}
+
 		time(&now);
 		setmtime(now);
 	} catch(Error & e) {
@@ -248,3 +262,11 @@ void CNewsgroup::prefetchGroup(int lockgrp)
 	free(lstgrp);
 	NVArray::lock(NVcontainer::UnLock);
 }
+
+/*
+ * Local Variables:
+ * mode: c++
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

NServer-0.9.1/CNewsgroup.h

@@ -11,7 +11,7 @@
  * \bug method documentation are mising.
  */
 class CNewsgroup:public NVNewsgroup {
-      protected:
+  protected:
 	nvtime_t _TTLGroup;
 	RServer *_RServer;
 
@@ -28,10 +28,11 @@ class CNewsgroup:public NVNewsgroup {
 		 NVArray::lock(NVcontainer::ExclLock);
 		 sUpdateOverview();
 		 NVArray::lock(NVcontainer::UnLock);
-	} void listgroup(char *lstgrp, unsigned int f, unsigned int l);
+	}
+	void listgroup(char *lstgrp, unsigned int f, unsigned int l);
 	virtual Article *retrievearticle(unsigned int nbr);
 
-      public:
+  public:
 	CNewsgroup(RServer * nsrvr, OverviewFmt * fmt,
 		   const char *spooldir, const char *name):NVNewsgroup(fmt,
 								       spooldir,
@@ -95,3 +96,11 @@ class CNewsgroup:public NVNewsgroup {
 };
 
 #endif
+
+/*
+ * Local Variables:
+ * mode: c++
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */