Changeset 364 in flair-src for trunk

Timestamp:

Sep 3, 2020, 1:59:51 PM (4 years ago)

Author:

Sanahuja Guillaume

Message:

modifs

Location:

trunk

Files:

• lib/FlairCore/src/UdpSocket_impl.cpp (modified) (2 diffs)
• tools/VrpnLite/src/VrpnLite.cpp (modified) (1 diff)

trunk/lib/FlairCore/src/UdpSocket_impl.cpp

@@ -251 +251 @@
     for(i=0;i<sock_in_size;i++) {
         if(sock_in[i].sin_port==sock_in_tmp.sin_port) {
-            Printf("match found in former adress\n");
-            *src_id=i;
+            //Printf("match found in former adress\n");
+            if(src_id!=NULL) *src_id=i;
             break;
         }
     }
     if(i==sock_in_size) {
-        Printf("no match found in former adress\n");
+        //Printf("no match found in former adress\n");
         sock_in_size++;
         sock_in=(sockaddr_in*)realloc(sock_in,sock_in_size*sizeof(sockaddr_in));
         sock_in[sock_in_size-1]=sock_in_tmp;
-        *src_id=sock_in_size-1;
+        if(src_id!=NULL) *src_id=sock_in_size-1;
     }
   }
@@ -281 +281 @@
         return -1;
       } else if (src_len != NULL && src != NULL) {
-        if (index + 1 > (int)(*src_len) &&
-            src != NULL) { //+1 pour inserer un 0)
+        if (index + 1 > (int)(*src_len) && src != NULL) { //+1 pour inserer un 0)
           self->Warn("insufficent src size\n");
           return -1;

trunk/tools/VrpnLite/src/VrpnLite.cpp

@@ -77 +77 @@
 
 void VrpnLite::SendObjects(void) const{
- return; 
- int16_t position[3];
+ 
+  int16_t position[3];
   int16_t quaternion[4];
   Time time;
-  char datas[vrpnobjects.size()*(sizeof(position)+sizeof(quaternion))+ sizeof(time)];
-  char *datasPtr=datas;
  
   //for (vector<vector<VrpnObject*>>::const_iterator connection= vrpnobjects_list.begin();connection < vrpnobjects_list.end(); connection++) {
   for (int i=0;i<vrpnobjects_list.size();i++) {
+      char datas[vrpnobjects_list.at(i).size()*(sizeof(position)+sizeof(quaternion))+ sizeof(time)];
+      char *datasPtr=datas;
       for (vector<VrpnObject*>::const_iterator it = vrpnobjects_list.at(i).begin();it < vrpnobjects_list.at(i).end(); it++) {
         Vector3Df objectPosition;