From f2aa76b3961236a1d66ca54805db70814696bebb Mon Sep 17 00:00:00 2001
From: koennecke <mark.koennecke@psi.ch>
Date: Thu, 10 Nov 2016 14:41:38 +0100
Subject: [PATCH] Fixed a wrong sequence of starts in multicounter Suppressed
 excessive connection messages from asynnet

---
 conman.c       |  5 +++--
 multicounter.c | 25 ++++++++++++++++++++++---
 nread.c        |  7 ++++++-
 telnet.c       |  4 +++-
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/conman.c b/conman.c
index b11a1798..cb22490d 100644
--- a/conman.c
+++ b/conman.c
@@ -2193,6 +2193,7 @@ int SCTaskFunction(void *pData)
     if (SCActive(self)) {
       return 1;
     } else {
+      Log(INFO,"sys","Handle %d disconnected", self->sockHandle);
       return 0;
     }
   }
@@ -2223,6 +2224,7 @@ int SCTaskFunction(void *pData)
         if (strstr(pPtr, "logoff") != NULL) {
           ANETclose(self->sockHandle);
           self->iEnd = 1;
+          Log(INFO,"sys","Handle %d loging off", self->sockHandle);
           free(pPtr);
           return 1;
         }
@@ -2257,8 +2259,7 @@ int SCTaskFunction(void *pData)
           free(pPtr);
           return 1;
         } else {
-          SCWrite(self, "ERROR: Bad login", eError);
-          printf("Bad login string %s\n", pPtr);
+          SCPrintf(self, eError, "ERROR: Bad login: %s", pPtr);
         }
       }
       free(pPtr);
diff --git a/multicounter.c b/multicounter.c
index 2e190df9..a1279e72 100644
--- a/multicounter.c
+++ b/multicounter.c
@@ -100,9 +100,12 @@ static int MMCCStart(void *pData, SConnection * pCon)
     return HWFault;
   }
 
-  for (i = 0; i < self->nSlaves; i++) {
-	ReleaseCountLock(self->slaves[i]);
-	self->slaves[i]->SetCountParameters(self->slaveData[i],
+  /*
+    start slaves
+  */
+  for (i = 1; i < self->nSlaves; i++) {
+    ReleaseCountLock(self->slaves[i]);
+    self->slaves[i]->SetCountParameters(self->slaveData[i],
                                         pCount->pDriv->fPreset,
                                         pCount->pDriv->eMode);
     status = self->slaves[i]->StartCount(self->slaveData[i], pCon);
@@ -112,6 +115,22 @@ static int MMCCStart(void *pData, SConnection * pCon)
       return status;
     }
   }
+
+  /*
+    start master
+  */
+
+  self->slaves[0]->SetCountParameters(self->slaveData[0],
+				      pCount->pDriv->fPreset,
+				      pCount->pDriv->eMode);
+  status = self->slaves[0]->StartCount(self->slaveData[0], pCon);
+  if (status != OKOK) {
+    MMCCHalt(pData);
+    ReleaseCountLock(pCount->pCountInt);
+    return status;
+  }
+
+
   pCount->isUpToDate = 0;
   pCount->tStart = time(NULL);
   InvokeCallBack(pCount->pCall, COUNTSTART, pCon);
diff --git a/nread.c b/nread.c
index d23ced32..90f9c700 100644
--- a/nread.c
+++ b/nread.c
@@ -1343,7 +1343,12 @@ static int TelnetAcceptCB(int handle, void *userData)
 /*------------------------------------------------------------------------------------*/
 static void NREADlog(int level, char *txt, void *userData)
 {
-  traceSys("anet","%s",txt);
+  /*
+    suppress the connection messages
+  */
+  if(level != ANETCON){
+    traceSys("anet","%s",txt);
+  }
 }
 
 /*------------------------------------------------------------------------------------*/
diff --git a/telnet.c b/telnet.c
index 41d3171a..d3706b28 100644
--- a/telnet.c
+++ b/telnet.c
@@ -224,6 +224,7 @@ int TelnetTask(void *pData)
     if (SCActive(self->pCon)) {
       return 1;
     } else {
+      Log(INFO,"sys","Handle %d disconnected", self->pCon->sockHandle);
       return 0;
     }
   }
@@ -235,6 +236,7 @@ int TelnetTask(void *pData)
       if (self->iLogin) {       /* handle normal command */
         /* check for logoff */
         if (strstr(pPtr, "logoff") != NULL) {
+          Log(INFO,"sys","Handle %d logging off", self->pCon->sockHandle);
           ANETclose(self->pCon->sockHandle);
           free(pPtr);
           self->pCon->iEnd = 1;
@@ -280,7 +282,7 @@ int TelnetTask(void *pData)
           } else {
             snprintf(pBuffer,sizeof(pBuffer)-1, "Accepted telnet connection on handle %d",
                     self->pCon->sockHandle);
-            Log(INFO,"com","%s",pBuffer);
+            Log(INFO,"sys","%s",pBuffer);
             SendWelcome(self->pCon);
             SCSetRights(self->pCon, iRet);
             self->iLogin = 1;