Skip to content
Snippets Groups Projects
Commit d78d1acb authored by Adrien Béraud's avatar Adrien Béraud
Browse files

fix various warnings

Change-Id: Iecf54a3a0368c99705969679fe18ceda59ce4290
parent 2a4e73d2
Branches
Tags
No related merge requests found
......@@ -662,7 +662,7 @@ ConnectionManager::Impl::connectDevice(const dht::InfoHash& deviceId,
if (auto shared = w.lock()) {
shared->connectDevice(cert,
name,
[cb, deviceId](const std::shared_ptr<ChannelSocket>& sock, const DeviceId& did){
[cb, deviceId](const std::shared_ptr<ChannelSocket>& sock, const DeviceId& /*did*/){
cb(sock, deviceId);
},
noNewSocket,
......@@ -771,7 +771,6 @@ ConnectionManager::Impl::connectDevice(const std::shared_ptr<dht::crypto::Certif
}
ice_config.tcpEnable = true;
ice_config.onInitDone = [w,
deviceId = std::move(deviceId),
devicePk = std::move(devicePk),
name = std::move(name),
cert = std::move(cert),
......
......@@ -62,9 +62,8 @@ public:
const DeviceId& deviceId,
std::unique_ptr<TlsSocketEndpoint> endpoint)
: parent_(parent)
, deviceId(deviceId)
, ctx_(std::move(ctx))
, beaconTimer_(*ctx_)
, deviceId(deviceId)
, endpoint(std::move(endpoint))
, eventLoopThread_ {[this] {
try {
......@@ -75,6 +74,7 @@ public:
shutdown();
}
}}
, beaconTimer_(*ctx_)
{}
~Impl() {}
......
......@@ -78,7 +78,7 @@ getFirstElementItem(IXML_Element* element, const char* item)
}
static bool
errorOnResponse(IXML_Document* doc)
errorOnResponse(IXML_Document* doc, const std::shared_ptr<dht::log::Logger>& logger)
{
if (not doc)
return true;
......@@ -86,9 +86,9 @@ errorOnResponse(IXML_Document* doc)
auto errorCode = getFirstDocItem(doc, "errorCode");
if (not errorCode.empty()) {
auto errorDescription = getFirstDocItem(doc, "errorDescription");
// if (logger_) logger_->warn("PUPnP: Response contains error: {:s}: {:s}",
// errorCode,
// errorDescription);
if (logger) logger->warn("PUPnP: Response contains error: {:s}: {:s}",
errorCode,
errorDescription);
return true;
}
return false;
......@@ -1154,7 +1154,7 @@ PUPnP::actionIsIgdConnected(const UPnPIGD& igd)
}
XMLDocument response(response_container_ptr, ixmlDocument_free);
if (errorOnResponse(response.get())) {
if (errorOnResponse(response.get(), logger_)) {
if (logger_) logger_->warn("PUPnP: Failed to get GetStatusInfo from {} -> {:d}: {}",
igd.getServiceType().c_str(),
upnp_err,
......@@ -1206,7 +1206,7 @@ PUPnP::actionGetExternalIP(const UPnPIGD& igd)
return {};
}
if (errorOnResponse(response.get())) {
if (errorOnResponse(response.get(), logger_)) {
if (logger_) logger_->warn("PUPnP: Failed to get GetExternalIPAddress from {} -> {:d}: {}",
igd.getServiceType(),
upnp_err,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment