linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a wrong sequence of starts in multicounter

Browse Source 
Suppressed excessive connection messages from asynnet
This commit is contained in:
koennecke
2016-11-10 14:41:38 +01:00
parent d0fe079b71
commit f2aa76b396
4 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
conman.c
View File

@ -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);

25
multicounter.c
View File

@ -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);

7
nread.c
View File

@ -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);
}
}
/*------------------------------------------------------------------------------------*/

4
telnet.c
View File

@ -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;