From aec55667296bcb38139495f328aff9d0d292a0d3 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sat, 22 Nov 2014 15:33:31 +0100
Subject: [PATCH] Fucked up the sequence of arguments for the floodprotected
 aide message

---
 citadel/event_client.h                            |  2 ++
 .../modules/networkclient/serv_networkclient.c    |  4 ++--
 citadel/modules/pop3client/serv_pop3client.c      |  9 +++++----
 citadel/modules/rssclient/serv_rssclient.c        | 15 ++++++++-------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/citadel/event_client.h b/citadel/event_client.h
index b21e2cc14..0c9d5b7a9 100644
--- a/citadel/event_client.h
+++ b/citadel/event_client.h
@@ -153,6 +153,7 @@ typedef struct __evcares_data {
 	IO_CallBack Fail;      /* the dns lookup didn't work out. */
 } evcares_data;
 
+
 struct AsyncIO {
 	long ID;
 	ev_tstamp Now;
@@ -220,6 +221,7 @@ typedef struct _IOAddHandler {
 } IOAddHandler;
 
 
+inline static time_t EvGetNow(AsyncIO *IO) { return (time_t) IO->Now;}
 
 extern int DebugEventLoop;
 extern int DebugCAres;
diff --git a/citadel/modules/networkclient/serv_networkclient.c b/citadel/modules/networkclient/serv_networkclient.c
index 41ce83c04..34ea669e5 100644
--- a/citadel/modules/networkclient/serv_networkclient.c
+++ b/citadel/modules/networkclient/serv_networkclient.c
@@ -211,8 +211,8 @@ eNextState NWC_SendFailureMessage(AsyncIO *IO)
 		ChrPtr(NW->IO.ErrMsg),
 		"Networker error",
 		2, strs, (long*) &lens,
-		IO->Now,
-		IO->ID, CCID);
+		CCID, IO->ID,
+		EvGetNow(IO));
 	
 	return eAbort;
 }
diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index 47e93d11f..950436dd8 100644
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <sysconfig.h>
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -432,8 +433,8 @@ eNextState POP3_FetchNetworkUsetableEntry(AsyncIO *IO)
 
 		if (CheckIfAlreadySeen("POP3 Item Seen",
 				       RecvMsg->CurrMsg->MsgUID,
-				       IO->Now,
-				       IO->Now, //// todo
+				       EvGetNow(IO),
+				       EvGetNow(IO) - USETABLE_ANTIEXPIRE,
 				       eCheckUpdate,
 				       IO->ID, CCID)
 		    != 0)
@@ -590,8 +591,8 @@ eNextState POP3C_StoreMsgRead(AsyncIO *IO)
 		       ChrPtr(RecvMsg->CurrMsg->MsgUID));
 	CheckIfAlreadySeen("POP3 Item Seen",
 			   RecvMsg->CurrMsg->MsgUID,
-			   IO->Now,
-			   IO->Now, //// todo
+			   EvGetNow(IO),
+			   EvGetNow(IO) - USETABLE_ANTIEXPIRE,
 			   eWrite,
 			   IO->ID, CCID);
 
diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index f76b3c01c..b9f2361ab 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -402,7 +402,7 @@ eNextState RSSSaveMessage(AsyncIO *IO)
 		
 		/* write the uidl to the use table so we don't store this item again */
 		
-		CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, IO->Now, 0, eWrite, CCID, IO->ID);
+		CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, EvGetNow(IO), 0, eWrite, CCID, IO->ID);
 	}
 
 	if (GetNextHashPos(RSSAggr->Messages,
@@ -428,7 +428,7 @@ eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
 	SetRSSState(IO, eRSSUT);
 	seenstamp = CheckIfAlreadySeen("RSS Item Seen",
 				       Ctx->ThisMsg->MsgGUID,
-				       IO->Now,
+				       EvGetNow(IO),
 				       antiExpire,
 				       eCheckUpdate,
 				       CCID, IO->ID);
@@ -542,8 +542,9 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 			ChrPtr(ErrMsg),
 			"RSS Aggregation run failure",
 			2, strs, (long*) &lens,
-			IO->Now,
-			IO->ID, CCID);
+			CCID,
+			IO->ID,
+			EvGetNow(IO));
 		
 		FreeStrBuf(&ErrMsg);
 		EVRSSC_syslog(LOG_DEBUG,
@@ -557,7 +558,7 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 
 	while (pCfg != NULL)
 	{
-		UpdateLastKnownGood (pCfg, IO->Now);
+		UpdateLastKnownGood (pCfg, EvGetNow(IO));
 		if ((Ctx->roomlist_parts > 1) && 
 		    (it == NULL))
 		{
@@ -599,8 +600,8 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 
 	if (CheckIfAlreadySeen("RSS Whole",
 			       guid,
-			       IO->Now,
-			       IO->Now - USETABLE_ANTIEXPIRE,
+			       EvGetNow(IO),
+			       EvGetNow(IO) - USETABLE_ANTIEXPIRE,
 			       eCheckUpdate,
 			       CCID, IO->ID)
 	    != 0)
-- 
2.30.2