This may require slightly more testing, but basically I made ConnectionManager

more general, you can now listen to all local addresses (the old way), or
individual addressses.

1 files changed, 28 insertions, 9 deletions

diff --git a/src/connectionmanager.cpp b/src/connectionmanager.cpp
index ea794a8..ea60b2b 100644
--- a/src/connectionmanager.cpp
+++ b/src/connectionmanager.cpp
@@ -46,14 +46,6 @@ bool ConnectionManager::startServer( int nPort )
         /* Create the socket and set it up to accept connections. */
         struct sockaddr_in name;
 
-        /* Create the socket. */
-        int nMasterSocket = socket (PF_INET, SOCK_STREAM, 0);
-        if (nMasterSocket < 0)
-        {
-                xLog.LineLog( MultiLog::LError, "Couldn't create a listen socket.");
-                return false;
-        }
-
         /* Give the socket a name. */
         name.sin_family = AF_INET;
         name.sin_port = htons( nPort );
@@ -62,6 +54,33 @@ bool ConnectionManager::startServer( int nPort )
         // a good thing to make configurable later on
         name.sin_addr.s_addr = htonl( INADDR_ANY );
 
+        return startServer( name );
+}
+
+bool ConnectionManager::startServer( const char *sAddr, int nPort )
+{
+        /* Create the socket and set it up to accept connections. */
+        struct sockaddr_in name;
+
+        /* Give the socket a name. */
+        name.sin_family = AF_INET;
+        name.sin_port = htons( nPort );
+
+        inet_aton( sAddr, &name.sin_addr );
+
+        return startServer( name );
+}
+
+bool ConnectionManager::startServer( struct sockaddr_in &name )
+{
+        /* Create the socket. */
+        int nMasterSocket = socket (PF_INET, SOCK_STREAM, 0);
+        if (nMasterSocket < 0)
+        {
+                xLog.LineLog( MultiLog::LError, "Couldn't create a listen socket.");
+                return false;
+        }
+
         int opt = 1;
         setsockopt(
                 nMasterSocket,
@@ -86,7 +105,7 @@ bool ConnectionManager::startServer( int nPort )
         /* Initialize the set of active sockets. */
         FD_SET (nMasterSocket, &fdActive);
 
-        sMasterSocket[nMasterSocket] = nPort;
+        sMasterSocket[nMasterSocket] = name.sin_port;
 
         return true;
 }