From d895665d5f6071df25b775587049c5de48af1c23 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 22 Apr 2013 17:55:48 -0700
Subject: [PATCH] create missing agents sent from the avatar mixer

---
 libraries/shared/src/Agent.cpp     | 32 ++++++++++++++++++++++--------
 libraries/shared/src/AgentList.cpp | 24 +++++++++++++++-------
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/libraries/shared/src/Agent.cpp b/libraries/shared/src/Agent.cpp
index 637a1bc58a..26290e1c1a 100644
--- a/libraries/shared/src/Agent.cpp
+++ b/libraries/shared/src/Agent.cpp
@@ -23,11 +23,19 @@
 using shared_lib::printLog;
 
 Agent::Agent(sockaddr *agentPublicSocket, sockaddr *agentLocalSocket, char agentType, uint16_t thisAgentId) {
-    publicSocket = new sockaddr;
-    memcpy(publicSocket, agentPublicSocket, sizeof(sockaddr));
+    if (agentPublicSocket != NULL) {
+        publicSocket = new sockaddr;
+        memcpy(publicSocket, agentPublicSocket, sizeof(sockaddr));
+    } else {
+        publicSocket = NULL;
+    }
     
-    localSocket = new sockaddr;
-    memcpy(localSocket, agentLocalSocket, sizeof(sockaddr));
+    if (agentLocalSocket != NULL) {
+        localSocket = new sockaddr;
+        memcpy(localSocket, agentLocalSocket, sizeof(sockaddr));
+    } else {
+        localSocket = NULL;
+    }
     
     type = agentType;
     agentId = thisAgentId;
@@ -44,11 +52,19 @@ Agent::Agent(sockaddr *agentPublicSocket, sockaddr *agentLocalSocket, char agent
 }
 
 Agent::Agent(const Agent &otherAgent) {
-    publicSocket = new sockaddr;
-    memcpy(publicSocket, otherAgent.publicSocket, sizeof(sockaddr));
+    if (otherAgent.publicSocket != NULL) {
+        publicSocket = new sockaddr;
+        memcpy(publicSocket, otherAgent.publicSocket, sizeof(sockaddr));
+    } else {
+        publicSocket = NULL;
+    }
     
-    localSocket = new sockaddr;
-    memcpy(localSocket, otherAgent.localSocket, sizeof(sockaddr));
+    if (otherAgent.localSocket != NULL) {
+        localSocket = new sockaddr;
+        memcpy(localSocket, otherAgent.localSocket, sizeof(sockaddr));
+    } else {
+        localSocket = NULL;
+    }
     
     agentId = otherAgent.agentId;
     
diff --git a/libraries/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp
index b89c9aa70c..c1c7ee1f63 100644
--- a/libraries/shared/src/AgentList.cpp
+++ b/libraries/shared/src/AgentList.cpp
@@ -130,11 +130,16 @@ void AgentList::processBulkAgentData(sockaddr *senderAddress, unsigned char *pac
         
         int matchingAgentIndex = indexOfMatchingAgent(agentID);
         
-        if (matchingAgentIndex >= 0) {
+        if (matchingAgentIndex < 0) {
+            // we're missing this agent, we need to add it to the list
+            addOrUpdateAgent(NULL, NULL, AGENT_TYPE_AVATAR, agentID);
             
-            updateAgentWithData(&agents[matchingAgentIndex], packetHolder, numBytesPerAgent + 1);
+            // theoretically if we can lock the vector we could assume this is size - 1
+            matchingAgentIndex = indexOfMatchingAgent(agentID);
         }
         
+        updateAgentWithData(&agents[matchingAgentIndex], packetHolder, numBytesPerAgent + 1);
+        
         currentPosition += numBytesPerAgent;
     }
 }
@@ -219,11 +224,15 @@ int AgentList::updateList(unsigned char *packetData, size_t dataBytes) {
 bool AgentList::addOrUpdateAgent(sockaddr *publicSocket, sockaddr *localSocket, char agentType, uint16_t agentId) {
     std::vector<Agent>::iterator agent;
     
-    for (agent = agents.begin(); agent != agents.end(); agent++) {
-        if (agent->matches(publicSocket, localSocket, agentType)) {
-            // we already have this agent, stop checking
-            break;
+    if (publicSocket != NULL) {
+        for (agent = agents.begin(); agent != agents.end(); agent++) {
+            if (agent->matches(publicSocket, localSocket, agentType)) {
+                // we already have this agent, stop checking
+                break;
+            }
         }
+    } else {
+        agent = agents.end();
     }
     
     if (agent == agents.end()) {
@@ -316,7 +325,8 @@ void *pingUnknownAgents(void *args) {
         for(std::vector<Agent>::iterator agent = agentList->getAgents().begin();
             agent != agentList->getAgents().end();
             agent++) {
-            if (agent->getActiveSocket() == NULL) {
+            if (agent->getActiveSocket() == NULL
+                && (agent->getPublicSocket() != NULL && agent->getLocalSocket() != NULL)) {
                 // ping both of the sockets for the agent so we can figure out
                 // which socket we can use
                 agentList->getAgentSocket().send(agent->getPublicSocket(), &PACKET_HEADER_PING, 1);