-/***************************************************************************
- * 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 <string>
#include <sstream>
#include "container.hxx"
#include "log.hxx"
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
using namespace std;
{
command_server::command_server(server& _s)
- : s(_s)
+ : s(_s), guard_handle(0)
{
// register callback
s.add_callback(new_connection,bind(&command_server::send_hello, boost::ref(*this), _1));
}
+/**
+ * Destructor
+ */
+command_server::~command_server()
+{
+}
+
+/// send a hello message to a new connection
void command_server::send_hello(unsigned int conn_id)
{
server_connection* sc=s.get_connection(conn_id);
+ if (!sc)
+ return; // connection not existing, so no hello
+
std::ostringstream hello;
hello << "T2Nv" << PROTOCOL_VERSION << ';';
"code " << e.code << " (" << e.what() << ")";
res.set_exception(new t2n_serialization_error(msg.str()));
}
- catch(...)
- { throw; }
if (!res.has_exception())
{
}
catch (t2n_exception &e)
{ res.set_exception(e.clone()); }
- catch (...)
- { throw; }
}
else
{
res.set_exception(new t2n_serialization_error(msg.str()));
oa << res;
}
- catch(...)
- { throw; }
std::ostream* ostr;
if ((ostr=s.get_logstream(fulldebug))!=NULL)
/** @brief handle incoming commands
@param[in,out] usec_timeout wait until new data is found, max timeout usecs.
-1: wait endless, 0: instant return
+ @param[out] usec_timeout_remaining microseconds from the timeout that were not used
*/
void command_server::handle(long long usec_timeout, long long* usec_timeout_remaining)
{
- if (s.fill_buffer(usec_timeout,usec_timeout_remaining))
- {
- std::string packet;
- unsigned int conn_id;
+ guard_handle++;
- while (s.get_packet(packet,conn_id))
+ try
+ {
+ if (s.fill_buffer(usec_timeout,usec_timeout_remaining))
{
- server_connection* conn=s.get_connection(conn_id);
- if (!conn)
- EXCEPTIONSTREAM(error,logic_error,"illegal connection id " << conn_id << " received");
+ std::string packet;
+ unsigned int conn_id = 0;
- try
- { handle_packet(packet,conn); }
- catch (t2n_transfer_error &e)
+ while (s.get_packet(packet,conn_id))
{
- // shut down a connection with transfer errors (usually write errors)
- conn->close();
+ server_connection* conn=s.get_connection(conn_id);
+ if (!conn)
+ EXCEPTIONSTREAM(error,logic_error,"illegal connection id " << conn_id << " received");
+ try
+ { handle_packet(packet,conn); }
+ catch (t2n_transfer_error &e)
+ {
+ // shut down a connection with transfer errors (usually write errors)
+ conn->close();
+ }
}
- catch(...)
- { throw; }
}
}
- s.cleanup();
+ catch(...)
+ {
+ guard_handle--;
+ throw;
+ }
+ guard_handle--;
+
+ // don't call cleanup on re-entered handle-calls
+ if (guard_handle == 0)
+ s.cleanup();
}
}
git://developer.intra2net.com / libt2n / blobdiff