Subversion Repositories HomeAutomation

Rev

Rev 1026 | Rev 1124 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed

Rev 1026 Rev 1122
Line 61... Line 61...
61 
        {
 61 
        {
62 
            AsyncSocket *newSocket = new AsyncSocket();
 62 
            AsyncSocket *newSocket = new AsyncSocket();
63 
 
 63 
 
64 
            if (mySocket.accept(newSocket))
 64 
            if (mySocket.accept(newSocket))
65 
            {
 65 
            {
66 
                newSocket->sendData("Welcome to Atom " + ftos(VERSION) + " - " + myName + "\n");
 66 
                newSocket->sendData("Welcome to Atom " + ftos(VERSION) + " - " + myName + "\r\n");
67 
 
 67 
 
68 
                log.add(myName + " accepted new client with id " + itos(newSocket->getId()) + ".\n");
 68 
                log.add(myName + " accepted new client with id " + itos(newSocket->getId()) + ".\n");
69 
                myClientSockets[newSocket->getId()] = newSocket;
 69 
                myClientSockets[newSocket->getId()] = newSocket;
70 
                myClientSockets[newSocket->getId()]->eventSetCallback(this);
 70 
                myClientSockets[newSocket->getId()]->eventSetCallback(this);
71 
                myClientSockets[newSocket->getId()]->start();
 71 
                myClientSockets[newSocket->getId()]->start();
Line 126... Line 126...
126 
            }
 126 
            }
127 
        }
 127 
        }
128 
        else
 128 
        else
129 
        {
 129 
        {
130 
            log.add(myName + " had a client disconnect.\n");
 130 
            log.add(myName + " had a client disconnect.\n");
- 
 
 131 
           
131 
            delete myClientSockets[id];
 132 
            delete myClientSockets[id];
- 
 
 133 
            myClientSockets[id]=0;
132 
            myClientSockets.erase(id);
 134 
            myClientSockets.erase(id);
133 
        }
 135 
        }
134 
    }
 136 
    }
135 
}
 137 
}
136 
 
 138 
 
137 
void Server::disconnectClient(int id)
 139 
void Server::disconnectClient(int id)
138 
{
 140 
{
139 
    Logger &log = Logger::getInstance();
 141 
    Logger &log = Logger::getInstance();
140 
 
 142 
 
141 
    if (myClientSockets.find(id) != myClientSockets.end())
 143 
    if (myClientSockets.find(id) != myClientSockets.end())
142 
    {
 144 
    {
143 
        log.add(myName + " had a client disconnect.\n");
 145 
//      log.add(myName + " had a client disconnect!.\n");
- 
 
 146 
       
144 
        delete myClientSockets[id];
 147 
//      delete myClientSockets[id];
- 
 
 148 
 
145 
        myClientSockets.erase(id);
 149 
//      myClientSockets.erase(id);
- 
 
 150 
//delete myClientSockets[id];
- 
 
 151 
//          myClientSockets[id]=0;
- 
 
 152 
//          myClientSockets.erase(id);
146 
    }
 153 
    }
147 
}
 154 
}
148 
 
 155 
 
149 
void Server::handleEvent(int id, SocketEvent socketEvent)
 156 
void Server::handleEvent(int id, SocketEvent socketEvent)
150 
{
 157 
{