Drop SLIP, Refactor sockets, improve TCP output

Quite a large refactoring of the sockets, TCP and UDP, in order
to improve the ETI-over-TCP output. This can now accept several
simultaneous connections, and requires a throttle.

The SLIP input is gone. The UDP inputs are currently broken.

1 files changed, 19 insertions, 108 deletions

diff --git a/src/InetAddress.cpp b/src/InetAddress.cpp
index 3fc33ad..90cdd06 100644
--- a/src/InetAddress.cpp
+++ b/src/InetAddress.cpp
@@ -1,6 +1,11 @@
 /*
    Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Her Majesty the
    Queen in Right of Canada (Communications Research Center Canada)
+
+   Copyright (C) 2016
+   Matthias P. Braendli, matthias.braendli@mpb.li
+
+    http://www.opendigitalradio.org
    */
 /*
    This file is part of ODR-DabMux.
@@ -22,12 +27,8 @@
 #include "InetAddress.h"
 #include <iostream>
 #include <stdio.h>
-
-#ifdef _WIN32
-#else
-# include <errno.h>
-# include <string.h>
-#endif
+#include <errno.h>
+#include <string.h>
 
 #ifdef TRACE_ON
 # ifndef TRACE_CLASS
@@ -127,31 +128,33 @@ void InetAddress::setPort(int port)
  *  @return 0  if ok
  *          -1 if error
  */
-int InetAddress::setAddress(const char *name)
+int InetAddress::setAddress(const std::string& name)
 {
-    TRACE_CLASS("InetAddress", "setAddress(char*)");
-    if (name) {
-        if (atoi(name)) {   // If it start with a number
-            if ((addr.sin_addr.s_addr = inet_addr(name)) == INADDR_NONE) {
+    TRACE_CLASS("InetAddress", "setAddress(string)");
+    if (!name.empty()) {
+        if (atoi(name.c_str())) {   // If it start with a number
+            if ((addr.sin_addr.s_addr = inet_addr(name.c_str())) == INADDR_NONE) {
                 addr.sin_addr.s_addr = htons(INADDR_ANY);
                 inetErrNo = 0;
                 inetErrMsg = "Invalid address";
-                inetErrDesc = name;
+                inetErrDesc = name.c_str();
                 return -1;
             }
-        } else {            // Assume it's a real name
-            hostent *host = gethostbyname(name);
+        }
+        else {            // Assume it's a real name
+            hostent *host = gethostbyname(name.c_str());
             if (host) {
                 addr.sin_addr = *(in_addr *)(host->h_addr);
             } else {
                 addr.sin_addr.s_addr = htons(INADDR_ANY);
                 inetErrNo = 0;
                 inetErrMsg = "Could not find address";
-                inetErrDesc = name;
+                inetErrDesc = name.c_str();
                 return -1;
             }
         }
-    } else {
+    }
+    else {
         addr.sin_addr.s_addr = INADDR_ANY;
     }
     return 0;
@@ -161,100 +164,8 @@ int InetAddress::setAddress(const char *name)
 void setInetError(const char* description)
 {
     inetErrNo = 0;
-#ifdef _WIN32
-    inetErrNo = WSAGetLastError();
-    switch (inetErrNo) {
-        case WSANOTINITIALISED:
-            inetErrMsg = "WSANOTINITIALISED A successful WSAStartup must occur before using this function.";
-            break;
-        case WSAENETDOWN:
-            inetErrMsg = "WSAENETDOWN The network subsystem has failed.";
-            break;
-        case WSAEFAULT:
-            inetErrMsg = "WSAEFAULT The buf or from parameters are not part of the user address space, or the fromlen parameter is too small to accommodate the peer address.";
-            break;
-        case WSAEINTR:
-            inetErrMsg = "WSAEINTR The (blocking) call was canceled through WSACancelBlockingCall.";
-            break;
-        case WSAEINPROGRESS:
-            inetErrMsg = "WSAEINPROGRESS A blocking Windows Sockets 1.1 call is in progress, or the service provider is still processing a callback function.";
-            break;
-        case WSAEINVAL:
-            inetErrMsg = "WSAEINVAL The socket has not been bound with bind, or an unknown flag was specified, or MSG_OOB was specified for a socket with SO_OOBINLINE enabled, or (for byte stream-style sockets only) len was zero or negative.";
-            break;
-        case WSAEISCONN:
-            inetErrMsg = "WSAEISCONN The socket is connected. This function is not permitted with a connected socket, whether the socket is connection-oriented or connectionless.";
-            break;
-        case WSAENETRESET:
-            inetErrMsg = "WSAENETRESET The connection has been broken due to the \"keep-alive\" activity detecting a failure while the operation was in progress.";
-            break;
-        case WSAENOTSOCK:
-            inetErrMsg = "WSAENOTSOCK The descriptor is not a socket.";
-            break;
-        case WSAEOPNOTSUPP:
-            inetErrMsg = "WSAEOPNOTSUPP MSG_OOB was specified, but the socket is not stream-style such as type SOCK_STREAM, out-of-band data is not supported in the communication domain associated with this socket, or the socket is unidirectional and supports only send operations.";
-            break;
-        case WSAESHUTDOWN:
-            inetErrMsg = "WSAESHUTDOWN The socket has been shut down; it is not possible to recvfrom on a socket after shutdown has been invoked with how set to SD_RECEIVE or SD_BOTH.";
-            break;
-        case WSAEWOULDBLOCK:
-            inetErrMsg = "WSAEWOULDBLOCK The socket is marked as nonblocking and the recvfrom operation would block.";
-            break;
-        case WSAEMSGSIZE:
-            inetErrMsg = "WSAEMSGSIZE The message was too large to fit into the specified buffer and was truncated.";
-            break;
-        case WSAETIMEDOUT:
-            inetErrMsg = "WSAETIMEDOUT The connection has been dropped, because of a network failure or because the system on the other end went down without notice.";
-            break;
-        case WSAECONNRESET:
-            inetErrMsg = "WSAECONNRESET";
-            break;
-        case WSAEACCES:
-            inetErrMsg = "WSAEACCES The requested address is a broadcast address, but the appropriate flag was not set. Call setsockopt with the SO_BROADCAST parameter to allow the use of the broadcast address.";
-            break;
-        case WSAENOBUFS:
-            inetErrMsg = "WSAENOBUFS No buffer space is available.";
-            break;
-        case WSAENOTCONN:
-            inetErrMsg = "WSAENOTCONN The socket is not connected (connection-oriented sockets only)";
-            break;
-        case WSAEHOSTUNREACH:
-            inetErrMsg = "WSAEHOSTUNREACH The remote host cannot be reached from this host at this time.";
-            break;
-        case WSAECONNABORTED:
-            inetErrMsg = "WSAECONNABORTED The virtual circuit was terminated due to a time-out or other failure. The application should close the socket as it is no longer usable.";
-            break;
-        case WSAEADDRNOTAVAIL:
-            inetErrMsg = "WSAEADDRNOTAVAIL The remote address is not a valid address, for example, ADDR_ANY.";
-            break;
-        case WSAEAFNOSUPPORT:
-            inetErrMsg = "WSAEAFNOSUPPORT Addresses in the specified family cannot be used with this socket.";
-            break;
-        case WSAEDESTADDRREQ:
-            inetErrMsg = "WSAEDESTADDRREQ A destination address is required.";
-            break;
-        case WSAENETUNREACH:
-            inetErrMsg = "WSAENETUNREACH The network cannot be reached from this host at this time.";
-            break;
-        case WSAEMFILE:
-            inetErrMsg = "No more socket descriptors are available.";
-            break;
-        case WSAEPROTONOSUPPORT:
-            inetErrMsg = "The specified protocol is not supported.";
-            break;
-        case WSAEPROTOTYPE:
-            inetErrMsg = "The specified protocol is the wrong type for this socket.";
-            break;
-        case WSAESOCKTNOSUPPORT:
-            inetErrMsg = "The specified socket type is not supported in this address family.";
-            break;
-        default:
-            inetErrMsg = "Unknown";
-    };
-#else
     inetErrNo = errno;
     inetErrMsg = strerror(inetErrNo);
-#endif
     inetErrDesc = description;
 }