Renamed TransportSocketConnection to TransportSocketLink

Removed TransportSocketEndpoint.cpp (no entries except ctor and dtor)

src/daemon/net/TransportSocket.cpp

@@ -24,9 +24,9 @@ TransportSocket::~TransportSocket(){};
 MessageBundle TransportSocket::createMessageBundle(const std::string message,
 		TransportSocketEndpoint::pointer endpoint) {
 	MessageBundle bundle;
-	TransportSocketConnection socket_connection(this, endpoint);
+	TransportSocketLink socket_connection(this, endpoint);
 
-	bundle.socket_connection = socket_connection;
+	bundle.socket_link = socket_connection;
 	bundle.message = message;
 
 	return bundle;

src/daemon/net/TransportSocket.h

@@ -15,7 +15,7 @@
 #ifndef MESSAGESOCKET_H_
 #define MESSAGESOCKET_H_
 
-#include "TransportSocketConnection.h"
+#include "TransportSocketLink.h"
 
 #include <string>
 #include <set>

src/daemon/net/TransportSocketEndpoint.h

@@ -23,8 +23,8 @@ namespace net {
 
 class TransportSocketEndpoint {
 public:
-	TransportSocketEndpoint();
-	virtual ~TransportSocketEndpoint();
+	TransportSocketEndpoint(){};
+	virtual ~TransportSocketEndpoint(){};
 
 	typedef std::shared_ptr<TransportSocketEndpoint> pointer;
 

src/daemon/net/TransportSocketConnection.cpp → src/daemon/net/TransportSocketLink.cpp

@@ -14,36 +14,36 @@
 
 #include "TransportSocket.h"
 #include "TransportSocketListener.h"
-#include "TransportSocketConnection.h"
+#include "TransportSocketLink.h"
 
 namespace p2pnet {
 namespace net {
 
-TransportSocketConnection::TransportSocketConnection(TransportSocket* socket, TransportSocketEndpoint::pointer endpoint) : m_socket(socket), m_endpoint_p(endpoint) {}
+TransportSocketLink::TransportSocketLink(TransportSocket* socket, TransportSocketEndpoint::pointer endpoint) : m_socket(socket), m_endpoint_p(endpoint) {}
 
-TransportSocketConnection::~TransportSocketConnection() {}
+TransportSocketLink::~TransportSocketLink() {}
 
-void TransportSocketConnection::asyncReceiveFrom() {
+void TransportSocketLink::asyncReceiveFrom() {
 	m_socket->asyncReceiveFrom(m_endpoint_p);
 }
 
-void TransportSocketConnection::asyncSendTo(const std::string& data) {
+void TransportSocketLink::asyncSendTo(const std::string& data) {
 	m_socket->asyncSendTo(m_endpoint_p, data);
 }
 
-void TransportSocketConnection::waitReceiveFrom() {
+void TransportSocketLink::waitReceiveFrom() {
 	m_socket->waitReceiveFrom(m_endpoint_p);
 }
 
-void TransportSocketConnection::waitSendTo(const std::string& data) {
+void TransportSocketLink::waitSendTo(const std::string& data) {
 	m_socket->waitSendTo(m_endpoint_p, data);
 }
 
-MessageBundle TransportSocketConnection::hereReceiveFrom() {
+MessageBundle TransportSocketLink::hereReceiveFrom() {
 	return m_socket->hereReceiveFrom(m_endpoint_p);
 }
 
-void TransportSocketConnection::hereSendTo(const std::string& data) {
+void TransportSocketLink::hereSendTo(const std::string& data) {
 	m_socket->hereSendTo(m_endpoint_p, data);
 }
 

src/daemon/net/TransportSocketConnection.h → src/daemon/net/TransportSocketLink.h

@@ -12,8 +12,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TRANSPORTSOCKETCONNECTION_H_
-#define TRANSPORTSOCKETCONNECTION_H_
+#ifndef TRANSPORTSOCKETLINK_H_
+#define TRANSPORTSOCKETLINK_H_
 
 #include "TransportSocketEndpoint.h"
 #include <memory>
@@ -28,12 +28,12 @@ class MessageBundle;
 /*!
  * A class that wraps TransportSocket with a defined endpoint. It is a class that makes sending packets over different sockets more generic.
  */
-class TransportSocketConnection {
+class TransportSocketLink {
 	TransportSocket* m_socket;
 	TransportSocketEndpoint::pointer m_endpoint_p;
 public:
-	TransportSocketConnection(TransportSocket* socket, TransportSocketEndpoint::pointer endpoint);
-	virtual ~TransportSocketConnection();
+	TransportSocketLink(TransportSocket* socket, TransportSocketEndpoint::pointer endpoint);
+	virtual ~TransportSocketLink();
 
 	TransportSocketEndpoint::pointer getEndpointPtr(){return m_endpoint_p;};
 

src/daemon/net/TransportSocketListener.h

@@ -15,7 +15,7 @@
 #ifndef TRANSPORTSOCKETLISTENER_H_
 #define TRANSPORTSOCKETLISTENER_H_
 
-#include "TransportSocketConnection.h"
+#include "TransportSocketLink.h"
 #include <memory>
 #include <string>
 
@@ -24,8 +24,8 @@ namespace net {
 
 class MessageBundle {
 public:
-	MessageBundle() : socket_connection(0, 0){};
-	TransportSocketConnection socket_connection;
+	MessageBundle() : socket_link(0, 0){};
+	TransportSocketLink socket_link;
 
 	std::string message;
 };