[TeamTalk 30]: [567] TeamTalk/Agents/boeingLib: update from darcs

[tk@edam.speech.cs.cmu.edu]

An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20070129/d5759977/attachment.html
-------------- next part --------------
Modified: TeamTalk/Agents/boeingLib/boeing/boeing_converter.cc
===================================================================
--- TeamTalk/Agents/boeingLib/boeing/boeing_converter.cc	2007-01-29 22:27:40 UTC (rev 566)
+++ TeamTalk/Agents/boeingLib/boeing/boeing_converter.cc	2007-01-29 23:07:19 UTC (rev 567)
@@ -170,8 +170,15 @@
     if (debug) 
       printf("   Got request image message\n");
     result.hdr.type = REQ_IMAGE;
-  } else {
-    fprintf(stderr, "Unknown message '%s'\n",mca->action);
+  } else{ 
+    if (debug) 
+      printf("   Got some message, assume action message: '%s'\n",
+	     mca->action);
+    result.hdr.type = CMD_ACTION;
+  
+    printf("Got some message (assume action) '%s'\n",mca->action);
+    //} else{ 
+    // fprintf(stderr, "Unknown message '%s'\n",mca->action);
   }
 
   return (result.hdr.type);

Modified: TeamTalk/Agents/boeingLib/boeing/boeing_map_server.cc
===================================================================
--- TeamTalk/Agents/boeingLib/boeing/boeing_map_server.cc	2007-01-29 22:27:40 UTC (rev 566)
+++ TeamTalk/Agents/boeingLib/boeing/boeing_map_server.cc	2007-01-29 23:07:19 UTC (rev 567)
@@ -65,16 +65,13 @@
     printf("WARNING: mapserver Not connected\n");
     return NULL;
   }
-  //printf("mapserver connected\n");
 
   // is there anything to get?
   if (!sock->isConnected() || !sock->readyForRecv()) 
     return (NULL);
 
   // receive the header...
-  //printf("mapserver about to recv\n");
   int rv = sock->recv(rxdata.buff,sizeof(rxdata));
-  //printf("mapserver got %d bytes\n", rv);
 
   if (rv>0 && rv!=rxdata.hdr.len) {
     printf("WARNING: size mismatch! %i, but packet says %i\n",

Modified: TeamTalk/Agents/boeingLib/boeing/boeing_robot_client.cc
===================================================================
--- TeamTalk/Agents/boeingLib/boeing/boeing_robot_client.cc	2007-01-29 22:27:40 UTC (rev 566)
+++ TeamTalk/Agents/boeingLib/boeing/boeing_robot_client.cc	2007-01-29 23:07:19 UTC (rev 567)
@@ -271,7 +271,7 @@
 
 //=== Receiving ======================================
 
-const MsgRobot* RobotClient::getNextMessage()
+MsgRobot const *RobotClient::getNextMessage()
 {
   // read your socket if there is something available
   // process it *NON-BLOCKING*

Modified: TeamTalk/Agents/boeingLib/boeing/boeing_robot_server.cc
===================================================================
--- TeamTalk/Agents/boeingLib/boeing/boeing_robot_server.cc	2007-01-29 22:27:40 UTC (rev 566)
+++ TeamTalk/Agents/boeingLib/boeing/boeing_robot_server.cc	2007-01-29 23:07:19 UTC (rev 567)
@@ -89,7 +89,6 @@
       printf("WARNING: robotserver Not connected\n");
       return NULL;
     }
-    //printf("robotserver connected\n");
 
     // check the command timeout
     double t=Profiler::getTimeOfDay();
@@ -104,9 +103,7 @@
     }
 
     // receive the header...
-    //printf("robotserver about to recieve\n");
     int rv = socket_s->recv(rxdata.buff,sizeof(rxdata));
-    //printf("robotserver got %d bytes\n", rv);
 
     // do some error checking before going any further
     if (rv>=(int)sizeof(rxdata)) {

Modified: TeamTalk/Agents/boeingLib/boeing/boeing_trader_server.cc
===================================================================
--- TeamTalk/Agents/boeingLib/boeing/boeing_trader_server.cc	2007-01-29 22:27:40 UTC (rev 566)
+++ TeamTalk/Agents/boeingLib/boeing/boeing_trader_server.cc	2007-01-29 23:07:19 UTC (rev 567)
@@ -65,16 +65,13 @@
     printf("WARNING: traderserver Not connected\n");
     return NULL;
   }
-  //printf("traderserver connected\n");
 
   // is there anything to get?
   if (!sock->readyForRecv()) 
     return (NULL);
 
   // receive the header...
-  //printf("traderserver about to recieve\n"); 
   int rv = sock->recv(rxdata.buff,sizeof(rxdata));
-  //printf("traderserver got %d bytes\n", rv);
 
   if (rv > 0 && rv!=rxdata.hdr.len) {
     printf("WARNING: size mismatch! %i, but packet says %i\n",

Modified: TeamTalk/Agents/boeingLib/boeing/boeing_trader_server.h
===================================================================
--- TeamTalk/Agents/boeingLib/boeing/boeing_trader_server.h	2007-01-29 22:27:40 UTC (rev 566)
+++ TeamTalk/Agents/boeingLib/boeing/boeing_trader_server.h	2007-01-29 23:07:19 UTC (rev 567)
@@ -29,7 +29,7 @@
     //=== Rx Methods ======================================
 
     /// get the next message (if there is one). Returns NULL if there is none
-    const MsgTraderServer* getNextMessage();
+    MsgTraderServer const *getNextMessage();
     
     //=== Send Methods ====================================
    

Modified: TeamTalk/Agents/boeingLib/coralshared/memfile.h
===================================================================
--- TeamTalk/Agents/boeingLib/coralshared/memfile.h	2007-01-29 22:27:40 UTC (rev 566)
+++ TeamTalk/Agents/boeingLib/coralshared/memfile.h	2007-01-29 23:07:19 UTC (rev 567)
@@ -6,6 +6,7 @@
 #include <sys/mman.h>
 #include <fcntl.h>
 
+#include <stdint.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -17,7 +18,7 @@
 public:
   memfile() {buf=NULL; len=0;}
   ~memfile() {mclose();}
-
+  
   void *mopen(const char *filename,off_t &length);
   void mclose();
 };