Changeset 234 in flair-src for trunk/lib/FlairCore/src/unexported

Timestamp:

Apr 10, 2018, 5:05:27 PM (7 years ago)

Author:

Sanahuja Guillaume

Message:

create file oscket only when necessary

Location:

trunk/lib/FlairCore/src/unexported

Files:

• FrameworkManager_impl.h (modified) (2 diffs)
• communication.h (modified) (1 diff)
• ui_com.h (modified) (1 diff)

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

@@ -82 +82 @@
 private:
   flair::core::FrameworkManager *self;
-  UDTSOCKET file_sock, com_sock;
-  UDTSOCKET GetSocket(std::string address, uint16_t port);
+  UDTSOCKET com_sock;
+  UDTSOCKET GetSocket(void);
   void Run();
-  void SendFile(std::string path, std::string name);
-  void FinishSending(void);
+  void SendFile(UDTSOCKET socket,std::string path, std::string name);
+  void FinishSending(UDTSOCKET socket);
   std::string FileName(flair::core::IODevice *device);
   void SaveXmlChange(char *buf);
@@ -92 +92 @@
   size_t rcv_buf_size;
   char *rcv_buf;
+  std::string address;
+  uint16_t port;
 #ifdef __XENO__
   int CreatePipe(RT_PIPE *fd, std::string name);

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

@@ -6 +6 @@
 #define COMMUNICATION_H
 
-// messages file socket
-#define FILE_INFO_LITTLE_ENDIAN 0x01
-#define FILE_INFO_BIG_ENDIAN 0x02
-#define END 0x03
-
+// messages data socket
 #define XML_HEADER 0x3c
 #define ZLIB_HEADER 0x78
 #define WATCHDOG_HEADER 0x01
+#define DATAS_LITTLE_ENDIAN 0x02
+#define DATAS_BIG_ENDIAN 0x03
 
-#define DATAS_LITTLE_ENDIAN 0xfd
-#define DATAS_BIG_ENDIAN 0xfe
+#define START_SENDING_FILES 0x10
+#define FILE_INFO_LITTLE_ENDIAN 0x11
+#define FILE_INFO_BIG_ENDIAN 0x12
+#define END_SENDING_FILES 0x13
 
 #endif // COMMUNICATION_H

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

@@ -48 +48 @@
   void UnBlock(void);
   bool ConnectionLost(void);
-
+  void CheckConnection(void);
 private:
   ssize_t send_size;