1 files changed, 14 insertions, 13 deletions

diff --git a/src/stable/multiserver.cpp b/src/stable/multiserver.cpp
index e0386a7..697725c 100644
--- a/src/stable/multiserver.cpp
+++ b/src/stable/multiserver.cpp
@@ -8,6 +8,7 @@
 #include "bu/multiserver.h"
 #include "bu/protocol.h"
 #include "bu/client.h"
+#include "bu/serversocket.h"
 
 #include "bu/config.h"
 
@@ -21,23 +22,23 @@ Bu::MultiServer::~MultiServer()
 {
 }
 
-void Bu::MultiServer::addProtocol( Bu::Protocol *(*proc)(), int iPort,
-    int nPoolSize )
+void Bu::MultiServer::addProtocol( Bu::Protocol *(*proc)(),
+        Bu::ServerSocket *pServer )
 {
-    hProtos[iPort] = proc;
-    addPort( iPort, nPoolSize );
+    addServerSocket( pServer );
+    int iFd;
+    pServer->getFd( iFd );
+    hProtos.insert( iFd, proc );
 }
 
-void Bu::MultiServer::addProtocol( Protocol *(*proc)(), const String &sAddr,
-    int iPort, int nPoolSize )
+void Bu::MultiServer::onNewConnection( const Bu::ServerSocket *pSrv,
+        Client *pClient, Bu::Socket * /*pSocket*/ )
 {
-    hProtos[iPort] = proc;
-    addPort( sAddr, iPort, nPoolSize );
-}
-
-void Bu::MultiServer::onNewConnection( Bu::Client *pClient, int nPort )
-{
-    pClient->setProtocol( hProtos.get( nPort )() );
+    int iFd;
+    if( pSrv->getFd( iFd ) )
+    {
+        pClient->setProtocol( hProtos.get( iFd )() );
+    }
 }
 
 void Bu::MultiServer::onClosedConnection( Bu::Client *pClient )