upnp: set context in ConnectionManager

Change-Id: I2fe4f7e2c48edb99154d07619a79dae3bff6b091

include/upnp/upnp_control.h

@@ -31,7 +31,7 @@ namespace upnp {
 
 class UPnPContext;
 
-class Controller
+class Controller : std::enable_shared_from_this<Controller>
 {
 public:
     Controller(const std::shared_ptr<UPnPContext>& ctx);

src/connectionmanager.cpp

@@ -1473,6 +1473,7 @@ ConnectionManager::Impl::getIceOptions() const noexcept
     IceTransportOptions opts;
     opts.factory = config_->factory;
     opts.upnpEnable = getUPnPActive();
+    opts.upnpContext = config_->upnpCtrl;
 
     if (config_->stunEnabled)
         opts.stunServers.emplace_back(StunServerInfo().setUri(config_->stunServer));

src/ice_transport.cpp

@@ -415,7 +415,7 @@ IceTransport::Impl::initIceInstance(const IceTransportOptions& options)
              initiatorSession_ ? "master" : "slave");
 
     if (upnpEnabled_)
-        upnp_.reset(new upnp::Controller(options.upnpContext));
+        upnp_ = std::make_shared<upnp::Controller>(options.upnpContext);
 
     config_ = options.factory->getIceCfg(); // config copy
     if (isTcp_) {