From 5196a1ba1b2b13ebdf22c0c5e980b84696004a98 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 13 Feb 2013 17:52:10 -0800
Subject: [PATCH] remove incorrect threaded agent processing, fix agent
 replacement

---
 mixer/src/main.cpp       | 49 +++++++++++++---------------------------
 shared/src/UDPSocket.cpp |  7 +++---
 shared/src/UDPSocket.h   |  2 +-
 3 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/mixer/src/main.cpp b/mixer/src/main.cpp
index c9efe24b93..d532f521a4 100644
--- a/mixer/src/main.cpp
+++ b/mixer/src/main.cpp
@@ -61,25 +61,29 @@ double usecTimestamp(timeval *time, double addedUsecs = 0) {
     return (time->tv_sec * 1000000.0) + time->tv_usec + addedUsecs;
 }
 
-int addAgent(sockaddr_in agentAddress, void *audioData) {
+int addAgent(sockaddr_in *newAddress, void *audioData) {
     //  Search for agent in list and add if needed 
     int is_new = 0; 
     int i = 0;
 
-    for (i = 0; i < numAgents; i++) {
-        if (strcmp(inet_ntoa(agentAddress.sin_addr), agents[i].address) == 0
-            && ntohs(agentAddress.sin_port) == agents[i].port) {
+    for (i = 0; i < numAgents; i++) {       
+        if (strcmp(inet_ntoa(newAddress->sin_addr), agents[i].address) == 0
+            && ntohs(newAddress->sin_port) == agents[i].port) {
             break;
         }        
     }
     
     if ((i == numAgents) || (agents[i].active == false)) {
         is_new = 1;
+        
+        agents[i].address = new char();
+        strcpy(agents[i].address, inet_ntoa(newAddress->sin_addr));
+    
         agents[i].bufferTransmitted = false;
     }
-
-    agents[i].address = inet_ntoa(agentAddress.sin_addr);
-    agents[i].port = ntohs(agentAddress.sin_port);
+    
+    
+    agents[i].port = ntohs(newAddress->sin_port);
     agents[i].active = true;
     gettimeofday(&agents[i].time, NULL);
 
@@ -218,26 +222,6 @@ void *sendBuffer(void *args)
     pthread_exit(0);  
 }
 
-struct processArgStruct {
-    int16_t *packetData;
-    sockaddr_in agentAddress;
-};
-
-void *processClientPacket(void *args)
-{
-    struct processArgStruct *processArgs = (struct processArgStruct *) args;
-    
-    sockaddr_in agentAddress = processArgs->agentAddress;
-
-    if (addAgent(agentAddress, processArgs->packetData)) {
-        std::cout << "Added agent: " << 
-            inet_ntoa(agentAddress.sin_addr) << " on " <<
-            ntohs(agentAddress.sin_port) << "\n";
-    }    
-
-    pthread_exit(0);
-}
-
 int main(int argc, const char * argv[])
 {
     timeval lastAgentUpdate;
@@ -262,13 +246,12 @@ int main(int argc, const char * argv[])
 
     while (true) {
         if(audioSocket.receive(&agentAddress, packetData, &receivedBytes)) {
-            struct processArgStruct args;
-            args.packetData = packetData;
-            args.agentAddress = agentAddress;
             
-            pthread_t clientProcessThread;
-            pthread_create(&clientProcessThread, NULL, processClientPacket, (void *)&args);
-            pthread_join(clientProcessThread, NULL);
+            if (addAgent(&agentAddress, packetData)) {
+                std::cout << "Added agent: " <<
+                inet_ntoa(agentAddress.sin_addr) << " on " <<
+                ntohs(agentAddress.sin_port) << "\n";
+            }
         }
     }
 
diff --git a/shared/src/UDPSocket.cpp b/shared/src/UDPSocket.cpp
index edff5740ff..dfb80e8c63 100644
--- a/shared/src/UDPSocket.cpp
+++ b/shared/src/UDPSocket.cpp
@@ -13,7 +13,6 @@
 #include <cstdio>
 
 sockaddr_in destSockaddr, senderAddress;
-socklen_t addLength = sizeof(senderAddress);
 
 UDPSocket::UDPSocket(int listeningPort) {
     // create the socket
@@ -55,10 +54,12 @@ bool UDPSocket::receive(void *receivedData, int *receivedBytes) {
 }
 
 //  Receive data on this socket with the address of the sender 
-bool UDPSocket::receive(sockaddr_in *senderAddress, void *receivedData, int *receivedBytes) {
+bool UDPSocket::receive(sockaddr_in *recvAddress, void *receivedData, int *receivedBytes) {
+    
+    socklen_t addressSize = sizeof(&recvAddress);
     
     *receivedBytes = recvfrom(handle, receivedData, MAX_BUFFER_LENGTH_BYTES,
-                              0, (sockaddr *)senderAddress, &addLength);
+                              0, (sockaddr *) recvAddress, &addressSize);
     
     return (*receivedBytes > 0);
 }
diff --git a/shared/src/UDPSocket.h b/shared/src/UDPSocket.h
index b32267af3b..a559b8d847 100644
--- a/shared/src/UDPSocket.h
+++ b/shared/src/UDPSocket.h
@@ -21,7 +21,7 @@ class UDPSocket {
         ~UDPSocket();
         int send(char *destAddress, int destPort, const void *data, int byteLength);
         bool receive(void *receivedData, int *receivedBytes);
-        bool receive(sockaddr_in *senderAddress, void *receivedData, int *receivedBytes);
+        bool receive(sockaddr_in *recvAddress, void *receivedData, int *receivedBytes);
     private:
         int handle;