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

  *  Free Software Foundation, Inc.,                    *
  *  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.       *
  ***************************************************************************/
 #include "socketeventcallback.h"
+#include "../Logger/logger.h"
 #include "asyncsocket.h"
 int socketCount = 1;
             connect();
+        }
         else
+        {
             // Start the reconnect loop
             reconnectLoop();
         }
+    }
     bool loop = true;
     try
+    {
+        {
             // If we have triggered a forced reconnect do it here
             if (myForceReconnect)
+            {
                 myForceReconnect = false;
                 reconnectLoop();
             }
             // Receive data
             loop = receiveData();
+        }
+    }
+    }
     else if (status > 0)
+    {
         // We have received data
         eventAdd(SocketEvent::TYPE_DATA, buffer);
     }
     return true;
 }
 void AsyncSocket::silentClose()
+{
     if (mySocket != -1)
+    {
         ::close(mySocket);
         mySocket = -1;
+    }
+}
 void AsyncSocket::close()
 {
     silentClose();
     eventAdd(SocketEvent::TYPE_CONNECTION_CLOSED);
+}
 void AsyncSocket::reconnectLoop()
 {
     while (true)
+    {
         try
+        {
             connect();
             return;
         }
         catch (SocketException *e)
+        {
             eventAdd(SocketEvent::TYPE_CONNECTION_FAILED, e->getDescription());
             eventAdd(SocketEvent::TYPE_WAITING_RECONNECT);
             sleep(myReconnectTimeout);
         }
+    }
+}
 void AsyncSocket::create()
 {
     silentClose();
     mySocket = ::socket(AF_INET, SOCK_STREAM, 0);
     int on = 1;
     int status = setsockopt(mySocket, SOL_SOCKET, SO_REUSEADDR, (const char*)&on, sizeof(on));
     if (status == -1)
+    {
         silentClose();
         throw new SocketException("Create:Reuseaddress: " + itos(errno));
     }
 }
 void AsyncSocket::startListen()
+{
     create();
     myAddressStruct.sin_family = AF_INET;
     myAddressStruct.sin_port = htons(myPort);
     int status = ::bind(mySocket, (struct sockaddr *)&myAddressStruct, sizeof(myAddressStruct));
     if (status == -1)
     {
         silentClose();
         switch (errno)
+        {
             case EACCES:
             throw new SocketException("The address is protected, and the user is not the superuser.");
             case EADDRINUSE:
             throw new SocketException("The given address is already in use.");
             case EBADF:
             throw new SocketException("sockfd is not a valid descriptor.");
             case EINVAL:
             throw new SocketException("The socket is already bound to an address.");
             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 EINVAL:
             //throw new SocketException("The addrlen is wrong, or the socket was not in the AF_UNIX family.");
             case ELOOP:
             throw new SocketException("Too many symbolic links were encountered in resolving addr.");
             case ENAMETOOLONG:
             throw new SocketException("addr is too long.");
             case ENOENT:
             throw new SocketException("The file does not exist.");
             case ENOMEM:
             throw new SocketException("Insufficient kernel memory was available.");
 void AsyncSocket::sendData(string data)
+{
     mySendMutex.lock();
     int status = ::send(mySocket, data.c_str(), data.size(), 0);
+//Logger::getInstance().add("Sent: \"" + data + "\" status was " + itos(status) + "\n");
     mySendMutex.unlock();
     //Logger &log = Logger::getInstance();
     //log.add("Sent: \"" + data + "\" status was " + itos(status) + "\n");

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom/src/Socket/asyncsocket.cpp @ 1647 – Rev 1036 → 1122