- Removed old stuff in conman

- Fixed a bug in processnode which hangs SICS when processnode is called from multiple
  clients on the same node
- Fixed a bug in multicountsersec which caused thrashing of the Tcl results which caused ugly
  error messages when calling the transfer script. Now a copy of the connection is made
  before calling the transfer script
This commit is contained in:
2014-07-15 16:43:09 +02:00
parent d6faaa593a
commit db6167bfa1
5 changed files with 45 additions and 38 deletions

View File

@@ -1552,6 +1552,7 @@ static int SctProcessCmd(pSICSOBJ ccmd, SConnection * con,
{
SctData *data = NULL;
SctController *c;
time_t startTime;
c = (SctController *) ccmd->pPrivate;
@@ -1581,9 +1582,10 @@ static int SctProcessCmd(pSICSOBJ ccmd, SConnection * con,
data->busy = 1;
data->inMacro = SCinMacro(con);
startTime = time(NULL);
DevQueue(c->devser, data, WritePRIO,
SctWriteHandler, SctMatch, NULL, SctDataInfo);
while (data->busy == 1) {
SctWriteHandler, SctTransactMatch, NULL, SctDataInfo);
while (data->busy == 1 && time(NULL) < startTime + 20) {
TaskYield(pServ->pTasker);
}
SctKillData(data);