Added more comments, help, and socket actually reads and writes some, but it's

not done.  I need to decide how I want to do the buffering...

1 files changed, 231 insertions, 1 deletions

diff --git a/src/socket.cpp b/src/socket.cpp
index c5c592b..e206bb5 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -1,10 +1,240 @@
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <fcntl.h>
 #include "socket.h"
+#include "exceptions.h"
 
-Bu::Socket::Socket()
+#define RBS (1024*2)
+
+Bu::Socket::Socket( int nSocket ) :
+        nSocket( nSocket ),
+        bActive( true )
 {
 }
 
+Bu::Socket::Socket( const Bu::FString &sAddr, int nPort, int nTimeout )
+{
+        struct sockaddr_in xServerName;
+        bActive = false;
+     
+        /* Create the socket. */
+        nSocket = socket( PF_INET, SOCK_STREAM, 0 );
+        
+        if( nSocket < 0 )
+        {
+                throw ExceptionBase("Couldn't create socket.\n");
+        }
+
+        // These lines set the socket to non-blocking, a good thing?
+        int flags;
+        flags = fcntl(nSocket, F_GETFL, 0);
+        flags |= O_NONBLOCK;
+        if (fcntl(nSocket, F_SETFL, flags) < 0)
+        {
+                throw ExceptionBase("Couldn't set socket options.\n");
+        }
+     
+        /* Connect to the server. */
+        //printf("Resolving hostname (%s)...\n", sAddr );
+        {
+                struct hostent *hostinfo;
+     
+                xServerName.sin_family = AF_INET;
+                xServerName.sin_port = htons( nPort );
+                hostinfo = gethostbyname( sAddr.getStr() );
+                if (hostinfo == NULL)
+                {
+                        throw ExceptionBase("Couldn't resolve hostname.\n");
+                }
+                xServerName.sin_addr = *(struct in_addr *) hostinfo->h_addr;
+        }
+
+        //printf("Making actual connection...");
+        //fflush( stdout );
+        connect(
+                nSocket,
+                (struct sockaddr *)&xServerName,
+                sizeof(xServerName)
+                );
+        //printf("Connected.\n");
+        
+        bActive = true;
+
+        if( nTimeout > 0 )
+        {
+                fd_set rfds, wfds, efds;
+                int retval;
+                
+                FD_ZERO(&rfds);
+                FD_SET(nSocket, &rfds);
+                FD_ZERO(&wfds);
+                FD_SET(nSocket, &wfds);
+                FD_ZERO(&efds);
+                FD_SET(nSocket, &efds);
+
+                struct timeval tv;
+                tv.tv_sec = nTimeout;
+                tv.tv_usec = 0;
+                
+                retval = select( nSocket+1, &rfds, &wfds, &efds, &tv );
+
+                if( retval == 0 )
+                {
+                        close();
+                        throw ExceptionBase("Connection timeout.\n");
+                }
+                
+        }
+}
+
 Bu::Socket::~Socket()
 {
 }
 
+void Bu::Socket::close()
+{
+        if( bActive )
+        {
+                fsync( nSocket );
+                ::close( nSocket );
+        }
+        bActive = false;
+        //xInputBuf.clearData();
+        //xOutputBuf.clearData();
+        //if( pProtocol != NULL )
+        //{
+        //      delete pProtocol;
+        //      pProtocol = NULL;
+        //}
+}
+
+void Bu::Socket::read()
+{
+        char buffer[RBS];
+        int nbytes;
+        int nTotalRead=0;
+
+        for(;;)
+        {
+                //memset( buffer, 0, RBS );
+
+                nbytes = ::read( nSocket, buffer, RBS );
+                if( nbytes < 0 && errno != 0 && errno != EAGAIN )
+                {
+                        //printf("errno: %d, %s\n", errno, strerror( errno ) );
+                        /* Read error. */
+                        //perror("readInput");
+                        throw ConnectionException(
+                                excodeReadError,
+                                "Read error: %s",
+                                strerror( errno )
+                                );
+                }
+                else
+                {
+                        if( nbytes <= 0 )
+                                break;
+                        nTotalRead += nbytes;
+                        sReadBuf.append( buffer, nbytes );
+                        /* Data read. */
+                        if( nbytes < RBS )
+                        {
+                                break;
+                        }
+
+                        /* New test, if data is divisible by RBS bytes on some libs the
+                         * read could block, this keeps it from happening.
+                         */
+                        {
+                                fd_set rfds;
+                                FD_ZERO(&rfds);
+                                FD_SET(nSocket, &rfds);
+                                struct timeval tv = { 0, 0 };
+                                int retval = select( nSocket+1, &rfds, NULL, NULL, &tv );
+                                if( retval == -1 )
+                                        throw ConnectionException(
+                                                excodeBadReadError,
+                                                "Bad Read error"
+                                                );
+                                if( !FD_ISSET( nSocket, &rfds ) )
+                                        break;
+                        }
+                }
+        }
+
+        /*
+        if( pProtocol != NULL && nTotalRead > 0 )
+        {
+                pProtocol->onNewData();
+        }*/
+}
+
+size_t Bu::Socket::read( void *pBuf, size_t nBytes )
+{
+        read();
+
+
+
+        return sReadBuf.getSize();
+}
+
+size_t Bu::Socket::write( const void *pBuf, size_t nBytes )
+{
+        int nWrote = TEMP_FAILURE_RETRY( ::write( nSocket, pBuf, nBytes ) );
+        if( nWrote < 0 )
+        {
+                throw ConnectionException( excodeWriteError, strerror(errno) );
+        }
+        return nWrote;
+}
+
+long Bu::Socket::tell()
+{
+        throw UnsupportedException();
+}
+
+void Bu::Socket::seek( long offset )
+{
+        throw UnsupportedException();
+}
+
+void Bu::Socket::setPos( long pos )
+{
+        throw UnsupportedException();
+}
+
+void Bu::Socket::setPosEnd( long pos )
+{
+        throw UnsupportedException();
+}
+
+bool Bu::Socket::isEOS()
+{
+        return !bActive;
+}
+
+bool Bu::Socket::canRead()
+{
+        return true;
+}
+
+bool Bu::Socket::canWrite()
+{
+        return true;
+}
+
+bool Bu::Socket::canSeek()
+{
+        return false;
+}
+