Moved out the xml system again. I think that if I am going to do it again,

I'm going to do it over from scratch, that was just painful.  Also, started in
again on the server system, it's looking pretty good, already got connections
working, next up is managing data flow through clients and protocols!

14 files changed, 22 insertions, 5 deletions

diff --git a/src/client.cpp b/src/client.cpp
index a048ca3..a33cdc3 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -7,3 +7,4 @@ Bu::Client::Client()
 Bu::Client::~Client()
 {
 }
+
diff --git a/src/file.cpp b/src/file.cpp
index 14b6e54..2965afa 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -48,8 +48,8 @@ size_t Bu::File::read( void *pBuf, size_t nBytes )
 
         int nAmnt = fread( pBuf, 1, nBytes, fh );
 
-        if( nAmnt == 0 )
-                throw FileException("End of file.");
+        //if( nAmnt == 0 )
+        //      throw FileException("End of file.");
 
         return nAmnt;
 }
diff --git a/src/xmldocument.cpp b/src/old/xmldocument.cpp
index 95b9788..95b9788 100644
--- a/src/xmldocument.cpp
+++ b/src/old/xmldocument.cpp
diff --git a/src/xmldocument.h b/src/old/xmldocument.h
index e0c36eb..e0c36eb 100644
--- a/src/xmldocument.h
+++ b/src/old/xmldocument.h
diff --git a/src/xmlnode.cpp b/src/old/xmlnode.cpp
index 96d5850..96d5850 100644
--- a/src/xmlnode.cpp
+++ b/src/old/xmlnode.cpp
diff --git a/src/xmlnode.h b/src/old/xmlnode.h
index c895cd8..c895cd8 100644
--- a/src/xmlnode.h
+++ b/src/old/xmlnode.h
diff --git a/src/xmlreader.cpp b/src/old/xmlreader.cpp
index 38cad5f..38cad5f 100644
--- a/src/xmlreader.cpp
+++ b/src/old/xmlreader.cpp
diff --git a/src/xmlreader.h b/src/old/xmlreader.h
index 7c85ddb..7c85ddb 100644
--- a/src/xmlreader.h
+++ b/src/old/xmlreader.h
diff --git a/src/xmlwriter.cpp b/src/old/xmlwriter.cpp
index 7dc6ca9..7dc6ca9 100644
--- a/src/xmlwriter.cpp
+++ b/src/old/xmlwriter.cpp
diff --git a/src/xmlwriter.h b/src/old/xmlwriter.h
index 7e3c876..7e3c876 100644
--- a/src/xmlwriter.h
+++ b/src/old/xmlwriter.h
diff --git a/src/server.cpp b/src/server.cpp
index f93238c..abf4c5b 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -53,7 +53,8 @@ void Bu::Server::scan()
                 {
                         if( hServers.has( j ) )
                         {
-                                addClient( hServers.get( j )->accept() );
+                                ServerSocket *pSrv = hServers.get( j );
+                                addClient( pSrv->accept(), pSrv->getPort() );
                         }
                         else
                         {
@@ -63,11 +64,13 @@ void Bu::Server::scan()
         }
 }
 
-void Bu::Server::addClient( int nSocket )
+void Bu::Server::addClient( int nSocket, int nPort )
 {
         FD_SET( nSocket, &fdActive );
 
         Client *c = new Client();
         hClients.insert( nSocket, c );
+
+        onNewConnection( c, nPort );
 }
 
diff --git a/src/server.h b/src/server.h
index 9f4f459..942eb32 100644
--- a/src/server.h
+++ b/src/server.h
@@ -22,6 +22,10 @@ namespace Bu
          * 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.
          */
         class Server
         {
@@ -35,7 +39,10 @@ namespace Bu
                 void scan();
                 void setTimeout( int nTimeoutSec, int nTimeoutUSec=0 );
 
-                void addClient( int nSocket );
+                void addClient( int nSocket, int nPort );
+
+                virtual void onNewConnection( Client *pClient, int nPort )=0;
+                virtual void onClosedConnection( Client *pClient )=0;
 
         private:
                 int nTimeoutSec;
diff --git a/src/serversocket.cpp b/src/serversocket.cpp
index 9c8f743..1424630 100644
--- a/src/serversocket.cpp
+++ b/src/serversocket.cpp
@@ -151,3 +151,8 @@ int Bu::ServerSocket::accept( int nTimeoutSec, int nTimeoutUSec )
         return -1;
 }
 
+int Bu::ServerSocket::getPort()
+{
+        return nPort;
+}
+
diff --git a/src/serversocket.h b/src/serversocket.h
index d2601e4..cb86078 100644
--- a/src/serversocket.h
+++ b/src/serversocket.h
@@ -25,6 +25,7 @@ namespace Bu
 
                 int accept( int nTimeoutSec=0, int nTimeoutUSec=0 );
                 int getSocket();
+                int getPort();
 
         private:
                 void startServer( struct sockaddr_in &name, int nPoolSize );