X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fserver.cpp;h=79b95b42c9b324052ff720f70d7c02b7b77368ac;hp=b1f7962f3afaa97c4bfb28e55036a202503403ed;hb=44b4600fd51677e54dd167734ca9252b58237cda;hpb=28cb45a5725e9c6054d7048a9bf969b9f2c94d64 diff --git a/src/server.cpp b/src/server.cpp index b1f7962..79b95b4 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1,23 +1,30 @@ -/*************************************************************************** - * Copyright (C) 2006 by Gerd v. Egidy * - * gve@intra2net.com * - * * - * This library is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Lesser General Public License version * - * 2.1 as published by the Free Software Foundation. * - * * - * This library is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/* +Copyright (C) 2006 by Intra2net AG - Gerd v. Egidy + +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ #include +#include +#include + +#include #include "server.hxx" #include "log.hxx" @@ -26,14 +33,20 @@ namespace libt2n { server_connection::server_connection(int _timeout) - : connection() + : connection_id(0) + , my_server(NULL) + , connection() { set_timeout(_timeout); reset_timeout(); - connection_id=0; - my_server=0; } +/** + * Destructor + */ +server_connection::~server_connection() +{ +} /// get pointer to logging stream, returns NULL if no logging needed std::ostream* server_connection::get_logstream(log_level_values level) @@ -65,6 +78,19 @@ void server_connection::reset_timeout() last_action_time=time(NULL); } +/** @brief add a callback to one connection + + @param event event the function will be called at + @param func functor (see boost::function) that will be called +*/ +void server_connection::add_callback(callback_event_type event, const boost::function& func) +{ + if (event == new_connection) + throw std::logic_error("new_connection callback not allowed for server_connections"); + + connection::add_callback(event,func); +} + server::server() : callbacks(__events_end) { @@ -78,35 +104,73 @@ server::~server() std::map::iterator ie=connections.end(); for(std::map::iterator i=connections.begin(); i != ie; i++) delete i->second; + + connections.clear(); +} + +/** + * Close all open connections + */ +void server::close() +{ + std::map::iterator ie=connections.end(); + for(std::map::iterator i=connections.begin(); i != ie; ++i) + i->second->close(); } /** @brief add a callback @param event event the function will be called at - @param func functor (see boost function) that will be called + @param func functor (see boost::function) that will be called + + @note use boost::bind to bind to member functions like this: + s.add_callback(new_connection,boost::bind(&my_class::func_to_call_back, boost::ref(*this), _1)); */ -void server::add_callback(callback_event_type event, const boost::function& func) +void server::add_callback(callback_event_type event, const boost::function& func) { callbacks[event].push_back(func); + + // add callback to all existing connections + if (event != new_connection) + { + std::map::iterator ie=connections.end(); + for(std::map::iterator i=connections.begin(); i != ie; i++) + i->second->add_callback(event,boost::bind(func, i->first)); + } } -void server::do_callbacks(callback_event_type event, server_connection* conn) + +/** @brief an event occured, call all server-side callbacks + + @param event event that occured + @param conn_id connection-id parameter that will be given to the callback-function +*/ +void server::do_callbacks(callback_event_type event, unsigned int conn_id) { - std::list >::iterator i,ie=callbacks[event].end(); + std::list >::iterator i,ie=callbacks[event].end(); for (i=callbacks[event].begin(); i != ie; i++) - (*i)(conn); + (*i)(conn_id); } -int server::add_connection(server_connection* newconn) +/// add a new connection to the server +unsigned int server::add_connection(server_connection* newconn) { unsigned int cid=next_id++; newconn->set_id(cid); newconn->set_server(this); connections[cid]=newconn; + // add all callbacks except new_connection + for(int e=connection_closed; e != __events_end; e++) + { + std::list >::iterator i,ie=callbacks[e].end(); + for (i=callbacks[e].begin(); i != ie; i++) + newconn->add_callback(static_cast(e),bind(*i,cid)); + } + LOGSTREAM(debug,"new connection accepted, id: " << cid); - do_callbacks(new_connection,newconn); + do_callbacks(new_connection,cid); return cid; } @@ -146,7 +210,7 @@ void server::cleanup() 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"); + LOGSTREAM(debug,"removing connection " << i->first << " because it is closed and no more data waiting"); delete i->second; connections.erase(i);