Commitb886faa

committed

Expose OS-chosen address and port; force IPv4

1 parent9bcbde7 commitb886faaCopy full SHA for b886faa

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,13 @@`
`4`	`4`	`# http://www.boost.org/LICENSE_1_0.txt)`
`5`	`5`
`6`	`6`	`cmake_minimum_required(VERSION 2.8)`
`7`		`-project(CPP-NETLIB)`
	`7`	`+cmake_policy(SET CMP0048 NEW)# The project() command manages VERSION variables.`
	`8`	`+project(CPP-NETLIBVERSION 0.11.1)`
`8`	`9`
`9`		`-option( CPP-NETLIB_BUILD_SHARED_LIBS"Build cpp-netlib as shared libraries."OFF )`
`10`		`-option( CPP-NETLIB_BUILD_TESTS"Build the cpp-netlib project tests."ON)`
`11`		`-option( CPP-NETLIB_BUILD_EXPERIMENTS"Build the cpp-netlib project experiments."ON)`
`12`		`-option( CPP-NETLIB_BUILD_EXAMPLES"Build the cpp-netlib project examples."ON)`
	`10`	`+option( CPP-NETLIB_BUILD_SHARED_LIBS"Build cpp-netlib as shared libraries."ON )`
	`11`	`+option( CPP-NETLIB_BUILD_TESTS"Build the cpp-netlib project tests."OFF)`
	`12`	`+option( CPP-NETLIB_BUILD_EXPERIMENTS"Build the cpp-netlib project experiments."OFF)`
	`13`	`+option( CPP-NETLIB_BUILD_EXAMPLES"Build the cpp-netlib project examples."OFF)`
`13`	`14`	`option( CPP-NETLIB_ENABLE_HTTPS"Build cpp-netlib with support for https if OpenSSL is found."ON)`
`14`	`15`
`15`	`16`	`include(GNUInstallDirs)`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,9 @@ struct sync_server_base : server_storage_base, socket_options_base {`
`62`	`62`	`if (!listening_)start_listening();`
`63`	`63`	`}`
`64`	`64`
	`65`	`+const string_type&address()const {return address_; }`
	`66`	`+const string_type&port()const {return port_; }`
	`67`	`+`
`65`	`68`	`private:`
`66`	`69`	`Handler& handler_;`
`67`	`70`	`string_type address_, port_;`
`@@ -86,7 +89,7 @@ struct sync_server_base : server_storage_base, socket_options_base {`
`86`	`89`	`using boost::asio::ip::tcp;`
`87`	`90`	`system::error_code error;`
`88`	`91`	`tcp::resolverresolver(service_);`
`89`		`- tcp::resolver::queryquery(address_, port_);`
	`92`	`+ tcp::resolver::queryquery(tcp::v4(),address_, port_);`
`90`	`93`	`tcp::resolver::iterator endpoint_iterator = resolver.resolve(query, error);`
`91`	`94`	`if (error) {`
`92`	`95`	`BOOST_NETWORK_MESSAGE("Error resolving address:" << address_ <<':'`
`@@ -109,6 +112,8 @@ struct sync_server_base : server_storage_base, socket_options_base {`
`109`	`112`	`<< error <<'\'');`
`110`	`113`	`boost::throw_exception(std::runtime_error("Error binding to socket."));`
`111`	`114`	`}`
	`115`	`+ address_ = acceptor_.local_endpoint().address().to_v4().to_string();`
	`116`	`+ port_ =std::to_string(acceptor_.local_endpoint().port());`
`112`	`117`	`acceptor_.listen(tcp::socket::max_connections, error);`
`113`	`118`	`if (error) {`
`114`	`119`	`BOOST_NETWORK_MESSAGE("Error listening on socket:"`

Comments

(0)