namespace libt2n
{
-void connection::check_timeout()
+void server_connection::check_timeout()
{
if (timeout != -1 && last_action_time+timeout >= time(NULL))
this->close();
}
-void connection::reset_timeout()
+void server_connection::reset_timeout()
{
last_action_time=time(NULL);
}
-std::string connection::get_id_string()
-{
- std::ostringstream os;
- os << get_id();
- return os.str();
-}
-
-bool connection::get_packet(std::string& data, unsigned int& conn_id)
-{
- // max packet size is unsigned int
-
- // no size information -> no packet
- if (buffer.size() < sizeof(unsigned int))
- return false;
-
- unsigned int psize=*((unsigned int*)(buffer.data()));
-
- // enough data for one packet in buffer?
- if (buffer.size() < sizeof(unsigned int)+psize)
- return false;
-
- data.assign(buffer,sizeof(unsigned int),psize);
- buffer.erase(0,sizeof(unsigned int)+psize);
-
- return true;
-}
-
server::~server()
{
- std::map<unsigned int, connection*>::iterator ie=connections.end();
- for(std::map<unsigned int, connection*>::iterator i=connections.begin(); i != ie; i++)
+ std::map<unsigned int, server_connection*>::iterator ie=connections.end();
+ for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; i++)
delete i->second;
}
-int server::add_connection(connection* newconn)
+int server::add_connection(server_connection* newconn)
{
unsigned int cid=next_id++;
newconn->set_id(cid);
}
/**
- Gets a connection by id
+ @brief Gets a connection by id
- \param conn_id Connection ID
+ @param conn_id Connection ID
- \retval Pointer to connection object
+ @retval Pointer to connection object
*/
-connection* server::get_connection(unsigned int conn_id)
+server_connection* server::get_connection(unsigned int conn_id)
{
- std::map<unsigned int, connection*>::iterator p=connections.find(conn_id);
+ std::map<unsigned int, server_connection*>::iterator p=connections.find(conn_id);
if (p==connections.end())
return NULL;
else
return p->second;
}
-void server::check_timeout()
+/// check for timeouts, remove closed connections. don't forget to call this from time to time.
+void server::cleanup()
{
- std::map<unsigned int, connection*>::iterator ie=connections.end();
- for(std::map<unsigned int, connection*>::iterator i=connections.begin(); i != ie; i++)
+ std::map<unsigned int, server_connection*>::iterator ie=connections.end();
+ for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; i++)
i->second->check_timeout();
+
+ for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie;)
+ {
+ if (i->second->is_closed() && !i->second->packet_available())
+ {
+ // closed and no usable data in buffer -> remove
+ delete i->second;
+ connections.erase(i);
+ i=connections.begin();
+ ie=connections.end();
+ }
+ else
+ i++;
+ }
}
bool server::get_packet(std::string& data, unsigned int& conn_id)
// todo: this is somehow unfair: the first connections in the map get checked more
// often than the others and can thus block them out
- std::map<unsigned int, connection*>::iterator ie=connections.end();
- for(std::map<unsigned int, connection*>::iterator i=connections.begin(); i != ie; i++)
- if (i->second->get_packet(data,conn_id))
+ std::map<unsigned int, server_connection*>::iterator ie=connections.end();
+ for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; i++)
+ if (i->second->get_packet(data))
+ {
+ conn_id=i->first;
return true;
+ }
+
+ return false;
}
void server::log(log_level_values level, const char* message)