WebSVN – HomeAutomation – Diff – /trunk/PcSoftware/Atom/Socket/asyncsocket.cpp

  *  You should have received a copy of the GNU General Public License   *
  *  along with this program; if not, write to the             *
  *  Free Software Foundation, Inc.,                    *
  *  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.       *
  ***************************************************************************/
+#include "socketeventcallback.h"
 #include "asyncsocket.h"
 int socketCount = 1;
+{
     myId = socketCount++;
     mySocket = -1;
     myReconnectTimeout = 0;
     myForceReconnect = false;
+    myEventCallback = NULL;
+}
 AsyncSocket::~AsyncSocket()
+{
     stop();
             case ENOTSOCK:
             throw new SocketException("sockfd is a descriptor for a file, not a socket.");
             //case EACCES:
             //throw new SocketException("Search permission is denied on a component of the path prefix. (See also path_resolution(7).)");
             case EADDRNOTAVAIL:
             throw new SocketException("A nonexistent interface was requested or the requested address was not local.");
             case EFAULT:
             throw new SocketException("addr points outside the user's accessible address space.");
             case ENOENT:
             throw new SocketException("The file does not exist.");
             case ENOMEM:
             throw new SocketException("Insufficient kernel memory was available.");
             case ENOTDIR:
             throw new SocketException("A component of the path prefix is not a directory.");
             case EROFS:
             throw new SocketException("The socket inode would reside on a read-only file system.");
             default:
             throw new SocketException("Unknow exception: " + itos(errno));
             break;
+        }
+    }
     status = ::listen(mySocket, MAXCONNECTIONS);
     if (status == -1)
+    {
         silentClose();
         switch (errno)
+        {
             case EBADF:
             throw new SocketException("The argument sockfd is not a valid descriptor.");
             case ENOTSOCK:
             throw new SocketException("The argument sockfd is not a socket.");
             case EOPNOTSUPP:
             throw new SocketException("The socket is not of a type that supports the listen() operation.");
             default:
             throw new SocketException("Unknow exception: " + itos(errno));
             break;
         }
+    }
+}
 bool AsyncSocket::accept(AsyncSocket* newSocket)
+{
     if (socket > 0)
+    {
         newSocket->setSocket(socket);
         return true;
     }
     return false;
+}
 void AsyncSocket::connect()
+{
     eventAdd(SocketEvent::TYPE_CONNECTING);
     create();
     memset(&myAddressStruct, 0, sizeof(myAddressStruct));
     myAddressStruct.sin_family = AF_INET;
     myAddressStruct.sin_port = htons(myPort);
     struct hostent *hptr = gethostbyname(myAddress.c_str());
     if (hptr == NULL)
+    {
         silentClose();
         throw new SocketException("Connect: Could not resolv ip address");
+    }
     memcpy(&myAddressStruct.sin_addr, hptr->h_addr, hptr->h_length);
     int status = ::connect(mySocket, (sockaddr*)&myAddressStruct, sizeof(myAddressStruct));
     if (status == -1)
             case EADDRINUSE:
             throw new SocketException("Local address is already in use.");
             case EAFNOSUPPORT:
             throw new SocketException("The passed address didn't have the correct address family in its sa_family field.");
             case EAGAIN:
             throw new SocketException("No more free local ports or insufficient entries in the routing cache. For AF_INET see the net.ipv4.ip_local_port_range sysctl in ip(7) on how to increase the number of local ports.");
             case EALREADY:
             throw new SocketException("The socket is non-blocking and a previous connection attempt has not yet been completed.");
+}
 void AsyncSocket::eventAdd(unsigned int eventType, string eventData)
+{
     SocketEvent socketEvent(eventType, eventData);
+    if (myEventCallback == NULL)
+    {
-    myEventQueue.push(socketEvent);
+        myEventQueue.push(socketEvent);
-    myEventSemaphore.broadcast();
+        myEventSemaphore.broadcast();
+    }
+    else
+    {
+        myEventCallback->handleEvent(myId, socketEvent);
+    }
+}
+void AsyncSocket::eventSetCallback(SocketEventCallback* eventCallback)
+{
+    myEventCallback = eventCallback;
+}

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom/Socket/asyncsocket.cpp @ 999 – Rev 984 → 999