Diff: TCPSocket.cpp

Branch:

api-changes

Revision:

25:ed7b2a52e8ac

Parent:

24:a5e959bdd2dd

Child:

28:163fbe3263f4

--- a/TCPSocket.cpp	Thu Feb 18 04:09:00 2016 -0600
+++ b/TCPSocket.cpp	Thu Feb 18 06:01:55 2016 -0600
@@ -16,51 +16,19 @@
 
 #include "TCPSocket.h"
 
-TCPSocket::TCPSocket(NetworkInterface *iface, const char *ip, uint16_t port)
-  : _iface(iface) {
-    _socket = _iface->createSocket(SOCK_TCP);
-
-    if (ip)   setIPAddress(ip);
-    if (port) setPort(port);
-}
-
-TCPSocket::~TCPSocket() {
-    _iface->destroySocket(_socket);
-}
-
-void TCPSocket::setURL(const char *url) {
-    return _socket->setURL(url);
-}
-
-void TCPSocket::setIPAddress(const char *ip) {
-    return _socket->setIPAddress(ip);
-}
-
-void TCPSocket::setPort(uint16_t port) {
-    return _socket->setPort(port);
-}
-
-const char *TCPSocket::getIPAddress() {
-    return _socket->getIPAddress();
-}
-
-uint16_t TCPSocket::getPort() {
-    return _socket->getPort();
+TCPSocket::TCPSocket(NetworkInterface *iface, const char *url, uint16_t port)
+  : Socket(iface, SOCK_TCP, url, port) {
 }
 
 int32_t TCPSocket::open() {
-    return _socket->open();
+    SocketInterface *s = _get_socket();
+    if (!s) return -2;
+    return s->close();
 }
 
 int32_t TCPSocket::close() {
-    return _socket->close();
+    SocketInterface *s = _get_socket();
+    if (!s) return -2;
+    return s->close();
 }
 
-int32_t TCPSocket::send(const void *data, uint32_t len, uint32_t timeout_ms) {
-    return _socket->send(data, len, timeout_ms);
-}
-
-int32_t TCPSocket::recv(void *data, uint32_t len, uint32_t timeout_ms) {
-    return _socket->recv(data, len, timeout_ms);
-}
-