X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fserver.cpp;h=14f4e2afe50a718a8e085dd91a6e21fc0e3aa363;hp=2e2b337f60d177fc74affb155b14b6ec0d19acf9;hb=a7170401dd90dc79cc7d7a808cfe18a06c7e983b;hpb=59adb9e24e4ac66b2623742c3b9c81a1c20ff9f0 diff --git a/src/server.cpp b/src/server.cpp index 2e2b337..14f4e2a 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -17,95 +17,148 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include + #include "server.hxx" +#include "log.hxx" namespace libt2n { -void connection::check_timeout() +server_connection::server_connection(int _timeout) + : connection() +{ + set_timeout(_timeout); + reset_timeout(); + connection_id=0; + my_server=0; +} + + +/// get pointer to logging stream, returns NULL if no logging needed +std::ostream* server_connection::get_logstream(log_level_values level) +{ + if (my_server != NULL) + return my_server->get_logstream(level); +} + +/// check if timeout is expired, close connection if so +void server_connection::check_timeout() { - if (timeout != -1 && last_action_time+timeout >= time(NULL)) + if (timeout != -1 && last_action_time+timeout < time(NULL)) + { + LOGSTREAM(debug,"timeout on connection " << connection_id << ", closing"); this->close(); + } } -void connection::reset_timeout() +/// reset the timeout, e.g. if something is received +void server_connection::reset_timeout() { last_action_time=time(NULL); } -bool connection::get_packet(std::string& data, unsigned int& conn_id) +server::server() { - // max packet size is unsigned int - - // no size information -> no packet - if (buffer.size() < sizeof(unsigned int)) - return false; + set_default_timeout(30); + set_logging(NULL,none); + next_id=1; +} - unsigned int psize=*((unsigned int*)(buffer.data())); +server::~server() +{ + std::map::iterator ie=connections.end(); + for(std::map::iterator i=connections.begin(); i != ie; i++) + delete i->second; +} - // enough data for one packet in buffer? - if (buffer.size() < sizeof(unsigned int)+psize) - return false; +int server::add_connection(server_connection* newconn) +{ + unsigned int cid=next_id++; + newconn->set_id(cid); + newconn->set_server(this); + connections[cid]=newconn; - data.assign(buffer,sizeof(unsigned int),psize); - buffer.erase(0,sizeof(unsigned int)+psize); + LOGSTREAM(debug,"new connection accepted, id: " << cid); - return true; + return cid; } -server::~server() +/// activate logging to the given stream. everything above the given level is logged. +void server::set_logging(std::ostream *_logstream, log_level_values _log_level) { - std::map::iterator ie=connections.end(); - for(std::map::iterator i=connections.begin(); i != ie; i++) - delete i->second; + log_level=_log_level; + logstream=_logstream; } /** - 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::iterator p=connections.find(conn_id); + std::map::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::iterator ie=connections.end(); - for(std::map::iterator i=connections.begin(); i != ie; i++) + std::map::iterator ie=connections.end(); + for(std::map::iterator i=connections.begin(); i != ie; i++) i->second->check_timeout(); -} -void server::fill_connection_buffers(void) -{ - std::map::iterator ie=connections.end(); - for(std::map::iterator i=connections.begin(); i != ie; i++) - if (!i->second->is_closed()) - i->second->fill_buffer(); + for(std::map::iterator i=connections.begin(); i != ie;) + { + if (i->second->is_closed() && !i->second->packet_available()) + { + // closed and no usable data in buffer -> remove + LOGSTREAM(debug,"removing conneciton " << i->first << " because it is closed and no more data waiting"); + + delete i->second; + connections.erase(i); + i=connections.begin(); + ie=connections.end(); + } + else + i++; + } } +/** @brief get a complete data packet from any client. The packet is removed from the + connection buffer. + @param[out] data the data package + @param[out] conn_id the connection id we got this packet from + @retval true if packet found +*/ 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::iterator ie=connections.end(); - for(std::map::iterator i=connections.begin(); i != ie; i++) - if (i->second->get_packet(data,conn_id)) + std::map::iterator ie=connections.end(); + for(std::map::iterator i=connections.begin(); i != ie; i++) + if (i->second->get_packet(data)) + { + LOGSTREAM(debug,"got packet (" << data.size() << " bytes) from connection " << i->first); + + conn_id=i->first; return true; + } + + return false; } -void server::log(log_level_values level, const char* message) +/// get pointer to logging stream, returns NULL if no logging needed +std::ostream* server::get_logstream(log_level_values level) { if (logstream && level >= log_level) - (*logstream) << message << std::endl; + return logstream; } - };