Completely redesigned Server and Client.

Like, seriously, they're almost completely different.

2 files changed, 0 insertions, 388 deletions

diff --git a/src/unstable/itoserver.cpp b/src/unstable/itoserver.cpp
deleted file mode 100644
index 9e9d5e0..0000000
--- a/src/unstable/itoserver.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (C) 2007-2019 Xagasoft, All rights reserved.
- *
- * This file is part of the libbu++ library and is released under the
- * terms of the license contained in the file LICENSE.
- */
-
-#include "bu/config.h"
-#include "bu/itoserver.h"
-#include <errno.h>
-#include "bu/tcpserversocket.h"
-#include "bu/client.h"
-#include "bu/tcpsocket.h"
-
-Bu::ItoServer::ItoServer() :
-    nTimeoutSec( 1 ),
-    nTimeoutUSec( 0 )
-{
-    FD_ZERO( &fdActive );
-}
-
-Bu::ItoServer::~ItoServer()
-{
-    while( !qClientCleanup.isEmpty() )
-    {
-        ItoClient *pCli = qClientCleanup.dequeue();
-        pCli->join();
-        delete pCli;
-    }
-    // TODO:  Make sure here that each client has shutdown it's socket, and
-    // maybe even written any extra data, we could put a timelimit on this...
-    // anyway, it's not as clean as it could be right now.
-    for( ClientHash::iterator i = hClients.begin(); i != hClients.end(); i++ )
-    {
-        ItoClient *pCli = (*i);
-        pCli->join();
-        delete pCli;
-    }
-}
-
-void Bu::ItoServer::addPort( int nPort, int nPoolSize )
-{
-    TcpServerSocket *s = new TcpServerSocket( nPort, nPoolSize );
-    socket_t nSocket = s->getSocket();
-    FD_SET( nSocket, &fdActive );
-    hServers.insert( nSocket, s );
-}
-
-void Bu::ItoServer::addPort( const String &sAddr, int nPort, int nPoolSize )
-{
-    TcpServerSocket *s = new TcpServerSocket( sAddr, nPort, nPoolSize );
-    socket_t nSocket = s->getSocket();
-    FD_SET( nSocket, &fdActive );
-    hServers.insert( nSocket, s );
-}
-
-void Bu::ItoServer::setTimeout( int nTimeoutSec, int nTimeoutUSec )
-{
-    this->nTimeoutSec = nTimeoutSec;
-    this->nTimeoutUSec = nTimeoutUSec;
-}
-
-void Bu::ItoServer::addClient( socket_t nSocket, int nPort )
-{
-    ItoClient *pC = new ItoClient( *this, nSocket, nPort, nTimeoutSec,
-            nTimeoutUSec );
-
-    imClients.lock();
-    hClients.insert( nSocket, pC );
-    imClients.unlock();
-    
-    pC->start();
-}
-
-void Bu::ItoServer::run()
-{
-    for(;;)
-    {
-        struct timeval xTimeout = { nTimeoutSec, nTimeoutUSec };
-        
-        fd_set fdRead = fdActive;
-        //fd_set fdWrite = fdActive;
-        fd_set fdException = fdActive;
-
-        if( TEMP_FAILURE_RETRY( select( FD_SETSIZE, &fdRead, NULL, &fdException, &xTimeout ) ) < 0 )
-        {
-            throw ExceptionBase("Error attempting to scan open connections.");
-        }
-
-        for( ServerHash::iterator i = hServers.begin(); i != hServers.end(); i++ )
-        {
-            if( FD_ISSET( i.getKey(), &fdRead ) )
-            {
-                TcpServerSocket *pSrv = i.getValue();
-                addClient( pSrv->accept(), pSrv->getPort() );
-            }
-        }
-
-        while( !qClientCleanup.isEmpty() )
-        {
-            ItoClient *pCli = qClientCleanup.dequeue();
-            pCli->join();
-            delete pCli;
-        }
-    }
-}
-
-void Bu::ItoServer::clientCleanup( socket_t iSocket )
-{
-    imClients.lock();
-    ItoClient *pCli = hClients.get( iSocket );
-    imClients.unlock();
-    qClientCleanup.enqueue( pCli );
-}
-
-Bu::ItoServer::ItoClient::ItoClient( ItoServer &rSrv, Bu::ItoServer::socket_t iSocket, int iPort,
-        int nTimeoutSec, int nTimeoutUSec ) :
-    rSrv( rSrv ),
-    iSocket( iSocket ),
-    iPort( iPort ),
-    nTimeoutSec( nTimeoutSec ),
-    nTimeoutUSec( nTimeoutUSec )
-{
-    FD_ZERO( &fdActive );
-    FD_SET( iSocket, &fdActive );
-
-    pClient = new Client(
-        new Bu::TcpSocket( iSocket ),
-        new SrvClientLinkFactory( rSrv )
-        );
-}
-
-Bu::ItoServer::ItoClient::~ItoClient()
-{
-}
-
-void Bu::ItoServer::ItoClient::run()
-{
-    imProto.lock();
-    rSrv.onNewConnection( pClient, iPort );
-    pClient->processOutput();
-    imProto.unlock();
-
-    for(;;)
-    {
-        struct timeval xTimeout = { nTimeoutSec, nTimeoutUSec };
-        
-        fd_set fdRead = fdActive;
-        fd_set fdWrite;
-        fd_set fdException = fdActive;
-
-        FD_ZERO( &fdWrite );
-        if( pClient->hasOutput() )
-            FD_SET( iSocket, &fdWrite );
-
-        if( TEMP_FAILURE_RETRY( select( FD_SETSIZE,
-                &fdRead, &fdWrite, &fdException, &xTimeout ) ) < 0 )
-        {
-            throw ExceptionBase("Error attempting to scan open connections.");
-        }
-
-        while( !qMsg.isEmpty() )
-        {
-            imProto.lock();
-            Bu::String *pMsg = qMsg.dequeue();
-            pClient->onMessage( *pMsg );
-            delete pMsg;
-            pClient->processOutput();
-            imProto.unlock();
-        }
-
-        if( FD_ISSET( iSocket, &fdRead ) )
-        {
-            imProto.lock();
-            pClient->processInput();
-            imProto.unlock();
-            if( !pClient->isOpen() )
-            {
-                imProto.lock();
-                rSrv.onClosedConnection( pClient );
-                imProto.unlock();
-
-                rSrv.clientCleanup( iSocket );
-                
-                return;
-            }
-        }
-
-        if( FD_ISSET( iSocket, &fdWrite ) )
-        {
-            imProto.lock();
-            pClient->processOutput();
-            imProto.unlock();
-        }
-    }
-}
-
-Bu::ItoServer::SrvClientLink::SrvClientLink( ItoClient *pClient ) :
-    pClient( pClient )
-{
-}
-
-Bu::ItoServer::SrvClientLink::~SrvClientLink()
-{
-}
-
-void Bu::ItoServer::SrvClientLink::sendMessage( const Bu::String &sMsg )
-{
-    if( !pClient->imProto.trylock() )
-    {
-        pClient->pClient->onMessage( sMsg );
-        pClient->pClient->processOutput();
-        pClient->imProto.unlock();
-    }
-    else
-    {
-        Bu::String *pMsg = new Bu::String( sMsg );
-        pClient->qMsg.enqueue( pMsg );
-    }
-}
-
-Bu::ItoServer::SrvClientLinkFactory::SrvClientLinkFactory(
-        Bu::ItoServer &rSrv ) :
-    rSrv( rSrv )
-{
-}
-
-Bu::ItoServer::SrvClientLinkFactory::~SrvClientLinkFactory()
-{
-}
-
-Bu::ClientLink *Bu::ItoServer::SrvClientLinkFactory::createLink(
-        Bu::Client *pClient )
-{
-    rSrv.imClients.lock();
-    ItoClient *pCli = rSrv.hClients.get( *pClient->getSocket() );
-    rSrv.imClients.unlock();
-
-    return new SrvClientLink( pCli );
-}
-
diff --git a/src/unstable/itoserver.h b/src/unstable/itoserver.h
deleted file mode 100644
index f5e4a71..0000000
--- a/src/unstable/itoserver.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2007-2019 Xagasoft, All rights reserved.
- *
- * This file is part of the libbu++ library and is released under the
- * terms of the license contained in the file LICENSE.
- */
-
-#ifndef BU_ITO_SERVER_H
-#define BU_ITO_SERVER_H
-
-#include <stdint.h>
-
-#ifndef WIN32
-    #include <sys/select.h>
-#endif
-
-#include "bu/string.h"
-#include "bu/list.h"
-#include "bu/thread.h"
-#include "bu/mutex.h"
-#include "bu/synchroqueue.h"
-#include "bu/hash.h"
-
-#include "bu/clientlink.h"
-#include "bu/clientlinkfactory.h"
-
-namespace Bu
-{
-    class TcpServerSocket;
-    class TcpSocket;
-    class Client;
-
-    /**
-     * Core of a network server.  This class is distinct from a ServerSocket in
-     * that a ServerSocket is one listening socket, nothing more.  Socket will
-     * manage a pool of both ServerSockets and connected Sockets along with
-     * their protocols and buffers.
-     *
-     * To start serving on a new port, use the addPort functions.  Each call to
-     * addPort creates a new ServerSocket, starts it listening, and adds it to
-     * the server pool.
-     *
-     * All of the real work is done by scan, which will wait for up
-     * to the timeout set by setTimeout before returning if there is no data
-     * pending.  scan should probably be called in some sort of tight
-     * loop, possibly in it's own thread, or in the main control loop.
-     *
-     * In order to use a Server you must subclass it and implement the pure
-     * virtual functions.  These allow you to receive notification of events
-     * happening within the server itself, and actually makes it useful.
-     *@ingroup Threading Serving
-     */
-    class ItoServer : public Thread
-    {
-        friend class ItoClient;
-        friend class SrvClientLinkFactory;
-    public:
-        ItoServer();
-        virtual ~ItoServer();
-
-#ifdef WIN32
-        typedef unsigned int socket_t;
-#else
-        typedef int socket_t;
-#endif
-
-        void addPort( int nPort, int nPoolSize=40 );
-        void addPort( const String &sAddr, int nPort, int nPoolSize=40 );
-
-        //void scan();
-        void setTimeout( int nTimeoutSec, int nTimeoutUSec=0 );
-
-        void addClient( socket_t nSocket, int nPort );
-
-        virtual void onNewConnection( Client *pClient, int nPort )=0;
-        virtual void onClosedConnection( Client *pClient )=0;
-
-    protected:
-        virtual void run();
-
-    private:
-        class SrvClientLink;
-        class ItoClient : public Thread
-        {
-        friend class Bu::ItoServer::SrvClientLink;
-        public:
-            ItoClient( ItoServer &rSrv, socket_t nSocket, int nPort,
-                    int nTimeoutSec, int nTimeoutUSec );
-            virtual ~ItoClient();
-
-            typedef SynchroQueue<Bu::String *> StringQueue;
-            StringQueue qMsg;
-
-        protected:
-            virtual void run();
-
-        private:
-            ItoServer &rSrv;
-            Client *pClient;
-            fd_set fdActive;
-            socket_t iSocket;
-            int iPort;
-            int nTimeoutSec;
-            int nTimeoutUSec;
-            Mutex imProto;
-        };
-
-        class SrvClientLink : public Bu::ClientLink
-        {
-        public:
-            SrvClientLink( ItoClient *pClient );
-            virtual ~SrvClientLink();
-
-            virtual void sendMessage( const Bu::String &sMsg );
-
-        private:
-            ItoClient *pClient;
-        };
-
-        class SrvClientLinkFactory : public Bu::ClientLinkFactory
-        {
-        public:
-            SrvClientLinkFactory( ItoServer &rSrv );
-            virtual ~SrvClientLinkFactory();
-
-            virtual Bu::ClientLink *createLink( Bu::Client *pClient );
-
-        private:
-            ItoServer &rSrv;
-        };
-
-        int nTimeoutSec;
-        int nTimeoutUSec;
-        fd_set fdActive;
-        typedef Hash<socket_t,TcpServerSocket *> ServerHash;
-        ServerHash hServers;
-        typedef Hash<socket_t,ItoClient *> ClientHash;
-        typedef SynchroQueue<ItoClient *> ClientQueue;
-        ClientHash hClients;
-        ClientQueue qClientCleanup;
-        Mutex imClients;
-
-        void clientCleanup( socket_t iSocket );
-    };
-}
-
-#endif