Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 17:41:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup NULL comparisons in AgentList

Browse source
This commit is contained in:
Stephen Birarda 2013-06-04 17:29:33 -07:00
parent 7f486c351f
commit 6bf6d5a28e
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libraries/shared/src/AgentList.cpp
View file

@ -40,7 +40,7 @@ bool pingUnknownAgentThreadStopFlag = false;
AgentList* AgentList::_sharedInstance = NULL; AgentList* AgentList::_sharedInstance = NULL;
AgentList* AgentList::createInstance(char ownerType, unsigned int socketListenPort) { AgentList* AgentList::createInstance(char ownerType, unsigned int socketListenPort) {
if (_sharedInstance == NULL) { if (!_sharedInstance) {
_sharedInstance = new AgentList(ownerType, socketListenPort); _sharedInstance = new AgentList(ownerType, socketListenPort);
} else { } else {
printLog("AgentList createInstance called with existing instance.\n"); printLog("AgentList createInstance called with existing instance.\n");
@ -50,7 +50,7 @@ AgentList* AgentList::createInstance(char ownerType, unsigned int socketListenPo
} }
AgentList* AgentList::getInstance() { AgentList* AgentList::getInstance() {
if (_sharedInstance == NULL) { if (!_sharedInstance) {
printLog("AgentList getInstance called before call to createInstance. Returning NULL pointer.\n"); printLog("AgentList getInstance called before call to createInstance. Returning NULL pointer.\n");
} }
@ -150,14 +150,12 @@ int AgentList::updateAgentWithData(sockaddr *senderAddress, unsigned char *packe
int AgentList::updateAgentWithData(Agent *agent, unsigned char *packetData, int dataBytes) { int AgentList::updateAgentWithData(Agent *agent, unsigned char *packetData, int dataBytes) {
agent->setLastHeardMicrostamp(usecTimestampNow()); agent->setLastHeardMicrostamp(usecTimestampNow());
if (agent->getActiveSocket() != NULL) { if (agent->getActiveSocket()) {
agent->recordBytesReceived(dataBytes); agent->recordBytesReceived(dataBytes);
} }
if (agent->getLinkedData() == NULL) { if (!agent->getLinkedData() && linkedDataCreateCallback) {
if (linkedDataCreateCallback != NULL) { linkedDataCreateCallback(agent);
linkedDataCreateCallback(agent);
}
} }
return agent->getLinkedData()->parseData(packetData, dataBytes); return agent->getLinkedData()->parseData(packetData, dataBytes);
@ -165,7 +163,7 @@ int AgentList::updateAgentWithData(Agent *agent, unsigned char *packetData, int
Agent* AgentList::agentWithAddress(sockaddr *senderAddress) { Agent* AgentList::agentWithAddress(sockaddr *senderAddress) {
for(AgentList::iterator agent = begin(); agent != end(); agent++) { for(AgentList::iterator agent = begin(); agent != end(); agent++) {
if (agent->getActiveSocket() != NULL && socketMatch(agent->getActiveSocket(), senderAddress)) { if (agent->getActiveSocket() && socketMatch(agent->getActiveSocket(), senderAddress)) {
return &(*agent); return &(*agent);
} }
} }
@ -216,7 +214,7 @@ int AgentList::processDomainServerList(unsigned char *packetData, size_t dataByt
Agent* AgentList::addOrUpdateAgent(sockaddr* publicSocket, sockaddr* localSocket, char agentType, uint16_t agentId) { Agent* AgentList::addOrUpdateAgent(sockaddr* publicSocket, sockaddr* localSocket, char agentType, uint16_t agentId) {
AgentList::iterator agent = end(); AgentList::iterator agent = end();
if (publicSocket != NULL) { if (publicSocket) {
for (agent = begin(); agent != end(); agent++) { for (agent = begin(); agent != end(); agent++) {
if (agent->matches(publicSocket, localSocket, agentType)) { if (agent->matches(publicSocket, localSocket, agentType)) {
// we already have this agent, stop checking // we already have this agent, stop checking
@ -327,8 +325,7 @@ void *pingUnknownAgents(void *args) {
for(AgentList::iterator agent = agentList->begin(); for(AgentList::iterator agent = agentList->begin();
agent != agentList->end(); agent != agentList->end();
agent++) { agent++) {
if (agent->getActiveSocket() == NULL if (!agent->getActiveSocket() && agent->getPublicSocket() && agent->getLocalSocket()) {
&& (agent->getPublicSocket() != NULL && agent->getLocalSocket() != NULL)) {
// ping both of the sockets for the agent so we can figure out // ping both of the sockets for the agent so we can figure out
// which socket we can use // which socket we can use
agentList->getAgentSocket()->send(agent->getPublicSocket(), &PACKET_HEADER_PING, 1); agentList->getAgentSocket()->send(agent->getPublicSocket(), &PACKET_HEADER_PING, 1);