lock_guard: remove explicit template
Change-Id: Iec6d57d6a66557a66096c7a8f67e025c6ca5a64c
diff --git a/src/upnp/protocol/igd.h b/src/upnp/protocol/igd.h
index 8e8e5a9..19f773a 100644
--- a/src/upnp/protocol/igd.h
+++ b/src/upnp/protocol/igd.h
@@ -50,32 +50,32 @@
IpAddr getLocalIp() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return localIp_;
}
IpAddr getPublicIp() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return publicIp_;
}
void setLocalIp(const IpAddr& addr)
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
localIp_ = addr;
}
void setPublicIp(const IpAddr& addr)
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
publicIp_ = addr;
}
void setUID(const std::string& uid)
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
uid_ = uid;
}
std::string getUID() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return uid_;
}
diff --git a/src/upnp/protocol/mapping.cpp b/src/upnp/protocol/mapping.cpp
index 1222261..846553f 100644
--- a/src/upnp/protocol/mapping.cpp
+++ b/src/upnp/protocol/mapping.cpp
@@ -40,7 +40,7 @@
Mapping::Mapping(const Mapping& other)
{
- std::lock_guard<std::mutex> lock(other.mutex_);
+ std::lock_guard lock(other.mutex_);
internalAddr_ = other.internalAddr_;
internalPort_ = other.internalPort_;
@@ -85,28 +85,28 @@
// available_ ? "AVAILABLE" : "UNAVAILABLE",
// val ? "AVAILABLE" : "UNAVAILABLE");
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
available_ = val;
}
void
Mapping::setState(const MappingState& state)
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
state_ = state;
}
const char*
Mapping::getStateStr() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return getStateStr(state_);
}
std::string
Mapping::toString(bool extraInfo) const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
std::ostringstream descr;
descr << UPNP_MAPPING_DESCRIPTION_PREFIX << "-" << getTypeStr(type_);
descr << ":" << std::to_string(internalPort_);
@@ -122,7 +122,7 @@
bool
Mapping::isValid() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
if (state_ == MappingState::FAILED)
return false;
if (internalPort_ == 0)
@@ -138,7 +138,7 @@
bool
Mapping::hasValidHostAddress() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
IpAddr intAddr(internalAddr_);
return intAddr and not intAddr.isLoopback();
@@ -147,7 +147,7 @@
bool
Mapping::hasPublicAddress() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return igd_ and igd_->getPublicIp() and not igd_->getPublicIp().isPrivate();
}
@@ -155,7 +155,7 @@
Mapping::key_t
Mapping::getMapKey() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
key_t mapKey = internalPort_;
if (type_ == PortType::UDP)
@@ -172,7 +172,7 @@
std::string
Mapping::getExternalAddress() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
if (igd_)
return igd_->getPublicIp().toString();
return {};
@@ -181,91 +181,91 @@
void
Mapping::setExternalPort(uint16_t port)
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
externalPort_ = port;
}
uint16_t
Mapping::getExternalPort() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return externalPort_;
}
std::string
Mapping::getExternalPortStr() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return std::to_string(externalPort_);
}
void
Mapping::setInternalAddress(const std::string& addr)
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
internalAddr_ = addr;
}
std::string
Mapping::getInternalAddress() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return internalAddr_;
}
void
Mapping::setInternalPort(uint16_t port)
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
internalPort_ = port;
}
uint16_t
Mapping::getInternalPort() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return internalPort_;
}
std::string
Mapping::getInternalPortStr() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return std::to_string(internalPort_);
}
PortType
Mapping::getType() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return type_;
}
const char*
Mapping::getTypeStr() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return getTypeStr(type_);
}
bool
Mapping::isAvailable() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return available_;
}
std::shared_ptr<IGD>
Mapping::getIgd() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return igd_;
}
NatProtocolType
Mapping::getProtocol() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
if (igd_)
return igd_->getProtocol();
return NatProtocolType::UNKNOWN;
@@ -287,42 +287,42 @@
void
Mapping::setIgd(const std::shared_ptr<IGD>& igd)
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
igd_ = igd;
}
MappingState
Mapping::getState() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return state_;
}
Mapping::NotifyCallback
Mapping::getNotifyCallback() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return notifyCb_;
}
void
Mapping::setNotifyCallback(NotifyCallback cb)
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
notifyCb_ = std::move(cb);
}
void
Mapping::enableAutoUpdate(bool enable)
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
autoUpdate_ = enable;
}
bool
Mapping::getAutoUpdate() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return autoUpdate_;
}
@@ -330,14 +330,14 @@
sys_clock::time_point
Mapping::getRenewalTime() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return renewalTime_;
}
void
Mapping::setRenewalTime(sys_clock::time_point time)
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
renewalTime_ = time;
}
#endif
diff --git a/src/upnp/protocol/natpmp/nat_pmp.cpp b/src/upnp/protocol/natpmp/nat_pmp.cpp
index c822b37..cf45b12 100644
--- a/src/upnp/protocol/natpmp/nat_pmp.cpp
+++ b/src/upnp/protocol/natpmp/nat_pmp.cpp
@@ -42,7 +42,7 @@
initialized_ = false;
{
- std::lock_guard<std::mutex> lock(natpmpMutex_);
+ std::lock_guard lock(natpmpMutex_);
hostAddress_ = ip_utils::getLocalAddr(AF_INET);
}
@@ -121,7 +121,7 @@
initialized_ = false;
observer_ = nullptr;
- std::lock_guard<std::mutex> lock(natpmpMutex_);
+ std::lock_guard lock(natpmpMutex_);
shutdownComplete_ = true;
cv.notify_one();
}
@@ -135,7 +135,7 @@
terminate(cv);
});
- std::unique_lock<std::mutex> lk(natpmpMutex_);
+ std::unique_lock lk(natpmpMutex_);
if (cv.wait_for(lk, std::chrono::seconds(10), [this] { return shutdownComplete_; })) {
if (logger_) logger_->debug("NAT-PMP: Shutdown completed");
} else {
@@ -146,7 +146,7 @@
const IpAddr
NatPmp::getHostAddress() const
{
- std::lock_guard<std::mutex> lock(natpmpMutex_);
+ std::lock_guard lock(natpmpMutex_);
return hostAddress_;
}
@@ -203,7 +203,7 @@
std::list<std::shared_ptr<IGD>>
NatPmp::getIgdList() const
{
- std::lock_guard<std::mutex> lock(natpmpMutex_);
+ std::lock_guard lock(natpmpMutex_);
std::list<std::shared_ptr<IGD>> igdList;
if (igd_->isValid())
igdList.emplace_back(igd_);
diff --git a/src/upnp/protocol/pupnp/pupnp.cpp b/src/upnp/protocol/pupnp/pupnp.cpp
index 7003a49..8aa462d 100644
--- a/src/upnp/protocol/pupnp/pupnp.cpp
+++ b/src/upnp/protocol/pupnp/pupnp.cpp
@@ -155,7 +155,7 @@
bool
PUPnP::isRunning() const
{
- std::unique_lock<std::mutex> lk(pupnpMutex_);
+ std::unique_lock lk(pupnpMutex_);
return not shutdownComplete_;
}
@@ -183,7 +183,7 @@
const IpAddr
PUPnP::getHostAddress() const
{
- std::lock_guard<std::mutex> lock(pupnpMutex_);
+ std::lock_guard lock(pupnpMutex_);
return hostAddress_;
}
@@ -194,7 +194,7 @@
clientRegistered_ = false;
observer_ = nullptr;
- std::unique_lock<std::mutex> lk(ongoingOpsMtx_);
+ std::unique_lock lk(ongoingOpsMtx_);
destroying_ = true;
cvOngoing_.wait(lk, [&]() { return ongoingOps_ == 0; });
@@ -211,7 +211,7 @@
// Clear all the lists.
discoveredIgdList_.clear();
- std::lock_guard<std::mutex> lock(pupnpMutex_);
+ std::lock_guard lock(pupnpMutex_);
validIgdList_.clear();
shutdownComplete_ = true;
cv.notify_one();
@@ -225,7 +225,7 @@
terminate(cv);
});
- std::unique_lock<std::mutex> lk(pupnpMutex_);
+ std::unique_lock lk(pupnpMutex_);
if (cv.wait_for(lk, std::chrono::seconds(10), [this] { return shutdownComplete_; })) {
if (logger_) logger_->debug("PUPnP: Shutdown completed");
} else {
@@ -282,7 +282,7 @@
igdSearchCounter_ = 0;
{
- std::lock_guard<std::mutex> lock(pupnpMutex_);
+ std::lock_guard lock(pupnpMutex_);
for (auto const& igd : validIgdList_) {
igd->setValid(false);
}
@@ -350,7 +350,7 @@
std::list<std::shared_ptr<IGD>>
PUPnP::getIgdList() const
{
- std::lock_guard<std::mutex> lock(pupnpMutex_);
+ std::lock_guard lock(pupnpMutex_);
std::list<std::shared_ptr<IGD>> igdList;
for (auto& it : validIgdList_) {
// Return only active IGDs.
@@ -374,7 +374,7 @@
bool
PUPnP::hasValidIgd() const
{
- std::lock_guard<std::mutex> lock(pupnpMutex_);
+ std::lock_guard lock(pupnpMutex_);
for (auto& it : validIgdList_) {
if (it->isValid()) {
return true;
@@ -386,14 +386,14 @@
void
PUPnP::updateHostAddress()
{
- std::lock_guard<std::mutex> lock(pupnpMutex_);
+ std::lock_guard lock(pupnpMutex_);
hostAddress_ = ip_utils::getLocalAddr(AF_INET);
}
bool
PUPnP::hasValidHostAddress()
{
- std::lock_guard<std::mutex> lock(pupnpMutex_);
+ std::lock_guard lock(pupnpMutex_);
return hostAddress_ and not hostAddress_.isLoopback();
}
@@ -485,7 +485,7 @@
{
// Add the IGD if not already present in the list.
- std::lock_guard<std::mutex> lock(pupnpMutex_);
+ std::lock_guard lock(pupnpMutex_);
for (auto& igd : validIgdList_) {
// Must not be a null pointer
assert(igd.get() != nullptr);
@@ -527,7 +527,7 @@
{
// This is a new (and hopefully valid) IGD.
- std::lock_guard<std::mutex> lock(pupnpMutex_);
+ std::lock_guard lock(pupnpMutex_);
validIgdList_.emplace_back(igd_candidate);
}
@@ -586,7 +586,7 @@
std::shared_ptr<UPnPIGD>
PUPnP::findMatchingIgd(const std::string& ctrlURL) const
{
- std::lock_guard<std::mutex> lock(pupnpMutex_);
+ std::lock_guard lock(pupnpMutex_);
auto iter = std::find_if(validIgdList_.begin(),
validIgdList_.end(),
@@ -783,7 +783,7 @@
{
if(logger_) logger_->debug("PUPnP: downLoadIgdDescription {}", locationUrl);
{
- std::lock_guard<std::mutex> lk(ongoingOpsMtx_);
+ std::lock_guard lk(ongoingOpsMtx_);
if (destroying_)
return;
ongoingOps_++;
@@ -803,7 +803,7 @@
}
});
}
- std::lock_guard<std::mutex> lk(ongoingOpsMtx_);
+ std::lock_guard lk(ongoingOpsMtx_);
ongoingOps_--;
cvOngoing_.notify_one();
}
@@ -815,7 +815,7 @@
std::shared_ptr<IGD> igd;
{
- std::lock_guard<std::mutex> lk(pupnpMutex_);
+ std::lock_guard lk(pupnpMutex_);
for (auto it = validIgdList_.begin(); it != validIgdList_.end();) {
if ((*it)->getUID() == cpDeviceId) {
igd = *it;
@@ -842,7 +842,7 @@
void
PUPnP::processDiscoverySubscriptionExpired(Upnp_EventType event_type, const std::string& eventSubUrl)
{
- std::lock_guard<std::mutex> lk(pupnpMutex_);
+ std::lock_guard lk(pupnpMutex_);
for (auto& it : validIgdList_) {
if (auto igd = std::dynamic_pointer_cast<UPnPIGD>(it)) {
if (igd->getEventSubURL() == eventSubUrl) {
@@ -1023,7 +1023,7 @@
if (logger_) logger_->warn("PUPnP: could not find UDN in description document of device");
return nullptr;
} else {
- std::lock_guard<std::mutex> lk(pupnpMutex_);
+ std::lock_guard lk(pupnpMutex_);
for (auto& it : validIgdList_) {
if (it->getUID() == UDN) {
// We already have this device in our list.
diff --git a/src/upnp/protocol/pupnp/upnp_igd.h b/src/upnp/protocol/pupnp/upnp_igd.h
index 5ea7fe5..3324e80 100644
--- a/src/upnp/protocol/pupnp/upnp_igd.h
+++ b/src/upnp/protocol/pupnp/upnp_igd.h
@@ -48,37 +48,37 @@
const std::string& getBaseURL() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return baseURL_;
}
const std::string& getFriendlyName() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return friendlyName_;
}
const std::string& getServiceType() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return serviceType_;
}
const std::string& getServiceId() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return serviceId_;
}
const std::string& getLocationURL() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return locationURL_;
}
const std::string& getControlURL() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return controlURL_;
}
const std::string& getEventSubURL() const
{
- std::lock_guard<std::mutex> lock(mutex_);
+ std::lock_guard lock(mutex_);
return eventSubURL_;
}
diff --git a/src/upnp/upnp_context.cpp b/src/upnp/upnp_context.cpp
index 0bbd282..cc54cb1 100644
--- a/src/upnp/upnp_context.cpp
+++ b/src/upnp/upnp_context.cpp
@@ -88,7 +88,7 @@
proto->terminate();
}
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
mappingList_->clear();
mappingListUpdateTimer_.cancel();
controllerList_.clear();
@@ -100,7 +100,7 @@
void
UPnPContext::shutdown()
{
- std::unique_lock<std::mutex> lk(mappingMutex_);
+ std::unique_lock lk(mappingMutex_);
std::condition_variable cv;
ctx->post([&, this] { shutdown(cv); });
@@ -173,7 +173,7 @@
// list while holding the lock.
std::list<Mapping::sharedPtr_t> toRemoveList;
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
PortType types[2] {PortType::TCP, PortType::UDP};
for (auto& type : types) {
@@ -302,7 +302,7 @@
if (not addr)
return;
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
if (knownPublicAddress_ != addr) {
knownPublicAddress_ = std::move(addr);
if (logger_) logger_->debug("Setting the known public address to {}", addr.toString());
@@ -312,14 +312,14 @@
bool
UPnPContext::isReady() const
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
return not validIgdList_.empty();
}
IpAddr
UPnPContext::getExternalIP() const
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
// Return the first IGD Ip available.
if (not validIgdList_.empty()) {
return (*validIgdList_.begin())->getPublicIp();
@@ -342,7 +342,7 @@
Mapping::sharedPtr_t mapRes;
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
auto& mappingList = getMappingList(requestedMap.getType());
// We try to provide a mapping in "OPEN" state. If not found,
@@ -417,7 +417,7 @@
UPnPContext::registerController(void* controller)
{
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
if (shutdownComplete_) {
if (logger_) logger_->warn("UPnPContext already shut down");
return;
@@ -439,7 +439,7 @@
{
if (shutdownComplete_)
return;
- std::unique_lock<std::mutex> lock(mappingMutex_);
+ std::unique_lock lock(mappingMutex_);
if (controllerList_.erase(controller) == 1) {
if (logger_) logger_->debug("Successfully unregistered controller {}", fmt::ptr(controller));
} else {
@@ -458,7 +458,7 @@
// Only return an availalable random port. No actual
// reservation is made here.
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
auto& mappingList = getMappingList(type);
int tryCount = 0;
while (tryCount++ < MAX_REQUEST_RETRIES) {
@@ -533,7 +533,7 @@
//CHECK_VALID_THREAD();
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
auto& mappingList = getMappingList(type);
for (auto it = mappingList.begin(); it != mappingList.end();) {
@@ -669,7 +669,7 @@
status.failedCount_);
if (status.failedCount_ > 0) {
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
auto const& mappingList = getMappingList(type);
for (auto const& [_, map] : mappingList) {
if (map->getState() == MappingState::FAILED) {
@@ -734,7 +734,7 @@
auto remoteMapList = protocol->getMappingsListByDescr(igd,
Mapping::UPNP_MAPPING_DESCRIPTION_PREFIX);
/*if (remoteMapList.empty()) {
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
if (not getMappingList(PortType::TCP).empty() or getMappingList(PortType::TCP).empty()) {
// JAMI_WARN("We have provisionned mappings but the PUPNP IGD returned an empty list!");
}
@@ -755,7 +755,7 @@
// Use a temporary list to avoid processing mappings while holding the lock.
std::list<Mapping::sharedPtr_t> toRemoveList;
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
for (auto const& [_, map] : getMappingList(type)) {
// Only check mappings allocated by UPNP protocol.
if (map->getProtocol() != NatProtocolType::PUPNP) {
@@ -789,7 +789,7 @@
// Use a temporary list to avoid processing mappings while holding the lock.
std::list<Mapping> toRemoveList;
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
for (auto const& [_, map] : remoteMapList) {
// Must has valid IGD pointer and use UPNP protocol.
@@ -823,7 +823,7 @@
// processing the mapping list.
std::list<Mapping::sharedPtr_t> toRemoveList;
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
PortType types[2] {PortType::TCP, PortType::UDP};
for (auto& type : types) {
@@ -855,7 +855,7 @@
// Populate the list of requests to perform.
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
PortType typeArray[2] {PortType::TCP, PortType::UDP};
for (auto type : typeArray) {
@@ -887,7 +887,7 @@
// Populate the list of requests for mappings with auto-update enabled.
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
PortType typeArray[2] {PortType::TCP, PortType::UDP};
for (auto type : typeArray) {
@@ -971,14 +971,14 @@
pruneMappingsWithInvalidIgds(igd);
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
validIgdList_.erase(igd);
return;
}
// Update the IGD list.
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
auto ret = validIgdList_.emplace(igd);
if (ret.second) {
if (logger_) logger_->debug("IGD [{}] on address {} was added. Will process any pending requests",
@@ -1072,7 +1072,7 @@
void
UPnPContext::deleteAllMappings(PortType type)
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
auto& mappingList = getMappingList(type);
for (auto const& [_, map] : mappingList) {
@@ -1108,7 +1108,7 @@
Mapping::sharedPtr_t mapPtr;
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
auto& mappingList = getMappingList(map.getType());
auto ret = mappingList.emplace(map.getMapKey(), std::make_shared<Mapping>(map));
@@ -1167,7 +1167,7 @@
Mapping::sharedPtr_t
UPnPContext::getMappingWithKey(Mapping::key_t key)
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
auto const& mappingList = getMappingList(Mapping::getTypeFromMapKey(key));
auto it = mappingList.find(key);
if (it == mappingList.end())
@@ -1178,7 +1178,7 @@
void
UPnPContext::getMappingStatus(PortType type, MappingStatus& status)
{
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
auto& mappingList = getMappingList(type);
for (auto const& [_, map] : mappingList) {
@@ -1278,7 +1278,7 @@
std::vector<Mapping::sharedPtr_t> toRenew;
for (auto type : {PortType::TCP, PortType::UDP}) {
- std::lock_guard<std::mutex> lock(mappingMutex_);
+ std::lock_guard lock(mappingMutex_);
auto mappingList = getMappingList(type);
for (auto const& [_, map] : mappingList) {
if (not map->isValid())
diff --git a/src/upnp/upnp_control.cpp b/src/upnp/upnp_control.cpp
index 8dacd74..185ea7d 100644
--- a/src/upnp/upnp_control.cpp
+++ b/src/upnp/upnp_control.cpp
@@ -96,7 +96,7 @@
{
assert(upnpContext_);
- std::lock_guard<std::mutex> lk(mapListMutex_);
+ std::lock_guard lk(mapListMutex_);
for (auto const& [_, map] : mappingList_) {
upnpContext_->releaseMapping(map);
}
@@ -107,7 +107,7 @@
Controller::addLocalMap(const Mapping& map)
{
if (map.getMapKey()) {
- std::lock_guard<std::mutex> lock(mapListMutex_);
+ std::lock_guard lock(mapListMutex_);
auto ret = mappingList_.emplace(map.getMapKey(), map);
}
}
@@ -117,7 +117,7 @@
{
assert(upnpContext_);
- std::lock_guard<std::mutex> lk(mapListMutex_);
+ std::lock_guard lk(mapListMutex_);
return mappingList_.erase(map.getMapKey()) == 1;
}