Merge pull request #2 from MarkusJx/master

Add support for multiple network adapters

Author: inetic

include/upnp/igd.h

@@ -124,6 +124,12 @@ class igd final {
 
     const std::string& friendly_name() const { return _upnp_device.friendly_name; }
 
+    /*
+     * Discover IGD devices.
+     */
+    static
+    result<std::vector<igd>> discover(net::any_io_executor, const net::ip::address_v4& bind_ip, net::yield_context);
+
     /*
      * Discover IGD devices.
      */

include/upnp/ssdp.h

@@ -9,6 +9,7 @@
 #include <boost/range/begin.hpp> // needed by spawn
 #include <boost/range/end.hpp> // needed by spawn
 #include <boost/asio/spawn.hpp>
+#include <boost/asio/ip/address_v4.hpp>
 
 namespace upnp { namespace ssdp {
 
@@ -67,7 +68,7 @@ class query {
     query(query&&)            = default;
     query& operator=(query&&) = default;
 
-    static result<query> start(net::any_io_executor, net::yield_context);
+    static result<query> start(net::any_io_executor exec, const net::ip::address_v4& bind_ip, net::yield_context yield);
 
     // May be called multiple times until error is of type error_code.
     // This let's callers of this function decide what to do when ssdp

src/igd.cpp

@@ -294,11 +294,13 @@ igd::soap_request( string_view command
 }
 
 /* static */
-result<std::vector<igd>> igd::discover(net::any_io_executor exec, net::yield_context yield)
+result<std::vector<igd>> igd::discover(net::any_io_executor exec
+                                       , const net::ip::address_v4& bind_ip
+                                       , net::yield_context yield)
 {
     using namespace std;
 
-    auto q = ssdp::query::start(exec, yield);
+    auto q = ssdp::query::start(exec, bind_ip, yield);
     if (!q) return q.error();
     auto& query = q.value();
 
@@ -373,6 +375,11 @@ result<std::vector<igd>> igd::discover(net::any_io_executor exec, net::yield_con
     return {std::move(igds)};
 }
 
+result<std::vector<igd>> igd::discover(net::any_io_executor exec, net::yield_context yield)
+{
+    return std::move(discover(exec, net::ip::address_v4::any(), yield));
+}
+
 /* static */
 result<device>
 igd::query_root_device( net::any_io_executor exec

src/ssdp.cpp

@@ -41,12 +41,12 @@ struct query::state_t : std::enable_shared_from_this<state_t> {
     result<query::response, query::error::get_response>
     get_response(net::yield_context yield);
 
-    result<void> start(net::yield_context);
+    result<void> start(const net::ip::address_v4 &bind_ip, net::yield_context);
 
     void stop();
 };
 
-result<void> query::state_t::start(net::yield_context yield)
+result<void> query::state_t::start(const net::ip::address_v4 &bind_ip, net::yield_context yield)
 {
     using udp = net::ip::udp;
     using namespace std::chrono;
@@ -55,7 +55,8 @@ result<void> query::state_t::start(net::yield_context yield)
     _socket.set_option(net::ip::multicast::join_group(_multicast_ep.address()));
 
     error_code ec;
-    _socket.bind(udp::endpoint(net::ip::address_v4::any(), 0), ec);
+    _socket.bind(udp::endpoint(bind_ip, 0), ec);
+
     if (ec) return ec;
 
     std::stringstream ss;
@@ -231,10 +232,10 @@ query::query(std::shared_ptr<state_t> state)
 {}
 
 /* static */
-result<query> query::start(net::any_io_executor exec, net::yield_context yield)
+result<query> query::start(net::any_io_executor exec, const net::ip::address_v4& bind_ip, net::yield_context yield)
 {
     auto st = std::make_shared<state_t>(exec);
-    auto r = st->start(yield);
+    auto r = st->start(bind_ip, yield);
     if (!r) return r.error();
     return query{std::move(st)};
 }