Commita97ab01

authored

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

Fix#677 in 0.13: Exception in async_server_base/async_connection during port scanning (nmap)

2 parents87dd551 +524b999 commita97ab01Copy full SHA for a97ab01

File tree

+24

-8

lines changed

+24

-8

lines changed

Lines changed: 12 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -462,11 +462,18 @@ struct async_connection`
`462`	`462`	`enumstate_t { method, uri, version, headers };`
`463`	`463`
`464`	`464`	`voidstart() {`
`465`		`-typename ostringstream<Tag>::type ip_stream;`
`466`		`- ip_stream << socket_.remote_endpoint().address().to_string() <<':'`
`467`		`- << socket_.remote_endpoint().port();`
`468`		`- request_.source = ip_stream.str();`
`469`		`-read_more(method);`
	`465`	`+ boost::system::error_code ec;`
	`466`	`+auto remote_endpoint = socket_.remote_endpoint(ec);`
	`467`	`+`
	`468`	`+if (ec) {`
	`469`	`+ error_encountered = in_place<boost::system::system_error>(ec);`
	`470`	`+ }else {`
	`471`	`+typename ostringstream<Tag>::type ip_stream;`
	`472`	`+ ip_stream << remote_endpoint.address().to_string() <<':'`
	`473`	`+ << remote_endpoint.port();`
	`474`	`+ request_.source = ip_stream.str();`
	`475`	`+read_more(method);`
	`476`	`+ }`
`470`	`477`	`}`
`471`	`478`
`472`	`479`	`voidread_more(state_t state) {`

Lines changed: 12 additions & 3 deletions

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_typeremote_endpoint()const {`
	`106`	`+ tcp_socket::endpoint_typeremote_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_typeremote_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`	`voidshutdown(boost::asio::socket_base::shutdown_type st,`

Comments

(0)