From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 8 Jul 2012 15:02:58 +0000 (+0200)
Subject: NETWORKER: don't report an error if the rome site tells us we're already on their... 
X-Git-Tag: v8.13~21
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=9ef8e21ec272a4b7386ef19b2df18e3c2f7aefee

NETWORKER: don't report an error if the rome site tells us we're already on their NTT list.
---

diff --git a/citadel/modules/network/serv_networkclient.c b/citadel/modules/network/serv_networkclient.c
index d5cf394ea..80713bfd9 100644
--- a/citadel/modules/network/serv_networkclient.c
+++ b/citadel/modules/network/serv_networkclient.c
@@ -227,14 +227,22 @@ eNextState NWC_ReadAuthReply(AsyncNetworker *NW)
 	}
 	else
 	{
+		int Error = atol(ChrPtr(NW->IO.IOBuf));
 		if (NW->IO.ErrMsg == NULL)
 			NW->IO.ErrMsg = NewStrBuf();
 		StrBufPrintf(NW->IO.ErrMsg,
-			     "Connected to node \"%s\" but my secret wasn't accurate.",
-			     ChrPtr(NW->node));
-		EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
-		CtdlAideMessage(ChrPtr(NW->IO.ErrMsg), "Network error");
-		
+			     "Connected to node \"%s\" but my secret wasn't accurate.\nReason was:%s\n",
+			     ChrPtr(NW->node), ChrPtr(NW->IO.IOBuf) + 4);
+		if (Error == 552) {
+			EVN_syslog(LOG_INFO,
+				   "Already talking to %s; skipping this time.\n",
+				   ChrPtr(NW->node));
+			
+		}
+		else {
+			EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
+			CtdlAideMessage(ChrPtr(NW->IO.ErrMsg), "Network error");
+		}
 		return eAbort;
 	}
 }