highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-18 12:53:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

scripted-diff: rename cs_addrLocal -> m_addr_local_mutex

Browse Source 
-BEGIN VERIFY SCRIPT-
sed -i 's/cs_addrLocal/m_addr_local_mutex/g' -- $(git grep --files-with-matches 'cs_addrLocal')
-END VERIFY SCRIPT-
This commit is contained in:
w0xlt 2022-01-20 05:41:33 -03:00
parent 63fc2f5cce
commit c4a31ca267
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net.cpp
View File

@ -553,12 +553,12 @@ std::string ConnectionTypeAsString(ConnectionType conn_type)
CService CNode::GetAddrLocal() const CService CNode::GetAddrLocal() const
{ {
LOCK(cs_addrLocal); LOCK(m_addr_local_mutex);
return addrLocal; return addrLocal;
} }
void CNode::SetAddrLocal(const CService& addrLocalIn) { void CNode::SetAddrLocal(const CService& addrLocalIn) {
LOCK(cs_addrLocal); LOCK(m_addr_local_mutex);
if (addrLocal.IsValid()) { if (addrLocal.IsValid()) {
error("Addr local already set for node: %i. Refusing to change from %s to %s", id, addrLocal.ToString(), addrLocalIn.ToString()); error("Addr local already set for node: %i. Refusing to change from %s to %s", id, addrLocal.ToString(), addrLocalIn.ToString());
} else { } else {

4
src/net.h
View File

@ -693,8 +693,8 @@ private:
std::list<CNetMessage> vRecvMsg; // Used only by SocketHandler thread std::list<CNetMessage> vRecvMsg; // Used only by SocketHandler thread
// Our address, as reported by the peer // Our address, as reported by the peer
CService addrLocal GUARDED_BY(cs_addrLocal); CService addrLocal GUARDED_BY(m_addr_local_mutex);
mutable RecursiveMutex cs_addrLocal; mutable RecursiveMutex m_addr_local_mutex;
mapMsgCmdSize mapSendBytesPerMsgCmd GUARDED_BY(cs_vSend); mapMsgCmdSize mapSendBytesPerMsgCmd GUARDED_BY(cs_vSend);
mapMsgCmdSize mapRecvBytesPerMsgCmd GUARDED_BY(cs_vRecv); mapMsgCmdSize mapRecvBytesPerMsgCmd GUARDED_BY(cs_vRecv);