Merge pull request ros-industrial#109 from ros-industrial/indigo-devel

Pulling in devel changes into release branch
OrebroUniversity · Mar 17, 2015 · 8741ee9 · 8741ee9
2 parents a50a53d + a13d393
commit 8741ee9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/simple_message/include/simple_message/socket/simple_socket.h b/simple_message/include/simple_message/socket/simple_socket.h
@@ -144,7 +144,12 @@ class SimpleSocket : public industrial::smpl_msg_connection::SmplMsgConnection
   /**
      * \brief Constructor
      */
-  SimpleSocket(){}
+  SimpleSocket()
+  {
+    this->setSockHandle(this->SOCKET_FAIL);
+    memset(&this->sockaddr_, 0, sizeof(this->sockaddr_));
+    this->setConnected(false);
+  }
 
   /**
      * \brief Destructor

diff --git a/simple_message/src/socket/tcp_socket.cpp b/simple_message/src/socket/tcp_socket.cpp
@@ -52,16 +52,10 @@ namespace tcp_socket
 {
 
 TcpSocket::TcpSocket()
-// Constructor for UDP socket object
 {
-  this->setSockHandle(this->SOCKET_FAIL);
-  memset(&this->sockaddr_, 0, sizeof(this->sockaddr_));
-  this->setConnected(false);
-
 }
 
 TcpSocket::~TcpSocket()
-// Destructor for UDP socket object
 // Closes socket
 {
   LOG_DEBUG("Destructing TCPSocket");

diff --git a/simple_message/src/socket/udp_socket.cpp b/simple_message/src/socket/udp_socket.cpp
@@ -53,12 +53,9 @@ namespace udp_socket
 UdpSocket::UdpSocket()
 // Constructor for UDP socket object
 {
-  this->setSockHandle(this->SOCKET_FAIL);
-  memset(&this->sockaddr_, 0, sizeof(this->sockaddr_));
   memset(&this->udp_read_buffer_, 0, sizeof(this->udp_read_buffer_));
   udp_read_head_ = this->udp_read_buffer_;
   udp_read_len_ = 0;
-
 }
 
 UdpSocket::~UdpSocket()