{
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));
}
+/// 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 << ';';
/** @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))
+ guard_handle++;
+ try
{
- std::string packet;
- unsigned int conn_id;
-
- while (s.get_packet(packet,conn_id))
+ 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;
- 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; }
}
- 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();
}
}