Attachment #73834 for bug #143551

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 143551
Collapse All | Expand All

Lines 417-423 Link Here

(-)src-native-new/src/transport/sharedMemTL/SharedMemListener.c (-1 / +1 lines)
417	rc = ipcFlushToFunc(pMemBlockInfo, sharedMemMainDataProcessorFunc, (void *) pServerData) ;	417	rc = ipcFlushToFunc(pMemBlockInfo, sharedMemMainDataProcessorFunc, (void *) pServerData) ;
418	}	418	}
419		419
420	TPTP_LOG_DEBUG_MSG(pServerData, "Shared memory server ends...\n") ;	420	TPTP_LOG_DEBUG_MSG(pServerData, "Shared memory server ends...") ;
421		421
422	destroyMem (pMemBlockInfo);	422	destroyMem (pMemBlockInfo);
423		423

Lines 490-496 Link Here

(-)src-native-new/src/transport/TPTPClientCompTL/CCTLServer.c (-1 / +1 lines)
490	convertIPAddressStringToArray(ipAddr, address);	490	convertIPAddressStringToArray(ipAddr, address);
491		491
492	if (!tptp_checkHost(cctlData->network_list, address)) {	492	if (!tptp_checkHost(cctlData->network_list, address)) {
493	TPTP_LOG_ERROR_MSG2(stateData, "Connection refused on socket %d on host %s \n", clientSock, ipAddr);	493	TPTP_LOG_ERROR_MSG2(stateData, "Connection refused on socket %d on host %s", clientSock, ipAddr);
494	//printf("Connection refused on socket %d on host %s \n", clientSock, ipAddr);	494	//printf("Connection refused on socket %d on host %s \n", clientSock, ipAddr);
495	tptp_free(ipAddr);	495	tptp_free(ipAddr);
496	closeThisSocket(clientSock);	496	closeThisSocket(clientSock);

Lines 1594-1600 Link Here

(-)src-native-new/src/transport/TPTPClientCompTL/Connect2AC.c (-1 / +1 lines)
1594	{	1594	{
1595	tptp_int32 ret;	1595	tptp_int32 ret;
1596		1596
1597	//TPTP_LOG_DEBUG_MSG3( stateData, "CCTL processing command (%s) from srcID %d, clientID %d\n",	1597	//TPTP_LOG_DEBUG_MSG3( stateData, "CCTL processing command (%s) from srcID %d, clientID %d",
1598	// cmd, sourceID, ccb->clientID);	1598	// cmd, sourceID, ccb->clientID);
1599		1599
1600	if ( isEqualString( interfaceID, "org.eclipse.tptp.agentManager" ) )	1600	if ( isEqualString( interfaceID, "org.eclipse.tptp.agentManager" ) )

Lines 117-127 Link Here

(-)src-native-new/src/client/FileDataProcessor.cpp (-3 / +3 lines)
117	rc = findFileRecordByName(fileName, &fileRec);	117	rc = findFileRecordByName(fileName, &fileRec);
118	if (rc != -1) {	118	if (rc != -1) {
119	fwrite((void *)buffer, 1, length, fileRec.fp);	119	fwrite((void *)buffer, 1, length, fileRec.fp);
120	TPTP_LOG_DEBUG_MSG1("Wrote %d bytes of data\n", length);	120	TPTP_LOG_DEBUG_MSG1("Wrote %d bytes of data", length);
121	//TPTP_LOG_DEBUG_MSG1("The data is - %s\n", buffer);	121	//TPTP_LOG_DEBUG_MSG1("The data is - %s", buffer);
122	/* Post the semaphore when we get to the last record */	122	/* Post the semaphore when we get to the last record */
123	if (IS_DIME_END_RECORD(dimeHeader)) {	123	if (IS_DIME_END_RECORD(dimeHeader)) {
124	TPTP_LOG_DEBUG_MSG("The end flag has arrived\n");	124	TPTP_LOG_DEBUG_MSG("The end flag has arrived");
125	tptp_postSemaphore(fileRec.semaphore);	125	tptp_postSemaphore(fileRec.semaphore);
126	}	126	}
127	}	127	}

Lines 747-753 Link Here

(-)src-native-new/src/client/ConnectionImpl.cpp (-1 / +1 lines)
747	buffer = (unsigned char*)tptp_malloc( TPTP_DEFAULT_BUFFER_LENGTH+1 );	747	buffer = (unsigned char*)tptp_malloc( TPTP_DEFAULT_BUFFER_LENGTH+1 );
748	if ( buffer == NULL )	748	if ( buffer == NULL )
749	{	749	{
750	TPTP_LOG_SEVERE_MSG1("Unable to allocate memory of size %d\n", TPTP_DEFAULT_BUFFER_LENGTH+1);	750	TPTP_LOG_SEVERE_MSG1("Unable to allocate memory of size %d", TPTP_DEFAULT_BUFFER_LENGTH+1);
751	return;	751	return;
752	}	752	}
753		753

Lines 132-137 Link Here

(-)src-native-new/src/agentController/LoggingService.c (+6 lines)
132	{	132	{
133	tptp_string* cbeStr;	133	tptp_string* cbeStr;
134	tptp_int32 rc;	134	tptp_int32 rc;
		135	int len;
135		136
136	if ( !ls->loggingEnabled )	137	if ( !ls->loggingEnabled )
137	{	138	{
Lines 144-149 Link Here
144	return 0;	145	return 0;
145	}	146	}
146		147
		148	len = strlen(event);
		149	if (len > 0 && *(event + len - 1) == '\n') {
		150	*(event + len - 1) = '\0';
		151	}
		152
147	if ( (ls->loggingFormat == TPTP_LOGFORMAT_CBE) &&	153	if ( (ls->loggingFormat == TPTP_LOGFORMAT_CBE) &&
148	(0 == tptp_createLogCBE( "AgentController", subcomponent, instanceId, filename, lineNum, severity, event, &cbeStr )) )	154	(0 == tptp_createLogCBE( "AgentController", subcomponent, instanceId, filename, lineNum, severity, event, &cbeStr )) )
149	{	155	{




		/* Only increment the ID if we were successful */
		cm->nextTransportID++;

		TPTP_LOG_DEBUG_MSG1( cm, "Successfully loaded transport layer: %s", libName );

		return 0;
	}
	else
	{
		TPTP_LOG_ERROR_MSG2( cm, "Unable to load transport layer: %s %s", libName, fullLibName );
	}

	return -1;


	/* Return the new connection ID */
	*connectionID = id;
	TPTP_LOG_DEBUG_MSG2(cm, "ConnectionManger - successfully added connectionID %d for transportID %d",*connectionID, transportID);

	/* Increment the next ID -- prototype */
	cm->nextConnectionID++;




	rc = sendCommand((char *)&cmd, cmdLength, CONNECT_CONSOLE);
	if (rc)
	{
		TPTP_LOG_ERROR_MSG(this, "PC: Error sending CONNECT_CONSOLE request to TL");
		return rc;
	}
	

	{
		// TODO: what should return value be on error?
		// Can't log this message to the AC since we don't have a valid instance ptr.
		//TPTP_LOG_ERROR_MSG("monitorProcessEvents Thread: Error - Invalid ProcessController handle");
		return 0;
	}


	validApp = validateExecutable(appName, errCodeApp);
	validWorkingDir = validateDirectory(workingDir, errCodeDir);

	TPTP_LOG_DEBUG_MSG2(this, "PC validateProcessToLaunch sending reply with validApp=%d, validWorkingDir=%d",
		validApp, validWorkingDir);
	//TODO: Need to return details about how the validation failed.


			{
				// Not an error - application aliases not required.
				// PC's appAliasesList just remains Null.
				TPTP_LOG_DEBUG_MSG(this, "PC processCommand: No Application aliases found by the Agent Controller");
			} else
			{
				int tmpLAO;

				// PC's appAliasesList.
				if (parseApplicationAliases(aliases, &appAliasesList, &tmpLAO))
				{
					TPTP_LOG_DEBUG_MSG(this, "PC processCommand: Failed to parse Application Alias list");
				}

				if (tmpLAO)





		}

		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing command string \"%s\"", (cmd?cmd:"null"));
		return -1;
	}
	catch (const XMLException& error)

		char *errmesg = XMLString::transcode(error.getMessage());
		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
		XMLString::release(&errmesg);
		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing command string \"%s\"", (cmd?cmd:"null"));
		return -1;
	}
	catch(...)
	{ 
		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing command string \"%s\"", (cmd?cmd:"null"));
		return -1;
	}
}


		}

		TPTP_LOG_PARSE_MSG2("XML/DOM Exception occurred while parsing \"%s\" attribute in command string \"%s\"", XML_ATTR_DEST, (cmd?cmd:"null"));
		return -1;
	}
	catch (const XMLException& error)

		char *errmesg = XMLString::transcode(error.getMessage());
		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
		XMLString::release(&errmesg);
		TPTP_LOG_PARSE_MSG2("XML Exception occurred while parsing \"%s\" attribute in command string \"%s\"", XML_ATTR_DEST, (cmd?cmd:"null"));
		return -1;
	}
	catch(...)
	{ 
		TPTP_LOG_PARSE_MSG2("Unexpected exception occurred while parsing \"%s\" attribute in command string \"%s\"", XML_ATTR_DEST, (cmd?cmd:"null"));
		return -1;
	}
}


		}

		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing property list entry string \"%s\"", (property?property:"null"));
		return -1;
	}
	catch (const XMLException& error)

		char *errmesg = XMLString::transcode(error.getMessage());
		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
		XMLString::release(&errmesg);
		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing property list entry string \"%s\"", (property?property:"null"));
		return -1;
	}
	catch(...)
	{ 
		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing property list entry string \"%s\"", (property?property:"null"));
		return -1;
	}
}


		}

		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"", (cmd?cmd:"null"));
		return -1;
	}
	catch (const XMLException& error)

		char *errmesg = XMLString::transcode(error.getMessage());
		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
		XMLString::release(&errmesg);
		TPTP_LOG_PARSE_MSG1("XML Exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"", (cmd?cmd:"null"));
		return -1;
	}
	catch(...)
	{ 
		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"", (cmd?cmd:"null"));
		return -1;
	}
}


		}

		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing string value of an XML element in fragment \"%s\"", (fragment?fragment:"null"));
		return -1;
	}
	catch (const XMLException& error)

		char *errmesg = XMLString::transcode(error.getMessage());
		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
		XMLString::release(&errmesg);
		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing string value of an XML element in fragment \"%s\"", (fragment?fragment:"null"));
		return -1;
	}
	catch(...)
	{ 
		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing string value of an XML element in fragment \"%s\"", (fragment?fragment:"null"));
		return -1;
	}
}


		}

		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Host list in string \"%s\"", (initString?initString:"null"));
		return -1;
	}
	catch (const XMLException& error)

		char *errmesg = XMLString::transcode(error.getMessage());
		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
		XMLString::release(&errmesg);
		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Host list in string \"%s\"", (initString?initString:"null"));
		return -1;
	}
	catch(...)
	{ 
		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Host list in string \"%s\"", (initString?initString:"null"));
		return -1;
	}
}

Lines 75-81 Link Here

(-)src-native-new/src/shared/TPTPUtil/TPTPCmdUtil.c (-1 / +1 lines)
75	if ( cloneParam == NULL )	75	if ( cloneParam == NULL )
76	{	76	{
77	/* TODO: Report an internal error */	77	/* TODO: Report an internal error */
78	//TPTP_LOG_ERROR_MSG("CmdUtil: Error - failed to alloc param obj\n");	78	//TPTP_LOG_ERROR_MSG("CmdUtil: Error - failed to alloc param obj");
79	return NULL;	79	return NULL;
80	}	80	}
81		81

Lines 786-792 Link Here

(-)src-native-new/src/transport/TPTPAgentCompTL/Connect2AC.c (-1 / +1 lines)
786	{	786	{
787	tptp_int32 ret;	787	tptp_int32 ret;
788		788
789	TPTP_LOG_DEBUG_MSG3( stateData, "ACTL processing command (%s) from srcID %d, agent %s\n",	789	TPTP_LOG_DEBUG_MSG3( stateData, "ACTL processing command (%s) from srcID %d, agent %s",
790	cmdName, sourceID, agent->agentName.data);	790	cmdName, sourceID, agent->agentName.data);
791		791
792	/* Check the interface */	792	/* Check the interface */

Lines 373-379 Link Here

(-)src-native-new/src/transport/TPTPAgentCompTL/AgentCmdHandlers.c (-1 / +1 lines)
373	agent->logFile.length = 0;	373	agent->logFile.length = 0;
374	}	374	}
375	} else {	375	} else {
376	TPTP_LOG_INFO_MSG1(stateData, "Agent not found %s \n", agent->agentName.data);	376	TPTP_LOG_INFO_MSG1(stateData, "Agent not found %s", agent->agentName.data);
377	agent->IPCBufSize = 0; /* 198757 */	377	agent->IPCBufSize = 0; /* 198757 */
378	agent->clientMode=RA_DYNAMIC; /* 215066 */	378	agent->clientMode=RA_DYNAMIC; /* 215066 */
379	agent->logFile.data = NULL;	379	agent->logFile.data = NULL;





	if ((flags & CONNECT) != 0)
	{
		TPTP_LOG_DEBUG_MSG("CONNECTION REQUESTED COMMAND.") ;
		printTPTPCommand(pMsg, payLoadLength) ;
	}

	else if ((flags & CONNECT_DATA) != 0)
	{
		TPTP_LOG_DEBUG_MSG("DATA CONNECTION REQUESTED COMMAND.") ;
		printTPTPCommand_CONNECT_DATA(pMsg, payLoadLength) ;
	}

	else if ((flags & DISCONNECT) != 0)
	{
		TPTP_LOG_DEBUG_MSG("DISCONNECT REQUESTED COMMAND.") ;
	}

	else if ((flags & CONNECTION_COMPLETE) != 0)

		/* read in the connection id */
		readUINTFromBuffer(pBuffer, &connectionId);

		TPTP_LOG_DEBUG_MSG1("CONNECTION COMPLETE RESPONSE. Connection ID (%d).", connectionId) ;
	}

	else if (((flags & DATA_CONNECTION_COMPLETE) != 0) ||

		{
			/* read in the uuid length */
			pBuffer = readUINTFromBuffer(pBuffer, &uuidLength);
			TPTP_LOG_DEBUG_MSG1("DATA CONNECTION COMPLETE RESPONSE. Connection ID (%d).", connectionId) ;
		}
		else
		{
			TPTP_LOG_DEBUG_MSG1("CONSOLE CONNECTION COMPLETE RESPONSE. Connection ID (%d).", connectionId) ;
		}

	}

	else if ((flags & CONNECTION_REFUSED) != 0)
	{
		TPTP_LOG_DEBUG_MSG("CONNECTION REFUSED RESPONSE.") ;
	}

	else

		/* end with a NULL byte for using with printf */
		strncpy(copyCmd, pCmd, payLoadLength) ;
		copyCmd[payLoadLength] = '\0' ;
		TPTP_LOG_DEBUG_MSG1("COMMAND: %s.", copyCmd) ;
	}

	return 0 ;

			strcpy(copyCmd, "") ;
		}

		TPTP_LOG_DEBUG_MSG2("COMMAND: dataPathType(%d) uid(%s).", 
			dataPathType, copyCmd) ;
	}


Lines 307-313 Link Here

(-)src-native-new/src/transport/transportSupport/TransportSupportNamedPipe_win.c (-2 / +2 lines)
307	/* Build the full pipe name */	307	/* Build the full pipe name */
308	sprintf(pFullName, "%s%s", pNameSpace, pPipeName) ;	308	sprintf(pFullName, "%s%s", pNameSpace, pPipeName) ;
309		309
310	TPTP_LOG_DEBUG_MSG2("Create pipe(%s) option(%d) \n", pFullName, createOption) ;	310	TPTP_LOG_DEBUG_MSG2("Create pipe(%s) option(%d)", pFullName, createOption) ;
311		311
312	switch(createOption)	312	switch(createOption)
313	{	313	{
Lines 380-386 Link Here
380	/* Build the pipe name for the platform */	380	/* Build the pipe name for the platform */
381	sprintf(pFullName, "%s%s", pNameSpace, pPipeName) ;	381	sprintf(pFullName, "%s%s", pNameSpace, pPipeName) ;
382		382
383	TPTP_LOG_DEBUG_MSG2("Open pipe(%s) option(%d) \n", pFullName, openOption) ;	383	TPTP_LOG_DEBUG_MSG2("Open pipe(%s) option(%d)", pFullName, openOption) ;
384		384
385	switch(openOption)	385	switch(openOption)
386	{	386	{




		shmBufSize = requestedSize;
	}

	TPTP_LOG_DEBUG_MSG("ipcMemCreate...") ;

	pShmHdl = (ra_shm_handle_t *) tptp_malloc(sizeof(ra_shm_handle_t)) ;
	if (pShmHdl == NULL) rc = -2 ;


		shmBufSize =  validateSystemShmMax(shmBufSize);

		TPTP_LOG_DEBUG_MSG2("Shared mem name(%s) size(%d)", pMemName, shmBufSize) ;
		shmerr = ra_createShm((char*) pMemName, shmBufSize, pShmHdl) ;

		if (shmerr != 0)
		{
			TPTP_LOG_ERROR_MSG1("Shared mem error(%d)", shmerr) ;
			rc = -3 ;
		}
	}




			
	rc =  ra_attachToShm((char *) pMemName, & pShmHdl);

	TPTP_LOG_DEBUG_MSG2("ipcMemOpen:  mem_name(%s) rc(%d)", pMemName, rc) ;

	if (rc == 0)
	{
		pBlockInfo->pRamboBlock = (LPVOID) pShmHdl ;
		TPTP_LOG_DEBUG_MSG2("ipcMemOpen:  block(%x) handle(%x)", pBlockInfo, pBlockInfo->pRamboBlock) ;
	}

	return ( rc ) ;





	if (rc < 0)
	{
		TPTP_LOG_ERROR_MSG("Error: cannot bind to the socket.") ;
		//printCurrentSysError() ;
	}
	else

		result = setHandleInherited((HANDLE)sock) ;
		if ( result == 0 )
		{
			TPTP_LOG_ERROR_MSG("Error: unable to set handle info.") ;
			rc = - 1;
		}
		else

			rc = listen(sock, 100) ;
			if (rc < 0)
			{
				TPTP_LOG_ERROR_MSG("Error: unable to listen.") ;
			}
		}
	}

	int    enable=1;
	struct linger linger;

	TPTP_LOG_DEBUG_MSG("Ready to accept next socket connection request...") ;

    clientSock = accept(serverSock, (struct sockaddr * ) & clientAddress, (int *)&clientLen);  



	if ( rc == 0 )
	{
		TPTP_LOG_ERROR_MSG("Error: unable to accept connection.") ;
	}
	else
	{
		TPTP_LOG_DEBUG_MSG("Accept new socket connection request.");
	}



	struct linger linger;
	int    loopcnt = 0 ;

	TPTP_LOG_DEBUG_MSG("connectToTCPServer...") ;

	sock = socket(PF_INET, SOCK_STREAM, 0);






		}

		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Cmd in message \"%s\"", (msg?msg:"null"));
		return -1;
	}
	catch (const XMLException& error)

		char *errmesg = XMLString::transcode(error.getMessage());
		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
		XMLString::release(&errmesg);
		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Cmd in message \"%s\"", (msg?msg:"null"));
		return -1;
	}
	catch(...)
	{ 
		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Cmd in message \"%s\"", (msg?msg:"null"));
		return -1;
	}
}




	if ( cloneLstnr == NULL )
	{
		/* TODO: Report an internal error */
		TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc listener obj");
		return NULL;
	}


	if ( cloneProc == NULL )
	{
		/* TODO: Report an internal error */
		TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc proc obj");
		return NULL;
	}


	if ( cloneProc->monitors == NULL )
	{
		/* TODO: Report an internal error */
		TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc listener obj");
		return NULL;
	}
	tptp_list_clone(cloneProc->monitors, proc->monitors);

		if (STAT(dir, &statBuf) != 0)  //Does it exist?
		{
			//perror("PCUTil");
			TPTP_LOG_DEBUG_MSG1("PCUtil: Invalid dir=%s", dir);
			*errCode = TPTP_PC_DIR_NOT_FOUND;
			return validDir;
		}

	{
		//Null argument
		*errCode = TPTP_UNEXPECTED_NULL_ARG;
		TPTP_LOG_DEBUG_MSG("PCUtil: Error - Arg dir is a NULL value");
	}

	return validDir;

		if (STAT(dir, &statBuf) != 0)  //Does it exist?
		{
			//perror("PCUTil");
			TPTP_LOG_DEBUG_MSG1("PCUtil: Invalid dir=%s", dir);
			*errCode = TPTP_PC_DIR_NOT_FOUND;
			return validDir;
		}

	{
		//Null argument
		*errCode = TPTP_UNEXPECTED_NULL_ARG;
		TPTP_LOG_DEBUG_MSG("PCUtil: Error - Arg dir is a NULL value");
	}

	return validDir;


	TPTP_HANDLE consoleChild[3];

	TPTP_LOG_DEBUG_MSG1("createProc: Called on to create process: %s", proc->appName);

	// If given a non-null console pointer, then pass the handles to the process we are creating
	if (console)


	// Successfully launched the application, fillin tptp_process_t struct
	// which is returned to the caller.
	TPTP_LOG_DEBUG_MSG1("createProc: SUCCESSFULLY created process: %lu", (unsigned long)proc->pid);
	*errCode = 0;

#ifdef _WIN32		

	proc->hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, proc->pid);
	if (proc->hProcess == 0)
	{
		TPTP_LOG_DEBUG_MSG("OpenProcess() call failed.");
		//printCurrentSysError();
		*errCode = TPTP_PC_OPEN_PROC_FAILED;
		return -1;





	DataProviderImpl * pProvider = (DataProviderImpl *) dataConn->pObj ;

//	TPTP_LOG_DEBUG_MSG1(this, "Agent: establishDataPath() receives %d bytes", dataLen) ;

	ipcCloseMem(&dataConn->agentMemBlockInfo);

	if (dataConn->_isEstablished == false)
	{
		// TPTP_LOG_DEBUG_MSG(this, "---> SharedMemDataPathProcessorFunc calls doEstablish()") ;

		pProvider->doEstablish((char *) pData, dataLen, dataConn) ;
		//TODO: Can't say it is truly established at this point since we've not

	}
	else
	{
		// TPTP_LOG_DEBUG_MSG(this, "---> SharedMemDataPathProcessorFunc calls receiveData()") ;
		pProvider->processData(dataConn->clientid, (char*)pData, 0, dataLen);
		//pProvider->receiveData(dataConn->clientid, (char*)pData, dataLen);
	}





		}

		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing plugin config file \"%s\"", (XMLfilename?XMLfilename:"null"));
		return -1;
	}
	catch (const XMLException& error)

		char *errmesg = XMLString::transcode(error.getMessage());
		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
		XMLString::release(&errmesg);
		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing plugin config file \"%s\"", (XMLfilename?XMLfilename:"null"));
		return -1;
	}
	catch(...)
	{ 
		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing plugin config file \"%s\"", (XMLfilename?XMLfilename:"null"));
		return -1;
	}
}


		}

		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing AC config file \"%s\"", (acConfigFile?acConfigFile:"null"));
		return -1;
	}
	catch (const XMLException& error)

		char *errmesg = XMLString::transcode(error.getMessage());
		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
		XMLString::release(&errmesg);
		printf("XML Exception occurred while parsing AC config file \"%s\"", (acConfigFile?acConfigFile:"null"));
		return -1;
	}
	catch(...)
	{ 
		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing AC config file \"%s\"", (acConfigFile?acConfigFile:"null"));
		return -1;
	}
}


		}

		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing agent metadata in file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
		return -1;
	}
	catch (const XMLException& error)

		char *errmesg = XMLString::transcode(error.getMessage());
		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
		XMLString::release(&errmesg);
		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing agent metadata in file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
		return -1;
	}
	catch(...)
	{ 
		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing agent metadata in file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
		return -1;
	}
}


		}

		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Application string \"%s\"", (applicationString?applicationString:"null"));
		return -1;
	}
	catch (const XMLException& error)

		char *errmesg = XMLString::transcode(error.getMessage());
		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
		XMLString::release(&errmesg);
		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Application string \"%s\"", (applicationString?applicationString:"null"));
		return -1;
	}
	catch(...)
	{ 
		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Application string \"%s\"", (applicationString?applicationString:"null"));
		return -1;
	}
}


		}

		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing ApplicationAliases string \"%s\"", (applicationString?applicationString:"null"));
		return -1;
	}
	catch (const XMLException& error)

		char *errmesg = XMLString::transcode(error.getMessage());
		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
		XMLString::release(&errmesg);
		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing ApplicationAliases string \"%s\"", (applicationString?applicationString:"null"));
		return -1;
	}
	catch(...)
	{ 
		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing ApplicationAliases string \"%s\"", (applicationString?applicationString:"null"));
		return -1;
	}
}

						strcpy(customData->name, gchnodename);
						customData->value = temp;
						tptp_list_add(&agentCustomDataList, (void *)customData);
						TPTP_LOG_DEBUG_MSG1(pAgent, "Custom Node Name - %s", customData->name);
						TPTP_LOG_DEBUG_MSG1(pAgent, "Custom Node Value - %s", customData->value);
					
						XMLString::release(&gchnodename);
					}


		}

		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing AgentConfig file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
		return -1;
	}
	catch (const XMLException& error)

		char *errmesg = XMLString::transcode(error.getMessage());
		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
		XMLString::release(&errmesg);
		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing AgentConfig file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
		return -1;
	}
	catch(...)
	{ 
		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing AgentConfig file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
		return -1;
	}
}*/

Return to bug 143551

Lines 181-193 Link Here

(-)src-native-new/src/agentController/ConnectionManager.c (-3 / +3 lines)
181	/* Only increment the ID if we were successful */	181	/* Only increment the ID if we were successful */
182	cm->nextTransportID++;	182	cm->nextTransportID++;
183		183
184	TPTP_LOG_DEBUG_MSG1( cm, "Successfully loaded transport layer: %s\n", libName );	184	TPTP_LOG_DEBUG_MSG1( cm, "Successfully loaded transport layer: %s", libName );
185		185
186	return 0;	186	return 0;
187	}	187	}
188	else	188	else
189	{	189	{
190	TPTP_LOG_ERROR_MSG2( cm, "Unable to load transport layer: %s %s\n", libName, fullLibName );	190	TPTP_LOG_ERROR_MSG2( cm, "Unable to load transport layer: %s %s", libName, fullLibName );
191	}	191	}
192		192
193	return -1;	193	return -1;
Lines 325-331 Link Here
325		325
326	/* Return the new connection ID */	326	/* Return the new connection ID */
327	*connectionID = id;	327	*connectionID = id;
328	TPTP_LOG_DEBUG_MSG2(cm, "ConnectionManger - successfully added connectionID %d for transportID %d\n",*connectionID, transportID);	328	TPTP_LOG_DEBUG_MSG2(cm, "ConnectionManger - successfully added connectionID %d for transportID %d",*connectionID, transportID);
329		329
330	/* Increment the next ID -- prototype */	330	/* Increment the next ID -- prototype */
331	cm->nextConnectionID++;	331	cm->nextConnectionID++;

Lines 231-237 Link Here

(-)src-native-new/src/agents/tptpProcessController/TPTPProcessController.cpp (-5 / +5 lines)
231	rc = sendCommand((char *)&cmd, cmdLength, CONNECT_CONSOLE);	231	rc = sendCommand((char *)&cmd, cmdLength, CONNECT_CONSOLE);
232	if (rc)	232	if (rc)
233	{	233	{
234	TPTP_LOG_ERROR_MSG(this, "PC: Error sending CONNECT_CONSOLE request to TL\n");	234	TPTP_LOG_ERROR_MSG(this, "PC: Error sending CONNECT_CONSOLE request to TL");
235	return rc;	235	return rc;
236	}	236	}
237		237
Lines 658-664 Link Here
658	{	658	{
659	// TODO: what should return value be on error?	659	// TODO: what should return value be on error?
660	// Can't log this message to the AC since we don't have a valid instance ptr.	660	// Can't log this message to the AC since we don't have a valid instance ptr.
661	//TPTP_LOG_ERROR_MSG("monitorProcessEvents Thread: Error - Invalid ProcessController handle\n");	661	//TPTP_LOG_ERROR_MSG("monitorProcessEvents Thread: Error - Invalid ProcessController handle");
662	return 0;	662	return 0;
663	}	663	}
664		664
Lines 1359-1365 Link Here
1359	validApp = validateExecutable(appName, errCodeApp);	1359	validApp = validateExecutable(appName, errCodeApp);
1360	validWorkingDir = validateDirectory(workingDir, errCodeDir);	1360	validWorkingDir = validateDirectory(workingDir, errCodeDir);
1361		1361
1362	TPTP_LOG_DEBUG_MSG2(this, "PC validateProcessToLaunch sending reply with validApp=%d, validWorkingDir=%d\n",	1362	TPTP_LOG_DEBUG_MSG2(this, "PC validateProcessToLaunch sending reply with validApp=%d, validWorkingDir=%d",
1363	validApp, validWorkingDir);	1363	validApp, validWorkingDir);
1364	//TODO: Need to return details about how the validation failed.	1364	//TODO: Need to return details about how the validation failed.
1365		1365
Lines 2341-2347 Link Here
2341	{	2341	{
2342	// Not an error - application aliases not required.	2342	// Not an error - application aliases not required.
2343	// PC's appAliasesList just remains Null.	2343	// PC's appAliasesList just remains Null.
2344	TPTP_LOG_DEBUG_MSG(this, "PC processCommand: No Application aliases found by the Agent Controller\n");	2344	TPTP_LOG_DEBUG_MSG(this, "PC processCommand: No Application aliases found by the Agent Controller");
2345	} else	2345	} else
2346	{	2346	{
2347	int tmpLAO;	2347	int tmpLAO;
Lines 2349-2355 Link Here
2349	// PC's appAliasesList.	2349	// PC's appAliasesList.
2350	if (parseApplicationAliases(aliases, &appAliasesList, &tmpLAO))	2350	if (parseApplicationAliases(aliases, &appAliasesList, &tmpLAO))
2351	{	2351	{
2352	TPTP_LOG_DEBUG_MSG(this, "PC processCommand: Failed to parse Application Alias list\n");	2352	TPTP_LOG_DEBUG_MSG(this, "PC processCommand: Failed to parse Application Alias list");
2353	}	2353	}
2354		2354
2355	if (tmpLAO)	2355	if (tmpLAO)

Lines 308-314 Link Here

(-)src-native-new/src/shared/TPTPUtil/TPTPUtil.cpp (-18 / +18 lines)
308		308
309	}	309	}
310		310
311	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing command string \"%s\"\n", (cmd?cmd:"null"));	311	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing command string \"%s\"", (cmd?cmd:"null"));
312	return -1;	312	return -1;
313	}	313	}
314	catch (const XMLException& error)	314	catch (const XMLException& error)
Lines 316-327 Link Here
316	char *errmesg = XMLString::transcode(error.getMessage());	316	char *errmesg = XMLString::transcode(error.getMessage());
317	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());	317	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
318	XMLString::release(&errmesg);	318	XMLString::release(&errmesg);
319	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing command string \"%s\"\n", (cmd?cmd:"null"));	319	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing command string \"%s\"", (cmd?cmd:"null"));
320	return -1;	320	return -1;
321	}	321	}
322	catch(...)	322	catch(...)
323	{	323	{
324	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing command string \"%s\"\n", (cmd?cmd:"null"));	324	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing command string \"%s\"", (cmd?cmd:"null"));
325	return -1;	325	return -1;
326	}	326	}
327	}	327	}
Lines 396-402 Link Here
396		396
397	}	397	}
398		398
399	TPTP_LOG_PARSE_MSG2("XML/DOM Exception occurred while parsing \"%s\" attribute in command string \"%s\"\n", XML_ATTR_DEST, (cmd?cmd:"null"));	399	TPTP_LOG_PARSE_MSG2("XML/DOM Exception occurred while parsing \"%s\" attribute in command string \"%s\"", XML_ATTR_DEST, (cmd?cmd:"null"));
400	return -1;	400	return -1;
401	}	401	}
402	catch (const XMLException& error)	402	catch (const XMLException& error)
Lines 404-415 Link Here
404	char *errmesg = XMLString::transcode(error.getMessage());	404	char *errmesg = XMLString::transcode(error.getMessage());
405	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());	405	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
406	XMLString::release(&errmesg);	406	XMLString::release(&errmesg);
407	TPTP_LOG_PARSE_MSG2("XML Exception occurred while parsing \"%s\" attribute in command string \"%s\"\n", XML_ATTR_DEST, (cmd?cmd:"null"));	407	TPTP_LOG_PARSE_MSG2("XML Exception occurred while parsing \"%s\" attribute in command string \"%s\"", XML_ATTR_DEST, (cmd?cmd:"null"));
408	return -1;	408	return -1;
409	}	409	}
410	catch(...)	410	catch(...)
411	{	411	{
412	TPTP_LOG_PARSE_MSG2("Unexpected exception occurred while parsing \"%s\" attribute in command string \"%s\"\n", XML_ATTR_DEST, (cmd?cmd:"null"));	412	TPTP_LOG_PARSE_MSG2("Unexpected exception occurred while parsing \"%s\" attribute in command string \"%s\"", XML_ATTR_DEST, (cmd?cmd:"null"));
413	return -1;	413	return -1;
414	}	414	}
415	}	415	}
Lines 712-718 Link Here
712		712
713	}	713	}
714		714
715	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing property list entry string \"%s\"\n", (property?property:"null"));	715	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing property list entry string \"%s\"", (property?property:"null"));
716	return -1;	716	return -1;
717	}	717	}
718	catch (const XMLException& error)	718	catch (const XMLException& error)
Lines 720-731 Link Here
720	char *errmesg = XMLString::transcode(error.getMessage());	720	char *errmesg = XMLString::transcode(error.getMessage());
721	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());	721	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
722	XMLString::release(&errmesg);	722	XMLString::release(&errmesg);
723	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing property list entry string \"%s\"\n", (property?property:"null"));	723	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing property list entry string \"%s\"", (property?property:"null"));
724	return -1;	724	return -1;
725	}	725	}
726	catch(...)	726	catch(...)
727	{	727	{
728	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing property list entry string \"%s\"\n", (property?property:"null"));	728	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing property list entry string \"%s\"", (property?property:"null"));
729	return -1;	729	return -1;
730	}	730	}
731	}	731	}
Lines 1349-1355 Link Here
1349		1349
1350	}	1350	}
1351		1351
1352	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"\n", (cmd?cmd:"null"));	1352	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"", (cmd?cmd:"null"));
1353	return -1;	1353	return -1;
1354	}	1354	}
1355	catch (const XMLException& error)	1355	catch (const XMLException& error)
Lines 1357-1368 Link Here
1357	char *errmesg = XMLString::transcode(error.getMessage());	1357	char *errmesg = XMLString::transcode(error.getMessage());
1358	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());	1358	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
1359	XMLString::release(&errmesg);	1359	XMLString::release(&errmesg);
1360	TPTP_LOG_PARSE_MSG1("XML Exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"\n", (cmd?cmd:"null"));	1360	TPTP_LOG_PARSE_MSG1("XML Exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"", (cmd?cmd:"null"));
1361	return -1;	1361	return -1;
1362	}	1362	}
1363	catch(...)	1363	catch(...)
1364	{	1364	{
1365	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"\n", (cmd?cmd:"null"));	1365	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"", (cmd?cmd:"null"));
1366	return -1;	1366	return -1;
1367	}	1367	}
1368	}	1368	}
Lines 1504-1510 Link Here
1504		1504
1505	}	1505	}
1506		1506
1507	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing string value of an XML element in fragment \"%s\"\n", (fragment?fragment:"null"));	1507	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing string value of an XML element in fragment \"%s\"", (fragment?fragment:"null"));
1508	return -1;	1508	return -1;
1509	}	1509	}
1510	catch (const XMLException& error)	1510	catch (const XMLException& error)
Lines 1512-1523 Link Here
1512	char *errmesg = XMLString::transcode(error.getMessage());	1512	char *errmesg = XMLString::transcode(error.getMessage());
1513	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());	1513	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
1514	XMLString::release(&errmesg);	1514	XMLString::release(&errmesg);
1515	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing string value of an XML element in fragment \"%s\"\n", (fragment?fragment:"null"));	1515	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing string value of an XML element in fragment \"%s\"", (fragment?fragment:"null"));
1516	return -1;	1516	return -1;
1517	}	1517	}
1518	catch(...)	1518	catch(...)
1519	{	1519	{
1520	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing string value of an XML element in fragment \"%s\"\n", (fragment?fragment:"null"));	1520	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing string value of an XML element in fragment \"%s\"", (fragment?fragment:"null"));
1521	return -1;	1521	return -1;
1522	}	1522	}
1523	}	1523	}
Lines 1889-1895 Link Here
1889		1889
1890	}	1890	}
1891		1891
1892	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Host list in string \"%s\"\n", (initString?initString:"null"));	1892	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Host list in string \"%s\"", (initString?initString:"null"));
1893	return -1;	1893	return -1;
1894	}	1894	}
1895	catch (const XMLException& error)	1895	catch (const XMLException& error)
Lines 1897-1908 Link Here
1897	char *errmesg = XMLString::transcode(error.getMessage());	1897	char *errmesg = XMLString::transcode(error.getMessage());
1898	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());	1898	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
1899	XMLString::release(&errmesg);	1899	XMLString::release(&errmesg);
1900	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Host list in string \"%s\"\n", (initString?initString:"null"));	1900	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Host list in string \"%s\"", (initString?initString:"null"));
1901	return -1;	1901	return -1;
1902	}	1902	}
1903	catch(...)	1903	catch(...)
1904	{	1904	{
1905	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Host list in string \"%s\"\n", (initString?initString:"null"));	1905	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Host list in string \"%s\"", (initString?initString:"null"));
1906	return -1;	1906	return -1;
1907	}	1907	}
1908	}	1908	}

Lines 346-352 Link Here

(-)src-native-new/src/transport/transportSupport/TransportSupportSharedMem.c (-3 / +3 lines)
346	shmBufSize = requestedSize;	346	shmBufSize = requestedSize;
347	}	347	}
348		348
349	TPTP_LOG_DEBUG_MSG("ipcMemCreate...\n") ;	349	TPTP_LOG_DEBUG_MSG("ipcMemCreate...") ;
350		350
351	pShmHdl = (ra_shm_handle_t *) tptp_malloc(sizeof(ra_shm_handle_t)) ;	351	pShmHdl = (ra_shm_handle_t *) tptp_malloc(sizeof(ra_shm_handle_t)) ;
352	if (pShmHdl == NULL) rc = -2 ;	352	if (pShmHdl == NULL) rc = -2 ;
Lines 358-369 Link Here
358		358
359	shmBufSize = validateSystemShmMax(shmBufSize);	359	shmBufSize = validateSystemShmMax(shmBufSize);
360		360
361	TPTP_LOG_DEBUG_MSG2("Shared mem name(%s) size(%d) \n", pMemName, shmBufSize) ;	361	TPTP_LOG_DEBUG_MSG2("Shared mem name(%s) size(%d)", pMemName, shmBufSize) ;
362	shmerr = ra_createShm((char*) pMemName, shmBufSize, pShmHdl) ;	362	shmerr = ra_createShm((char*) pMemName, shmBufSize, pShmHdl) ;
363		363
364	if (shmerr != 0)	364	if (shmerr != 0)
365	{	365	{
366	TPTP_LOG_ERROR_MSG1("Shared mem error(%d) \n", shmerr) ;	366	TPTP_LOG_ERROR_MSG1("Shared mem error(%d)", shmerr) ;
367	rc = -3 ;	367	rc = -3 ;
368	}	368	}
369	}	369	}

Lines 135-153 Link Here

(-)src-native-new/src/transport/transportSupport/TransportSupport.c (-9 / +9 lines)
135		135
136	if ((flags & CONNECT) != 0)	136	if ((flags & CONNECT) != 0)
137	{	137	{
138	TPTP_LOG_DEBUG_MSG("CONNECTION REQUESTED COMMAND. \n") ;	138	TPTP_LOG_DEBUG_MSG("CONNECTION REQUESTED COMMAND.") ;
139	printTPTPCommand(pMsg, payLoadLength) ;	139	printTPTPCommand(pMsg, payLoadLength) ;
140	}	140	}
141		141
142	else if ((flags & CONNECT_DATA) != 0)	142	else if ((flags & CONNECT_DATA) != 0)
143	{	143	{
144	TPTP_LOG_DEBUG_MSG("DATA CONNECTION REQUESTED COMMAND. \n") ;	144	TPTP_LOG_DEBUG_MSG("DATA CONNECTION REQUESTED COMMAND.") ;
145	printTPTPCommand_CONNECT_DATA(pMsg, payLoadLength) ;	145	printTPTPCommand_CONNECT_DATA(pMsg, payLoadLength) ;
146	}	146	}
147		147
148	else if ((flags & DISCONNECT) != 0)	148	else if ((flags & DISCONNECT) != 0)
149	{	149	{
150	TPTP_LOG_DEBUG_MSG("DISCONNECT REQUESTED COMMAND. \n") ;	150	TPTP_LOG_DEBUG_MSG("DISCONNECT REQUESTED COMMAND.") ;
151	}	151	}
152		152
153	else if ((flags & CONNECTION_COMPLETE) != 0)	153	else if ((flags & CONNECTION_COMPLETE) != 0)
Lines 159-165 Link Here
159	/* read in the connection id */	159	/* read in the connection id */
160	readUINTFromBuffer(pBuffer, &connectionId);	160	readUINTFromBuffer(pBuffer, &connectionId);
161		161
162	TPTP_LOG_DEBUG_MSG1("CONNECTION COMPLETE RESPONSE. Connection ID (%d).\n", connectionId) ;	162	TPTP_LOG_DEBUG_MSG1("CONNECTION COMPLETE RESPONSE. Connection ID (%d).", connectionId) ;
163	}	163	}
164		164
165	else if (((flags & DATA_CONNECTION_COMPLETE) != 0) \|\|	165	else if (((flags & DATA_CONNECTION_COMPLETE) != 0) \|\|
Lines 178-195 Link Here
178	{	178	{
179	/* read in the uuid length */	179	/* read in the uuid length */
180	pBuffer = readUINTFromBuffer(pBuffer, &uuidLength);	180	pBuffer = readUINTFromBuffer(pBuffer, &uuidLength);
181	TPTP_LOG_DEBUG_MSG1("DATA CONNECTION COMPLETE RESPONSE. Connection ID (%d).\n", connectionId) ;	181	TPTP_LOG_DEBUG_MSG1("DATA CONNECTION COMPLETE RESPONSE. Connection ID (%d).", connectionId) ;
182	}	182	}
183	else	183	else
184	{	184	{
185	TPTP_LOG_DEBUG_MSG1("CONSOLE CONNECTION COMPLETE RESPONSE. Connection ID (%d).\n", connectionId) ;	185	TPTP_LOG_DEBUG_MSG1("CONSOLE CONNECTION COMPLETE RESPONSE. Connection ID (%d).", connectionId) ;
186	}	186	}
187		187
188	}	188	}
189		189
190	else if ((flags & CONNECTION_REFUSED) != 0)	190	else if ((flags & CONNECTION_REFUSED) != 0)
191	{	191	{
192	TPTP_LOG_DEBUG_MSG("CONNECTION REFUSED RESPONSE. \n") ;	192	TPTP_LOG_DEBUG_MSG("CONNECTION REFUSED RESPONSE.") ;
193	}	193	}
194		194
195	else	195	else
Lines 220-226 Link Here
220	/* end with a NULL byte for using with printf */	220	/* end with a NULL byte for using with printf */
221	strncpy(copyCmd, pCmd, payLoadLength) ;	221	strncpy(copyCmd, pCmd, payLoadLength) ;
222	copyCmd[payLoadLength] = '\0' ;	222	copyCmd[payLoadLength] = '\0' ;
223	TPTP_LOG_DEBUG_MSG1("COMMAND: %s. \n", copyCmd) ;	223	TPTP_LOG_DEBUG_MSG1("COMMAND: %s.", copyCmd) ;
224	}	224	}
225		225
226	return 0 ;	226	return 0 ;
Lines 265-271 Link Here
265	strcpy(copyCmd, "") ;	265	strcpy(copyCmd, "") ;
266	}	266	}
267		267
268	TPTP_LOG_DEBUG_MSG2("COMMAND: dataPathType(%d) uid(%s). \n",	268	TPTP_LOG_DEBUG_MSG2("COMMAND: dataPathType(%d) uid(%s).",
269	dataPathType, copyCmd) ;	269	dataPathType, copyCmd) ;
270	}	270	}
271		271

Lines 55-66 Link Here

(-)src-native-new/src/transport/transportSupport/TransportSupportSharedMemExt.c (-2 / +2 lines)
55		55
56	rc = ra_attachToShm((char *) pMemName, & pShmHdl);	56	rc = ra_attachToShm((char *) pMemName, & pShmHdl);
57		57
58	TPTP_LOG_DEBUG_MSG2("ipcMemOpen: mem_name(%s) rc(%d) \n", pMemName, rc) ;	58	TPTP_LOG_DEBUG_MSG2("ipcMemOpen: mem_name(%s) rc(%d)", pMemName, rc) ;
59		59
60	if (rc == 0)	60	if (rc == 0)
61	{	61	{
62	pBlockInfo->pRamboBlock = (LPVOID) pShmHdl ;	62	pBlockInfo->pRamboBlock = (LPVOID) pShmHdl ;
63	TPTP_LOG_DEBUG_MSG2("ipcMemOpen: block(%x) handle(%x) \n", pBlockInfo, pBlockInfo->pRamboBlock) ;	63	TPTP_LOG_DEBUG_MSG2("ipcMemOpen: block(%x) handle(%x)", pBlockInfo, pBlockInfo->pRamboBlock) ;
64	}	64	}
65		65
66	return ( rc ) ;	66	return ( rc ) ;

Lines 275-281 Link Here

(-)src-native-new/src/transport/transportSupport/TransportSupportSocket.c (-7 / +7 lines)
275		275
276	if (rc < 0)	276	if (rc < 0)
277	{	277	{
278	TPTP_LOG_ERROR_MSG("Error: cannot bind to the socket. \n") ;	278	TPTP_LOG_ERROR_MSG("Error: cannot bind to the socket.") ;
279	//printCurrentSysError() ;	279	//printCurrentSysError() ;
280	}	280	}
281	else	281	else
Lines 285-291 Link Here
285	result = setHandleInherited((HANDLE)sock) ;	285	result = setHandleInherited((HANDLE)sock) ;
286	if ( result == 0 )	286	if ( result == 0 )
287	{	287	{
288	TPTP_LOG_ERROR_MSG("Error: unable to set handle info. \n") ;	288	TPTP_LOG_ERROR_MSG("Error: unable to set handle info.") ;
289	rc = - 1;	289	rc = - 1;
290	}	290	}
291	else	291	else
Lines 293-299 Link Here
293	rc = listen(sock, 100) ;	293	rc = listen(sock, 100) ;
294	if (rc < 0)	294	if (rc < 0)
295	{	295	{
296	TPTP_LOG_ERROR_MSG("Error: unable to listen. \n") ;	296	TPTP_LOG_ERROR_MSG("Error: unable to listen.") ;
297	}	297	}
298	}	298	}
299	}	299	}
Lines 345-351 Link Here
345	int enable=1;	345	int enable=1;
346	struct linger linger;	346	struct linger linger;
347		347
348	TPTP_LOG_DEBUG_MSG("Ready to accept next socket connection request...\n") ;	348	TPTP_LOG_DEBUG_MSG("Ready to accept next socket connection request...") ;
349		349
350	clientSock = accept(serverSock, (struct sockaddr * ) & clientAddress, (int *)&clientLen);	350	clientSock = accept(serverSock, (struct sockaddr * ) & clientAddress, (int *)&clientLen);
351		351
Lines 353-363 Link Here
353		353
354	if ( rc == 0 )	354	if ( rc == 0 )
355	{	355	{
356	TPTP_LOG_ERROR_MSG("Error: unable to accept connection.\n") ;	356	TPTP_LOG_ERROR_MSG("Error: unable to accept connection.") ;
357	}	357	}
358	else	358	else
359	{	359	{
360	TPTP_LOG_DEBUG_MSG("Accept new socket connection request.\n");	360	TPTP_LOG_DEBUG_MSG("Accept new socket connection request.");
361	}	361	}
362		362
363		363
Lines 407-413 Link Here
407	struct linger linger;	407	struct linger linger;
408	int loopcnt = 0 ;	408	int loopcnt = 0 ;
409		409
410	TPTP_LOG_DEBUG_MSG("connectToTCPServer...\n") ;	410	TPTP_LOG_DEBUG_MSG("connectToTCPServer...") ;
411		411
412	sock = socket(PF_INET, SOCK_STREAM, 0);	412	sock = socket(PF_INET, SOCK_STREAM, 0);
413		413

Lines 132-138 Link Here

(-)src-native-new/src/CmdExtractor/MsgParser.cpp (-3 / +3 lines)
132		132
133	}	133	}
134		134
135	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Cmd in message \"%s\"\n", (msg?msg:"null"));	135	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Cmd in message \"%s\"", (msg?msg:"null"));
136	return -1;	136	return -1;
137	}	137	}
138	catch (const XMLException& error)	138	catch (const XMLException& error)
Lines 140-151 Link Here
140	char *errmesg = XMLString::transcode(error.getMessage());	140	char *errmesg = XMLString::transcode(error.getMessage());
141	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());	141	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
142	XMLString::release(&errmesg);	142	XMLString::release(&errmesg);
143	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Cmd in message \"%s\"\n", (msg?msg:"null"));	143	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Cmd in message \"%s\"", (msg?msg:"null"));
144	return -1;	144	return -1;
145	}	145	}
146	catch(...)	146	catch(...)
147	{	147	{
148	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Cmd in message \"%s\"\n", (msg?msg:"null"));	148	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Cmd in message \"%s\"", (msg?msg:"null"));
149	return -1;	149	return -1;
150	}	150	}
151	}	151	}

Lines 92-98 Link Here

(-)src-native-new/src/shared/processControlUtil/ProcessControlUtil.c (-10 / +10 lines)
92	if ( cloneLstnr == NULL )	92	if ( cloneLstnr == NULL )
93	{	93	{
94	/* TODO: Report an internal error */	94	/* TODO: Report an internal error */
95	TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc listener obj\n");	95	TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc listener obj");
96	return NULL;	96	return NULL;
97	}	97	}
98		98
Lines 279-285 Link Here
279	if ( cloneProc == NULL )	279	if ( cloneProc == NULL )
280	{	280	{
281	/* TODO: Report an internal error */	281	/* TODO: Report an internal error */
282	TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc proc obj\n");	282	TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc proc obj");
283	return NULL;	283	return NULL;
284	}	284	}
285		285
Lines 362-368 Link Here
362	if ( cloneProc->monitors == NULL )	362	if ( cloneProc->monitors == NULL )
363	{	363	{
364	/* TODO: Report an internal error */	364	/* TODO: Report an internal error */
365	TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc listener obj\n");	365	TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc listener obj");
366	return NULL;	366	return NULL;
367	}	367	}
368	tptp_list_clone(cloneProc->monitors, proc->monitors);	368	tptp_list_clone(cloneProc->monitors, proc->monitors);
Lines 513-519 Link Here
513	if (STAT(dir, &statBuf) != 0) //Does it exist?	513	if (STAT(dir, &statBuf) != 0) //Does it exist?
514	{	514	{
515	//perror("PCUTil");	515	//perror("PCUTil");
516	TPTP_LOG_DEBUG_MSG1("PCUtil: Invalid dir=%s\n", dir);	516	TPTP_LOG_DEBUG_MSG1("PCUtil: Invalid dir=%s", dir);
517	*errCode = TPTP_PC_DIR_NOT_FOUND;	517	*errCode = TPTP_PC_DIR_NOT_FOUND;
518	return validDir;	518	return validDir;
519	}	519	}
Lines 535-541 Link Here
535	{	535	{
536	//Null argument	536	//Null argument
537	*errCode = TPTP_UNEXPECTED_NULL_ARG;	537	*errCode = TPTP_UNEXPECTED_NULL_ARG;
538	TPTP_LOG_DEBUG_MSG("PCUtil: Error - Arg dir is a NULL value\n");	538	TPTP_LOG_DEBUG_MSG("PCUtil: Error - Arg dir is a NULL value");
539	}	539	}
540		540
541	return validDir;	541	return validDir;
Lines 557-563 Link Here
557	if (STAT(dir, &statBuf) != 0) //Does it exist?	557	if (STAT(dir, &statBuf) != 0) //Does it exist?
558	{	558	{
559	//perror("PCUTil");	559	//perror("PCUTil");
560	TPTP_LOG_DEBUG_MSG1("PCUtil: Invalid dir=%s\n", dir);	560	TPTP_LOG_DEBUG_MSG1("PCUtil: Invalid dir=%s", dir);
561	*errCode = TPTP_PC_DIR_NOT_FOUND;	561	*errCode = TPTP_PC_DIR_NOT_FOUND;
562	return validDir;	562	return validDir;
563	}	563	}
Lines 579-585 Link Here
579	{	579	{
580	//Null argument	580	//Null argument
581	*errCode = TPTP_UNEXPECTED_NULL_ARG;	581	*errCode = TPTP_UNEXPECTED_NULL_ARG;
582	TPTP_LOG_DEBUG_MSG("PCUtil: Error - Arg dir is a NULL value\n");	582	TPTP_LOG_DEBUG_MSG("PCUtil: Error - Arg dir is a NULL value");
583	}	583	}
584		584
585	return validDir;	585	return validDir;
Lines 606-612 Link Here
606		606
607	TPTP_HANDLE consoleChild[3];	607	TPTP_HANDLE consoleChild[3];
608		608
609	TPTP_LOG_DEBUG_MSG1("createProc: Called on to create process: %s\n", proc->appName);	609	TPTP_LOG_DEBUG_MSG1("createProc: Called on to create process: %s", proc->appName);
610		610
611	// If given a non-null console pointer, then pass the handles to the process we are creating	611	// If given a non-null console pointer, then pass the handles to the process we are creating
612	if (console)	612	if (console)
Lines 640-646 Link Here
640		640
641	// Successfully launched the application, fillin tptp_process_t struct	641	// Successfully launched the application, fillin tptp_process_t struct
642	// which is returned to the caller.	642	// which is returned to the caller.
643	TPTP_LOG_DEBUG_MSG1("createProc: SUCCESSFULLY created process: %lu\n", (unsigned long)proc->pid);	643	TPTP_LOG_DEBUG_MSG1("createProc: SUCCESSFULLY created process: %lu", (unsigned long)proc->pid);
644	*errCode = 0;	644	*errCode = 0;
645		645
646	#ifdef _WIN32	646	#ifdef _WIN32
Lines 649-655 Link Here
649	proc->hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, proc->pid);	649	proc->hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, proc->pid);
650	if (proc->hProcess == 0)	650	if (proc->hProcess == 0)
651	{	651	{
652	TPTP_LOG_DEBUG_MSG("OpenProcess() call failed. \n");	652	TPTP_LOG_DEBUG_MSG("OpenProcess() call failed.");
653	//printCurrentSysError();	653	//printCurrentSysError();
654	*errCode = TPTP_PC_OPEN_PROC_FAILED;	654	*errCode = TPTP_PC_OPEN_PROC_FAILED;
655	return -1;	655	return -1;

Lines 139-151 Link Here

(-)src-native-new/src/agents/agentBase/DataProviderImpl.cpp (-3 / +3 lines)
139		139
140	DataProviderImpl * pProvider = (DataProviderImpl *) dataConn->pObj ;	140	DataProviderImpl * pProvider = (DataProviderImpl *) dataConn->pObj ;
141		141
142	// TPTP_LOG_DEBUG_MSG1(this, "Agent: establishDataPath() receives %d bytes \n", dataLen) ;	142	// TPTP_LOG_DEBUG_MSG1(this, "Agent: establishDataPath() receives %d bytes", dataLen) ;
143		143
144	ipcCloseMem(&dataConn->agentMemBlockInfo);	144	ipcCloseMem(&dataConn->agentMemBlockInfo);
145		145
146	if (dataConn->_isEstablished == false)	146	if (dataConn->_isEstablished == false)
147	{	147	{
148	// TPTP_LOG_DEBUG_MSG(this, "---> SharedMemDataPathProcessorFunc calls doEstablish() \n") ;	148	// TPTP_LOG_DEBUG_MSG(this, "---> SharedMemDataPathProcessorFunc calls doEstablish()") ;
149		149
150	pProvider->doEstablish((char *) pData, dataLen, dataConn) ;	150	pProvider->doEstablish((char *) pData, dataLen, dataConn) ;
151	//TODO: Can't say it is truly established at this point since we've not	151	//TODO: Can't say it is truly established at this point since we've not
Lines 157-163 Link Here
157	}	157	}
158	else	158	else
159	{	159	{
160	// TPTP_LOG_DEBUG_MSG(this, "---> SharedMemDataPathProcessorFunc calls receiveData() \n") ;	160	// TPTP_LOG_DEBUG_MSG(this, "---> SharedMemDataPathProcessorFunc calls receiveData()") ;
161	pProvider->processData(dataConn->clientid, (char*)pData, 0, dataLen);	161	pProvider->processData(dataConn->clientid, (char*)pData, 0, dataLen);
162	//pProvider->receiveData(dataConn->clientid, (char*)pData, dataLen);	162	//pProvider->receiveData(dataConn->clientid, (char*)pData, dataLen);
163	}	163	}

Lines 1499-1505 Link Here

(-)src-native-new/src/shared/tptpConfig/TPTPConfig.cpp (-20 / +20 lines)
1499		1499
1500	}	1500	}
1501		1501
1502	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing plugin config file \"%s\"\n", (XMLfilename?XMLfilename:"null"));	1502	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing plugin config file \"%s\"", (XMLfilename?XMLfilename:"null"));
1503	return -1;	1503	return -1;
1504	}	1504	}
1505	catch (const XMLException& error)	1505	catch (const XMLException& error)
Lines 1507-1518 Link Here
1507	char *errmesg = XMLString::transcode(error.getMessage());	1507	char *errmesg = XMLString::transcode(error.getMessage());
1508	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());	1508	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
1509	XMLString::release(&errmesg);	1509	XMLString::release(&errmesg);
1510	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing plugin config file \"%s\"\n", (XMLfilename?XMLfilename:"null"));	1510	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing plugin config file \"%s\"", (XMLfilename?XMLfilename:"null"));
1511	return -1;	1511	return -1;
1512	}	1512	}
1513	catch(...)	1513	catch(...)
1514	{	1514	{
1515	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing plugin config file \"%s\"\n", (XMLfilename?XMLfilename:"null"));	1515	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing plugin config file \"%s\"", (XMLfilename?XMLfilename:"null"));
1516	return -1;	1516	return -1;
1517	}	1517	}
1518	}	1518	}
Lines 1942-1948 Link Here
1942		1942
1943	}	1943	}
1944		1944
1945	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing AC config file \"%s\"\n", (acConfigFile?acConfigFile:"null"));	1945	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing AC config file \"%s\"", (acConfigFile?acConfigFile:"null"));
1946	return -1;	1946	return -1;
1947	}	1947	}
1948	catch (const XMLException& error)	1948	catch (const XMLException& error)
Lines 1950-1961 Link Here
1950	char *errmesg = XMLString::transcode(error.getMessage());	1950	char *errmesg = XMLString::transcode(error.getMessage());
1951	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());	1951	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
1952	XMLString::release(&errmesg);	1952	XMLString::release(&errmesg);
1953	printf("XML Exception occurred while parsing AC config file \"%s\"\n", (acConfigFile?acConfigFile:"null"));	1953	printf("XML Exception occurred while parsing AC config file \"%s\"", (acConfigFile?acConfigFile:"null"));
1954	return -1;	1954	return -1;
1955	}	1955	}
1956	catch(...)	1956	catch(...)
1957	{	1957	{
1958	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing AC config file \"%s\"\n", (acConfigFile?acConfigFile:"null"));	1958	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing AC config file \"%s\"", (acConfigFile?acConfigFile:"null"));
1959	return -1;	1959	return -1;
1960	}	1960	}
1961	}	1961	}
Lines 2295-2301 Link Here
2295		2295
2296	}	2296	}
2297		2297
2298	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing agent metadata in file \"%s\"\n", (agentConfigFileName?agentConfigFileName:"null"));	2298	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing agent metadata in file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
2299	return -1;	2299	return -1;
2300	}	2300	}
2301	catch (const XMLException& error)	2301	catch (const XMLException& error)
Lines 2303-2314 Link Here
2303	char *errmesg = XMLString::transcode(error.getMessage());	2303	char *errmesg = XMLString::transcode(error.getMessage());
2304	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());	2304	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
2305	XMLString::release(&errmesg);	2305	XMLString::release(&errmesg);
2306	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing agent metadata in file \"%s\"\n", (agentConfigFileName?agentConfigFileName:"null"));	2306	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing agent metadata in file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
2307	return -1;	2307	return -1;
2308	}	2308	}
2309	catch(...)	2309	catch(...)
2310	{	2310	{
2311	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing agent metadata in file \"%s\"\n", (agentConfigFileName?agentConfigFileName:"null"));	2311	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing agent metadata in file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
2312	return -1;	2312	return -1;
2313	}	2313	}
2314	}	2314	}
Lines 2683-2689 Link Here
2683		2683
2684	}	2684	}
2685		2685
2686	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Application string \"%s\"\n", (applicationString?applicationString:"null"));	2686	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Application string \"%s\"", (applicationString?applicationString:"null"));
2687	return -1;	2687	return -1;
2688	}	2688	}
2689	catch (const XMLException& error)	2689	catch (const XMLException& error)
Lines 2691-2702 Link Here
2691	char *errmesg = XMLString::transcode(error.getMessage());	2691	char *errmesg = XMLString::transcode(error.getMessage());
2692	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());	2692	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
2693	XMLString::release(&errmesg);	2693	XMLString::release(&errmesg);
2694	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Application string \"%s\"\n", (applicationString?applicationString:"null"));	2694	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Application string \"%s\"", (applicationString?applicationString:"null"));
2695	return -1;	2695	return -1;
2696	}	2696	}
2697	catch(...)	2697	catch(...)
2698	{	2698	{
2699	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Application string \"%s\"\n", (applicationString?applicationString:"null"));	2699	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Application string \"%s\"", (applicationString?applicationString:"null"));
2700	return -1;	2700	return -1;
2701	}	2701	}
2702	}	2702	}
Lines 3038-3044 Link Here
3038		3038
3039	}	3039	}
3040		3040
3041	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing ApplicationAliases string \"%s\"\n", (applicationString?applicationString:"null"));	3041	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing ApplicationAliases string \"%s\"", (applicationString?applicationString:"null"));
3042	return -1;	3042	return -1;
3043	}	3043	}
3044	catch (const XMLException& error)	3044	catch (const XMLException& error)
Lines 3046-3057 Link Here
3046	char *errmesg = XMLString::transcode(error.getMessage());	3046	char *errmesg = XMLString::transcode(error.getMessage());
3047	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());	3047	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
3048	XMLString::release(&errmesg);	3048	XMLString::release(&errmesg);
3049	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing ApplicationAliases string \"%s\"\n", (applicationString?applicationString:"null"));	3049	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing ApplicationAliases string \"%s\"", (applicationString?applicationString:"null"));
3050	return -1;	3050	return -1;
3051	}	3051	}
3052	catch(...)	3052	catch(...)
3053	{	3053	{
3054	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing ApplicationAliases string \"%s\"\n", (applicationString?applicationString:"null"));	3054	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing ApplicationAliases string \"%s\"", (applicationString?applicationString:"null"));
3055	return -1;	3055	return -1;
3056	}	3056	}
3057	}	3057	}
Lines 3714-3721 Link Here
3714	strcpy(customData->name, gchnodename);	3714	strcpy(customData->name, gchnodename);
3715	customData->value = temp;	3715	customData->value = temp;
3716	tptp_list_add(&agentCustomDataList, (void *)customData);	3716	tptp_list_add(&agentCustomDataList, (void *)customData);
3717	TPTP_LOG_DEBUG_MSG1(pAgent, "Custom Node Name - %s\n", customData->name);	3717	TPTP_LOG_DEBUG_MSG1(pAgent, "Custom Node Name - %s", customData->name);
3718	TPTP_LOG_DEBUG_MSG1(pAgent, "Custom Node Value - %s\n", customData->value);	3718	TPTP_LOG_DEBUG_MSG1(pAgent, "Custom Node Value - %s", customData->value);
3719		3719
3720	XMLString::release(&gchnodename);	3720	XMLString::release(&gchnodename);
3721	}	3721	}
Lines 3750-3756 Link Here
3750		3750
3751	}	3751	}
3752		3752
3753	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing AgentConfig file \"%s\"\n", (agentConfigFileName?agentConfigFileName:"null"));	3753	TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing AgentConfig file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
3754	return -1;	3754	return -1;
3755	}	3755	}
3756	catch (const XMLException& error)	3756	catch (const XMLException& error)
Lines 3758-3769 Link Here
3758	char *errmesg = XMLString::transcode(error.getMessage());	3758	char *errmesg = XMLString::transcode(error.getMessage());
3759	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());	3759	TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
3760	XMLString::release(&errmesg);	3760	XMLString::release(&errmesg);
3761	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing AgentConfig file \"%s\"\n", (agentConfigFileName?agentConfigFileName:"null"));	3761	TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing AgentConfig file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
3762	return -1;	3762	return -1;
3763	}	3763	}
3764	catch(...)	3764	catch(...)
3765	{	3765	{
3766	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing AgentConfig file \"%s\"\n", (agentConfigFileName?agentConfigFileName:"null"));	3766	TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing AgentConfig file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
3767	return -1;	3767	return -1;
3768	}	3768	}
3769	}*/	3769	}*/