From c885981c656b1334acfe5f9fb51bdf3064421317 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Wed, 12 Dec 2012 22:08:32 -0500 Subject: [PATCH] fixes to http/tcp server --- include/fc/value_io.hpp | 3 --- src/http_connection.cpp | 2 ++ src/tcp_socket.cpp | 10 ++-------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/include/fc/value_io.hpp b/include/fc/value_io.hpp index 51edb5e..b18ce56 100644 --- a/include/fc/value_io.hpp +++ b/include/fc/value_io.hpp @@ -93,19 +93,16 @@ namespace fc { */ template inline void pack_helper( const T& v, const char* name )const { - slog( "%s", name ); fc::pack( obj[name], v ); } template inline void pack_helper( const fc::optional& v, const char* name )const { - slog( "%s", name ); if( !!v ) { fc::pack( obj[name], *v ); } } template inline void operator()( const char* name )const { - slog( "%s", name ); pack_helper( c.*p, name ); } diff --git a/src/http_connection.cpp b/src/http_connection.cpp index 0a28c5d..648305c 100644 --- a/src/http_connection.cpp +++ b/src/http_connection.cpp @@ -9,6 +9,8 @@ FC_START_SHARED_IMPL(fc::http::connection) fc::tcp_socket sock; fc::ip::endpoint ep; + impl() { + } int read_until( char* buffer, char* end, char c = '\n' ) { char* p = buffer; diff --git a/src/tcp_socket.cpp b/src/tcp_socket.cpp index ddfa3d2..541184a 100644 --- a/src/tcp_socket.cpp +++ b/src/tcp_socket.cpp @@ -9,7 +9,7 @@ namespace fc { class tcp_socket::impl { public: - impl():_sock( fc::asio::default_io_service() ){ slog( "creating socket %p", &_sock); } + impl():_sock( fc::asio::default_io_service() ){ } ~impl(){ if( _sock.is_open() ) _sock.close(); } @@ -87,7 +87,6 @@ namespace fc { public: impl(uint16_t port): _accept( fc::asio::default_io_service(), boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port) ){ - slog( "... tcp server port %d", port ); } ~impl(){ _accept.close(); @@ -108,23 +107,18 @@ namespace fc { bool tcp_server::accept( tcp_socket& s ) { + if( !my ) return false; fc::promise::ptr p( new promise("tcp::accept") ); - slog( "accept socket %p", &s.my->_sock ); my->_accept.async_accept( s.my->_sock, [=]( const boost::system::error_code& e ) { p->set_value(e); } ); - slog( "."); auto ec = p->wait(); - slog( "."); if( !ec ) s.my->_sock.non_blocking(true); - slog( "."); if( ec ) BOOST_THROW_EXCEPTION( boost::system::system_error(ec) ); - slog( "."); return true; } void tcp_server::listen( uint16_t port ) { if( my ) delete my; - slog( "Listen %d", port ); my = new impl(port); }