Merge pull request #679 from vovams/0.13-release-integration

glynos · web-flow · commit a97ab01cae4c · 2016-08-12T18:12:47.000+02:00
Fix #677 in 0.13: Exception in async_server_base/async_connection during port scanning (nmap)
diff --git a/boost/network/protocol/http/server/async_connection.hpp b/boost/network/protocol/http/server/async_connection.hpp
@@ -462,11 +462,18 @@ struct async_connection
   enum state_t { method, uri, version, headers };
 
   void start() {
-    typename ostringstream<Tag>::type ip_stream;
-    ip_stream << socket_.remote_endpoint().address().to_string() << ':'
-              << socket_.remote_endpoint().port();
-    request_.source = ip_stream.str();
-    read_more(method);
+    boost::system::error_code ec;
+    auto remote_endpoint = socket_.remote_endpoint(ec);
+    
+    if (ec) {
+      error_encountered = in_place<boost::system::system_error>(ec);
+    } else {
+      typename ostringstream<Tag>::type ip_stream;
+      ip_stream << remote_endpoint.address().to_string() << ':'
+                << remote_endpoint.port();
+      request_.source = ip_stream.str();
+      read_more(method);
+    }
   }
 
   void read_more(state_t state) {
diff --git a/boost/network/protocol/stream_handler.hpp b/boost/network/protocol/stream_handler.hpp
@@ -103,12 +103,21 @@ struct stream_handler {
     }
   }
 
-  tcp_socket::endpoint_type remote_endpoint() const {
+  tcp_socket::endpoint_type remote_endpoint(boost::system::error_code& ec) const {
     if (ssl_enabled) {
-      return ssl_sock_->next_layer().remote_endpoint();
+      return ssl_sock_->next_layer().remote_endpoint(ec);
     } else {
-      return tcp_sock_->remote_endpoint();
+      return tcp_sock_->remote_endpoint(ec);
+    }
+  }
+
+  tcp_socket::endpoint_type remote_endpoint() const {
+    boost::system::error_code ec;
+    tcp_socket::endpoint_type r = remote_endpoint(ec);
+    if (ec) {
+      boost::asio::detail::throw_error(ec, "remote_endpoint");
     }
+    return r;
   }
 
   void shutdown(boost::asio::socket_base::shutdown_type st,

Original file line number	Diff line number	Diff line change
`@@ -103,12 +103,21 @@ struct stream_handler {`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`		`- tcp_socket::endpoint_type remote_endpoint() const {`
	`106`	`+ tcp_socket::endpoint_type remote_endpoint(boost::system::error_code& ec) const {`
`107`	`107`	`if (ssl_enabled) {`
`108`		`- return ssl_sock_->next_layer().remote_endpoint();`
	`108`	`+ return ssl_sock_->next_layer().remote_endpoint(ec);`
`109`	`109`	`} else {`
`110`		`- return tcp_sock_->remote_endpoint();`
	`110`	`+ return tcp_sock_->remote_endpoint(ec);`
	`111`	`+ }`
	`112`	`+ }`
	`113`	`+`
	`114`	`+ tcp_socket::endpoint_type remote_endpoint() const {`
	`115`	`+ boost::system::error_code ec;`
	`116`	`+ tcp_socket::endpoint_type r = remote_endpoint(ec);`
	`117`	`+ if (ec) {`
	`118`	`+ boost::asio::detail::throw_error(ec, "remote_endpoint");`
`111`	`119`	`}`
	`120`	`+ return r;`
`112`	`121`	`}`
`113`	`122`
`114`	`123`	`void shutdown(boost::asio::socket_base::shutdown_type st,`