ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-19 04:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add mutex to channel numbering

Browse Source
This commit is contained in:
Grant Limberg 2019-03-08 10:29:36 -08:00
parent 52c85aa605
commit cda07b20a2
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
controller/RabbitMQ.cpp
View File

@ -48,7 +48,10 @@ void RabbitMQ::init()
}
static int chan = 0;
_channel = ++chan;
{
Mutex::Lock l(_chan_m);
_channel = ++chan;
}
amqp_channel_open(_conn, _channel);
r = amqp_get_rpc_reply(_conn);
if(r.reply_type != AMQP_RESPONSE_NORMAL) {
@ -88,4 +91,4 @@ std::string RabbitMQ::consume()
return msg;
}
}
}

6
controller/RabbitMQ.hpp
View File

@ -36,9 +36,10 @@ struct MQConfig {
};
}
#ifdef ZT_CONTROLLER_USE_LIBPQ
#include "../node/Mutex.hpp"
#include <amqp.h>
#include <amqp_tcp_socket.h>
#include <string>
@ -65,6 +66,9 @@ private:
int _status;
int _channel;
Mutex _chan_m;
};
}