Changeset 247 in flair-src for trunk/lib

Timestamp:

May 28, 2018, 6:23:35 PM (7 years ago)

Author:

Sanahuja Guillaume

Message:

improve gcs disconnections

Location:

trunk/lib

Files:

• FlairCore/src/ui_com.cpp (modified) (3 diffs)
• FlairCore/src/unexported/communication.h (modified) (1 diff)
• FlairFilter/src/Pid.cpp (modified) (1 diff)
• FlairFilter/src/Pid.h (modified) (1 diff)

trunk/lib/FlairCore/src/ui_com.cpp

@@ -105 +105 @@
   if (UDT::setsockopt(socket_fd, 0, UDT_RCVTIMEO, &timeout, sizeof(int)) != 0)
     Err("UDT::setsockopt error (UDT_RCVTIMEO)\n");
-
+    /*
+  timeout=-1;
+  if (UDT::setsockopt(socket_fd, 0, UDT_SNDTIMEO, &timeout, sizeof(int)) != 0)
+    Err("UDT::setsockopt error (UDT_SNDTIMEO)\n");
+*/
   bool blocking = true;
   if (UDT::setsockopt(socket_fd, 0, UDT_SNDSYN, &blocking, sizeof(bool)) != 0)
@@ -138 +142 @@
 
   Join();
-
+  
+  char buf=CLOSING_CONNECTION;
+  Send(&buf,1);
+ 
   if (send_buffer != NULL)
     free(send_buffer);
@@ -196 +203 @@
   nb_write = UDT::sendmsg(socket_fd, tosend, size, -1, true);
 #endif // COMPRESS_FRAMES
-  // Printf("write %i %i\n",nb_write,size);
+   //Printf("write %i %i\n",nb_write,size);
   if (nb_write < 0) {
     Err("UDT::sendmsg error (%s)\n", UDT::getlasterror().getErrorMessage());

trunk/lib/FlairCore/src/unexported/communication.h

@@ -12 +12 @@
 #define DATAS_LITTLE_ENDIAN 0x02
 #define DATAS_BIG_ENDIAN 0x03
+#define CLOSING_CONNECTION 0x04
 
+//messages file socket
 #define START_SENDING_FILES 0x10
 #define FILE_INFO_LITTLE_ENDIAN 0x11

trunk/lib/FlairFilter/src/Pid.cpp

@@ -47 +47 @@
 }
 
+float Pid::GetIntegral(void) const { return pimpl_->i; }
+
 void Pid::UpdateFrom(const io_data *data) {
   pimpl_->UpdateFrom(data);

trunk/lib/FlairFilter/src/Pid.h

@@ -58 +58 @@
   */
   void Reset(void);
+  
+   /*!
+  * \brief Get intergral part
+  *
+  * \return current integral part
+  */
+  float GetIntegral(void) const;
+
 
   /*!