Changeset 178 in flair-src for trunk/lib/FlairSensorActuator/src

Timestamp:

May 19, 2017, 4:15:52 PM (8 years ago)

Author:

Bayard Gildas

Message:

Change Udp socket object name (from "Socket" to "UdpSocket")

Location:

trunk/lib/FlairSensorActuator/src

Files:

• EmulatedController.cpp (modified) (1 diff)
• HostEthController.cpp (modified) (2 diffs)
• HostEthController.h (modified) (2 diffs)
• TargetEthController.cpp (modified) (2 diffs)
• TargetEthController.h (modified) (2 diffs)

trunk/lib/FlairSensorActuator/src/EmulatedController.cpp

@@ -14 +14 @@
 #include <Controller.h>
 #include <TcpSocket.h>
-#include <Socket.h>
+#include <UdpSocket.h>
 #include <cstring>
 #include <string>

trunk/lib/FlairSensorActuator/src/HostEthController.cpp

@@ -26 +26 @@
 #include <TargetController.h>
 #include <TcpSocket.h>
-#include <Socket.h>
+#include <UdpSocket.h>
 #include <cstring>
 #include <string>
@@ -54 +54 @@
   controlSocket = new TcpSocket((Thread *)this, "eth controller control socket",
                                 blocking, !blocking);
-  dataSocket = new Socket((Thread *)this, "eth controller data socket",
+  dataSocket = new UdpSocket((Thread *)this, "eth controller data socket",
                           _address + ":" + std::to_string(_port + 1));
   dataSender =

trunk/lib/FlairSensorActuator/src/HostEthController.h

@@ -28 +28 @@
 class cvmatrix;
 class TcpSocket;
-class Socket;
+class UdpSocket;
 class Mutex;
 }
@@ -64 +64 @@
   std::string controllerName;
   core::TcpSocket *controlSocket; // connection to the target
-  core::Socket *dataSocket;
+  core::UdpSocket *dataSocket;
   std::string targetAddress;
   int targetPort;

trunk/lib/FlairSensorActuator/src/TargetEthController.cpp

@@ -21 +21 @@
 #include <FrameworkManager.h>
 #include <TcpSocket.h>
-#include <Socket.h>
+#include <UdpSocket.h>
 #include <cstring>
 #include <string>
@@ -44 +44 @@
       new TcpSocket(getFrameworkManager(), "TEC_listening_socket", blocking, blocking);
   dataSocket =
-      new Socket(getFrameworkManager(), "TEC_data_socket", _port + 1); // receiving side
+      new UdpSocket(getFrameworkManager(), "TEC_data_socket", _port + 1); // receiving side
 }
 

trunk/lib/FlairSensorActuator/src/TargetEthController.h

@@ -29 +29 @@
 class cvmatrix;
 class TcpSocket;
-class Socket;
+class UdpSocket;
 }
 namespace gui {
@@ -78 +78 @@
   int listeningPort;
   core::TcpSocket *controlSocket = NULL;
-  core::Socket *dataSocket;
+  core::UdpSocket *dataSocket;
   std::string *axisName = NULL;
   std::string *buttonName = NULL;