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

             loop = receiveData();
+        }
+    }
     catch (SocketException *e)
+    {
+        cout << "DEBUG: socket got an exception: " << e->getDescription() << endl;
         // Something bad happend and we can not continue
         eventAdd(SocketEvent::TYPE_CONNECTION_DIED, e->getDescription());
+    }
     // Clean up socket if we would want to restart
 bool AsyncSocket::receiveData()
+{
     char buffer[MAXBUFFER + 1];
     memset(buffer, 0, MAXBUFFER + 1);
+    //cout << "recv start" << endl;
     int status = ::recv(mySocket, buffer, MAXBUFFER, 0);
+    //cout << "recv end" << endl;
     if (status == -1)
+    {
         switch (errno)
+        {
             case EAGAIN:
             case EINTR:
             throw new SocketException("The receive was interrupted by delivery of a signal before any data were available; see signal(7).");
             case EINVAL:
             throw new SocketException("Invalid argument passed.");
             case ENOMEM:
             throw new SocketException("Could not allocate memory for recvmsg().");
             case ENOTCONN:
             throw new SocketException("The socket is associated with a connection-oriented protocol and has not been connected (see connect(2) and accept(2)).");
             case ENOTSOCK:
             throw new SocketException("The argument s does not refer to a socket.");
             case ECONNRESET:
             eventAdd(SocketEvent::TYPE_CONNECTION_RESET);
             // If we have automatic reconnect we want to start it now
             if (myReconnectTimeout == 0)
+            {
                 reconnectLoop();
             }
             else
+            {
                 // Otherwise we would like to end the main loop
                 return false;
+            }
             break;
             default:
             throw new SocketException("Unknow exception: " + itos(errno));
             break;
+        }
+    }
+{
     create();
     myAddressStruct.sin_family = AF_INET;
     myAddressStruct.sin_addr.s_addr = INADDR_ANY;
     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 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.");
             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 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)
+{
     int addr_length = sizeof(myAddressStruct);
     int socket = ::accept(mySocket, (sockaddr*)&myAddressStruct, (socklen_t*)&addr_length);
     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)
+    {
         silentClose();
             case EALREADY:
             throw new SocketException("The socket is non-blocking and a previous connection attempt has not yet been completed.");
             case EBADF:
             throw new SocketException("The file descriptor is not a valid index in the descriptor table.");
             case ECONNREFUSED:
             throw new SocketException("No-one listening on the remote address.");
             case EFAULT:
             throw new SocketException("The socket structure address is outside the user's address space.");
 void AsyncSocket::sendData(string data)
+{
     mySendMutex.lock();
-    int status = ::send(mySocket, data.c_str(), data.size(), 0);
+    int status = ::send(mySocket, data.c_str(), data.size(), MSG_NOSIGNAL);
 //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");
             case EOPNOTSUPP:
             throw new SocketException("Some bit in the flags argument is inappropriate for the socket type.");
             case EPIPE:
+            close();
+            stop();
-            throw new SocketException("The local end has been shut down on a connection oriented socket. In this case the process will also receive a SIGPIPE unless MSG_NOSIGNAL is set.");
+            //throw new SocketException("The local end has been shut down on a connection oriented socket. In this case the process will also receive a SIGPIPE unless MSG_NOSIGNAL is set.");
+            break;
             default:
             throw new SocketException("Unknow exception: " + itos(errno));
+        }
+    }

Subversion Repositories HomeAutomation

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