This is a preliminary test of my new server simplification subclass, don't use

it yet, the name will change.  I really, really, really want the name to change.

3 files changed, 144 insertions, 0 deletions

diff --git a/src/multiserver.cpp b/src/multiserver.cpp
new file mode 100644
index 0000000..56284b0
--- /dev/null
+++ b/src/multiserver.cpp
@@ -0,0 +1,36 @@
+#include "bu/multiserver.h"
+#include "bu/protocol.h"
+#include "bu/client.h"
+
+Bu::MultiServer::MultiServer()
+{
+}
+
+Bu::MultiServer::~MultiServer()
+{
+}
+
+void Bu::MultiServer::addProtocol( Bu::Protocol *(*proc)(), int iPort,
+        int nPoolSize )
+{
+        hProtos[iPort] = proc;
+        addPort( iPort, nPoolSize );
+}
+
+void Bu::MultiServer::addProtocol( Protocol *(*proc)(), const FString &sAddr,
+        int iPort, int nPoolSize )
+{
+        hProtos[iPort] = proc;
+        addPort( sAddr, iPort, nPoolSize );
+}
+
+void Bu::MultiServer::onNewConnection( Bu::Client *pClient, int nPort )
+{
+        pClient->setProtocol( hProtos.get( nPort )() );
+}
+
+void Bu::MultiServer::onClosedConnection( Bu::Client *pClient )
+{
+        delete pClient->getProtocol();
+}
+
diff --git a/src/multiserver.h b/src/multiserver.h
new file mode 100644
index 0000000..cf71203
--- /dev/null
+++ b/src/multiserver.h
@@ -0,0 +1,46 @@
+#ifndef BU_MULTI_SERVER_H
+#define BU_MULTI_SERVER_H
+
+#include "bu/server.h"
+#include "bu/hash.h"
+
+namespace Bu
+{
+        class Protocol;
+        class Client;
+
+        template<class T>
+        Protocol *genProtocol()
+        {
+                return new T;
+        }
+
+        class MultiServer : protected Server
+        {
+        public:
+                MultiServer();
+                virtual ~MultiServer();
+
+                void addProtocol( Protocol *(*proc)(), int iPort, int nPoolSize=40 );
+                void addProtocol( Protocol *(*proc)(), const FString &sAddr, int iPort,
+                                int nPoolSize=40 );
+                
+                void scan()
+                {
+                        Server::scan();
+                }
+
+                void setTimeout( int nTimeoutSec, int nTimeoutUSec=0 )
+                {
+                        Server::setTimeout( nTimeoutSec, nTimeoutUSec );
+                }
+
+                virtual void onNewConnection( Client *pClient, int nPort );
+                virtual void onClosedConnection( Client *pClient );
+
+        private:
+                Bu::Hash<int, Protocol *(*)()> hProtos;
+        };
+}
+
+#endif
diff --git a/src/tests/multiserver.cpp b/src/tests/multiserver.cpp
new file mode 100644
index 0000000..f22147d
--- /dev/null
+++ b/src/tests/multiserver.cpp
@@ -0,0 +1,62 @@
+#include "bu/multiserver.h"
+#include "bu/protocol.h"
+#include "bu/client.h"
+
+class ProtocolRaw : public Bu::Protocol
+{
+public:
+        virtual void onNewConnection( Bu::Client *pClient )
+        {
+                pClient->write("Raw echo\n");
+        }
+
+        virtual void onNewData( Bu::Client *pClient )
+        {
+                pClient->write( pClient->getInput() );
+                pClient->seek( pClient->getInputSize() );
+        }
+};
+
+class ProtocolRot13 : public Bu::Protocol
+{
+public:
+        virtual void onNewConnection( Bu::Client *pClient )
+        {
+                pClient->write("Rot13 echo\n");
+        }
+
+        virtual void onNewData( Bu::Client *pClient )
+        {
+                Bu::FString sTmp = pClient->getInput();
+                for( int j = 0; j < sTmp.getSize(); j++ )
+                {
+                        if( sTmp[j] >= 'a' && sTmp[j] <= 'z' )
+                        {
+                                sTmp[j] = ((sTmp[j]-'a'+13)%26) + 'a';
+                        }
+                        else if( sTmp[j] >= 'A' && sTmp[j] <= 'Z' )
+                        {
+                                sTmp[j] = ((sTmp[j]-'A'+13)%26) + 'A';
+                        }
+                }
+                pClient->write( sTmp );
+                pClient->seek( pClient->getInputSize() );
+        }
+};
+
+int main()
+{
+        Bu::MultiServer msMain;
+
+        msMain.addProtocol( Bu::genProtocol<ProtocolRaw>, 5550 );
+        msMain.addProtocol( Bu::genProtocol<ProtocolRot13>, 5551 );
+        msMain.setTimeout( 5, 0 );
+
+        for(;;)
+        {
+                msMain.scan();
+        }
+
+        return 0;
+}
+