- Added a AsconReadDoneReconnect to ascon. This handles the case better when
a server hangs up diretcly after a message. - Some output was suppressed while tracing, fixed - Make ready to compile both with Ubuntu 32 and 64 or /usr/local based ON in general. Just in psi/makefile_linux the top include has to be adapted - Removed epics drivers from SICS. Still in source to be reenabled when needed - Added FindMotor - Added sput, sappend and slab to nxscript using the new sicsget module - Fix to sget to fix the "mot softzero" problem SKIPPED: psi/make_gen psi/psi.c psi/sinqhttpopt.c psi/spss7.c
This commit is contained in:
14
conman.c
14
conman.c
@ -597,7 +597,17 @@ int TelnetWriteANET(int sockHandle, char *pBuffer)
|
||||
}
|
||||
return iRet;
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------------*/
|
||||
static int mustWrite(int iOut)
|
||||
{
|
||||
switch(iOut) {
|
||||
case eLog:
|
||||
case eLogError:
|
||||
return 1;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
/*-------------------------------------------------------------------------*/
|
||||
int SCWrite(SConnection * self, char *pBuffer, int iOut)
|
||||
{
|
||||
@ -610,7 +620,7 @@ int SCWrite(SConnection * self, char *pBuffer, int iOut)
|
||||
if (pBuffer == NULL) {
|
||||
return 0;
|
||||
}
|
||||
if(!SCinMacro(self)){
|
||||
if(!SCinMacro(self) || mustWrite(iOut) ){
|
||||
traceCommand(ConID(self),"out:%s", pBuffer);
|
||||
}
|
||||
return self->write(self, pBuffer, iOut);
|
||||
|
Reference in New Issue
Block a user