Fixes compilation with boost 1.67 on GNU/Linux.

freelan-developers · Sep 16, 2018 · aaa92c8 · aaa92c8
1 parent 2c5ccc7
commit aaa92c8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/samples/asiotap/routes/routes.cpp b/samples/asiotap/routes/routes.cpp
@@ -106,9 +106,12 @@ int main()
 		tap_adapter.open();
 
 		asiotap::tap_adapter_configuration configuration {};
-		configuration.ipv4.network_address = { boost::asio::ip::address_v4::from_string("9.0.0.1"), 24 };
-		configuration.ipv4.remote_address = boost::asio::ip::address_v4::from_string("9.0.0.0");
-		configuration.ipv6.network_address = { boost::asio::ip::address_v6::from_string("fe80::c887:eb51:aaaa:bbbb"), 64 };
+		asiotap::ipv4_network_address ipv4 = { boost::asio::ip::address_v4::from_string("9.0.0.1"), 24 };
+		boost::asio::ip::address_v4 ipv4_remote = boost::asio::ip::address_v4::from_string("9.0.0.0");
+		asiotap::ipv6_network_address ipv6 = { boost::asio::ip::address_v6::from_string("fe80::c887:eb51:aaaa:bbbb"), 64 };
+		configuration.ipv4.network_address = ipv4;
+		configuration.ipv4.remote_address = ipv4_remote;
+		configuration.ipv6.network_address = ipv6;
 
 		tap_adapter.configure(configuration);
 

diff --git a/samples/asiotap/tap/tap.cpp b/samples/asiotap/tap/tap.cpp
@@ -227,8 +227,10 @@ int main()
 		tap_adapter.open();
 
 		asiotap::tap_adapter_configuration configuration {};
-		configuration.ipv4.network_address = { boost::asio::ip::address_v4::from_string("9.0.0.1"), 24 };
-		configuration.ipv6.network_address = { boost::asio::ip::address_v6::from_string("fe80::c887:eb51:aaaa:bbbb"), 64 };
+		asiotap::ipv4_network_address ipv4 = { boost::asio::ip::address_v4::from_string("9.0.0.1"), 24 };
+		asiotap::ipv6_network_address ipv6 = { boost::asio::ip::address_v6::from_string("fe80::c887:eb51:aaaa:bbbb"), 64 };
+		configuration.ipv4.network_address = ipv4;
+		configuration.ipv6.network_address = ipv6;
 
 		tap_adapter.configure(configuration);
 

diff --git a/samples/asiotap/tun/tun.cpp b/samples/asiotap/tun/tun.cpp
@@ -207,9 +207,12 @@ int main()
 		tap_adapter.open();
 
 		asiotap::tap_adapter_configuration configuration {};
-		configuration.ipv4.network_address = { boost::asio::ip::address_v4::from_string("9.0.0.1"), 24 };
-		configuration.ipv4.remote_address = boost::asio::ip::address_v4::from_string("9.0.0.0");
-		configuration.ipv6.network_address = { boost::asio::ip::address_v6::from_string("fe80::c887:eb51:aaaa:bbbb"), 64 };
+		asiotap::ipv4_network_address ipv4 = { boost::asio::ip::address_v4::from_string("9.0.0.1"), 24 };
+		boost::asio::ip::address_v4 ipv4_remote = boost::asio::ip::address_v4::from_string("9.0.0.0");
+		asiotap::ipv6_network_address ipv6 = { boost::asio::ip::address_v6::from_string("fe80::c887:eb51:aaaa:bbbb"), 64 };
+		configuration.ipv4.network_address = ipv4;
+		configuration.ipv4.remote_address = ipv4_remote;
+		configuration.ipv6.network_address = ipv6;
 
 		tap_adapter.configure(configuration);
 

diff --git a/samples/netlinkplus/routing/SConscript b/samples/netlinkplus/routing/SConscript
@@ -5,6 +5,7 @@ libraries = [
     'netlinkplus',
     'boost_system',
     'boost_iostreams',
+    'pthread'
 ]
 
 Import('env dirs name')