Code is all reorganized. We're about ready to release. I should write up a

little explenation of the arrangement.

1 files changed, 0 insertions, 240 deletions

diff --git a/src/udpsocket.cpp b/src/udpsocket.cpp
deleted file mode 100644
index 702840a..0000000
--- a/src/udpsocket.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (C) 2007-2011 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 WIN32 //not on windows
-
-#include "bu/udpsocket.h"
-
-#include "bu/sio.h"
-using namespace Bu;
-#include <fcntl.h>
-
-#include <errno.h>
-#include <arpa/inet.h> 
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/utsname.h>
-
-namespace Bu { subExceptionDef( UdpSocketException ) }
-
-#define saTarget ( *((struct sockaddr_in *)paTarget) )
-
-Bu::UdpSocket::UdpSocket( int iUdpSocket ) :
-        iUdpSocket( iUdpSocket ),
-        paTarget( NULL ),
-        bBound( false )
-{
-}
-
-Bu::UdpSocket::UdpSocket( const Bu::String &sAddr, int iPort, int iFlags ) :
-        iUdpSocket( 0 ),
-        paTarget( NULL ),
-        bBound( false )
-{
-        iUdpSocket = socket( PF_INET, SOCK_DGRAM, 0 );
-        if( iUdpSocket < 0 )
-        {
-                throw UdpSocketException("Couldn't open udp socket: %s",
-                        strerror( errno )
-                        );
-        }
-
-        if( (iFlags&Broadcast) )
-        {
-                int broadcast = 1;
-                if( (setsockopt( iUdpSocket, SOL_SOCKET, SO_BROADCAST,
-                        &broadcast, sizeof(broadcast) )) == -1)
-                {
-                        throw UdpSocketException("Couldn't set udp socket to broadcast: %s",
-                                strerror( errno )
-                                );
-                }
-        }
-        
-        paTarget = new struct sockaddr_in;
-        saTarget.sin_family = AF_INET;
-        saTarget.sin_port = htons( iPort );
-        saTarget.sin_addr.s_addr = inet_addr( sAddr.getStr() ); // INADDR_ANY;
-        memset( saTarget.sin_zero, '\0', sizeof(saTarget.sin_zero) );
-        
-        if( (iFlags&Read) )
-        {
-                if( bind( iUdpSocket, (struct sockaddr*)paTarget, sizeof(struct sockaddr_in) )
-                                == -1 )
-                {
-                        throw UdpSocketException("Couldn't bind port to udp socket: %s",
-                                strerror( errno )
-                                );
-                }
-                bBound = true;
-        }
-}
-
-Bu::UdpSocket::~UdpSocket()
-{
-        close();
-        delete (struct sockaddr_in *)paTarget;
-        paTarget = NULL;
-}
-
-Bu::String Bu::UdpSocket::addrToStr( const addr &a )
-{
-        return Bu::String("%1.%2.%3.%4").
-                arg( (a&0xff) ).
-                arg( (a&0xff00)>>8 ).
-                arg( (a&0xff0000)>>16 ).
-                arg( (a&0xff000000)>>24 );
-}
-
-void Bu::UdpSocket::close()
-{
-        ::close( iUdpSocket );
-}
-
-Bu::size Bu::UdpSocket::read( void *pBuf, Bu::size nBytes )
-{
-        return recv( iUdpSocket, pBuf, nBytes, 0 );
-}
-
-Bu::size Bu::UdpSocket::read( void *pBuf, Bu::size nBytes,
-                Bu::UdpSocket::addr &aHost, int &iPort )
-{
-        sockaddr_in name;
-        socklen_t size = sizeof(name);
-        Bu::size ret = recvfrom( iUdpSocket, pBuf, nBytes, 0,
-                        (struct sockaddr *)&name, &size );
-        aHost = name.sin_addr.s_addr;
-        iPort = ntohs(name.sin_port);
-        return ret;
-}
-
-Bu::size Bu::UdpSocket::write( const void *pBuf, Bu::size nBytes )
-{
-        if( bBound )
-        {
-                return sendto( iUdpSocket, pBuf, nBytes, 0, NULL, 0 );
-        }
-        else
-        {
-                return sendto( iUdpSocket, pBuf, nBytes, 0,
-                        (struct sockaddr*)paTarget, sizeof(struct sockaddr_in) );
-        }
-}
-
-Bu::size Bu::UdpSocket::tell()
-{
-        throw Bu::UnsupportedException();
-}
-
-void Bu::UdpSocket::seek( Bu::size )
-{
-        throw Bu::UnsupportedException();
-}
-
-void Bu::UdpSocket::setPos( Bu::size )
-{
-        throw Bu::UnsupportedException();
-}
-
-void Bu::UdpSocket::setPosEnd( Bu::size )
-{
-        throw Bu::UnsupportedException();
-}
-
-bool Bu::UdpSocket::isEos()
-{
-        return false;
-}
-
-bool Bu::UdpSocket::isOpen()
-{
-        return true;
-}
-
-void Bu::UdpSocket::flush()
-{
-}
-
-bool Bu::UdpSocket::canRead()
-{
-        return bBound;
-}
-
-bool Bu::UdpSocket::canWrite()
-{
-        return true;
-}
-
-bool Bu::UdpSocket::isReadable()
-{
-        return bBound;
-}
-
-bool Bu::UdpSocket::isWritable()
-{
-        return true;
-}
-
-bool Bu::UdpSocket::isSeekable()
-{
-        return false;
-}
-
-bool Bu::UdpSocket::isBlocking()
-{
-        return true;
-}
-
-void Bu::UdpSocket::setBlocking( bool bBlocking )
-{
-#ifndef WIN32
-        if( bBlocking )
-        {
-                fcntl( iUdpSocket, F_SETFL, fcntl( iUdpSocket, F_GETFL, 0 ) & (~O_NONBLOCK) );
-        }
-        else
-        {
-                fcntl( iUdpSocket, F_SETFL, fcntl( iUdpSocket, F_GETFL, 0 ) | O_NONBLOCK );
-        }
-#else
-        u_long iMode;
-        if( bBlocking )
-                iMode = 0;
-        else
-                iMode = 1;
-        //-------------------------
-        // Set the socket I/O mode: In this case FIONBIO
-        // enables or disables the blocking mode for the 
-        // socket based on the numerical value of iMode.
-        // If iMode = 0, blocking is enabled; 
-        // If iMode != 0, non-blocking mode is enabled.
-        bu_ioctlsocket(iUdpSocket, FIONBIO, &iMode);
-#endif  
-}
-
-void Bu::UdpSocket::setSize( Bu::size )
-{
-        throw Bu::UnsupportedException();
-}
-
-Bu::size Bu::UdpSocket::getSize() const
-{
-        throw Bu::UnsupportedException();
-}
-
-Bu::size Bu::UdpSocket::getBlockSize() const
-{
-        return 1500;
-}
-
-Bu::String Bu::UdpSocket::getLocation() const
-{
-        throw Bu::UnsupportedException();
-}
-
-#endif
-