Merge pull request #2147 from Diapolo/mq_name_testnet
Bitcoin-Qt: give testnet a unique IPC message queue name
This commit is contained in:
commit
51b05d0dca
3 changed files with 25 additions and 11 deletions
|
@ -113,6 +113,14 @@ static void handleRunawayException(std::exception *e)
|
|||
#ifndef BITCOIN_QT_TEST
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
// Command-line options take precedence:
|
||||
ParseParameters(argc, argv);
|
||||
|
||||
if(GetBoolArg("-testnet")) // Separate message queue name for testnet
|
||||
strBitcoinURIQueueName = BITCOINURI_QUEUE_NAME_TESTNET;
|
||||
else
|
||||
strBitcoinURIQueueName = BITCOINURI_QUEUE_NAME_MAINNET;
|
||||
|
||||
// Do this early as we don't want to bother initializing if we are just calling IPC
|
||||
ipcScanRelay(argc, argv);
|
||||
|
||||
|
@ -126,9 +134,6 @@ int main(int argc, char *argv[])
|
|||
// Install global event filter that makes sure that long tooltips can be word-wrapped
|
||||
app.installEventFilter(new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app));
|
||||
|
||||
// Command-line options take precedence:
|
||||
ParseParameters(argc, argv);
|
||||
|
||||
// ... then bitcoin.conf:
|
||||
if (!boost::filesystem::is_directory(GetDataDir(false)))
|
||||
{
|
||||
|
|
|
@ -26,6 +26,9 @@ using namespace boost;
|
|||
using namespace boost::interprocess;
|
||||
using namespace boost::posix_time;
|
||||
|
||||
// holds Bitcoin-Qt message queue name (initialized in bitcoin.cpp)
|
||||
std::string strBitcoinURIQueueName;
|
||||
|
||||
#if defined MAC_OSX || defined __FreeBSD__
|
||||
// URI handling not implemented on OSX yet
|
||||
|
||||
|
@ -46,7 +49,7 @@ static bool ipcScanCmd(int argc, char *argv[], bool fRelay)
|
|||
{
|
||||
const char *strURI = argv[i];
|
||||
try {
|
||||
boost::interprocess::message_queue mq(boost::interprocess::open_only, BITCOINURI_QUEUE_NAME);
|
||||
boost::interprocess::message_queue mq(boost::interprocess::open_only, strBitcoinURIQueueName.c_str());
|
||||
if (mq.try_send(strURI, strlen(strURI), 0))
|
||||
fSent = true;
|
||||
else if (fRelay)
|
||||
|
@ -112,7 +115,7 @@ static void ipcThread2(void* pArg)
|
|||
}
|
||||
|
||||
// Remove message queue
|
||||
message_queue::remove(BITCOINURI_QUEUE_NAME);
|
||||
message_queue::remove(strBitcoinURIQueueName.c_str());
|
||||
// Cleanup allocated memory
|
||||
delete mq;
|
||||
}
|
||||
|
@ -125,7 +128,7 @@ void ipcInit(int argc, char *argv[])
|
|||
unsigned int nPriority = 0;
|
||||
|
||||
try {
|
||||
mq = new message_queue(open_or_create, BITCOINURI_QUEUE_NAME, 2, MAX_URI_LENGTH);
|
||||
mq = new message_queue(open_or_create, strBitcoinURIQueueName.c_str(), 2, MAX_URI_LENGTH);
|
||||
|
||||
// Make sure we don't lose any bitcoin: URIs
|
||||
for (int i = 0; i < 2; i++)
|
||||
|
@ -140,10 +143,10 @@ void ipcInit(int argc, char *argv[])
|
|||
}
|
||||
|
||||
// Make sure only one bitcoin instance is listening
|
||||
message_queue::remove(BITCOINURI_QUEUE_NAME);
|
||||
message_queue::remove(strBitcoinURIQueueName.c_str());
|
||||
delete mq;
|
||||
|
||||
mq = new message_queue(open_or_create, BITCOINURI_QUEUE_NAME, 2, MAX_URI_LENGTH);
|
||||
mq = new message_queue(open_or_create, strBitcoinURIQueueName.c_str(), 2, MAX_URI_LENGTH);
|
||||
}
|
||||
catch (interprocess_exception &ex) {
|
||||
printf("ipcInit() - boost interprocess exception #%d: %s\n", ex.get_error_code(), ex.what());
|
||||
|
|
|
@ -1,8 +1,14 @@
|
|||
#ifndef QTIPCSERVER_H
|
||||
#define QTIPCSERVER_H
|
||||
|
||||
// Define Bitcoin-Qt message queue name
|
||||
#define BITCOINURI_QUEUE_NAME "BitcoinURI"
|
||||
#include <string>
|
||||
|
||||
// Define Bitcoin-Qt message queue name for mainnet
|
||||
#define BITCOINURI_QUEUE_NAME_MAINNET "BitcoinURI"
|
||||
// Define Bitcoin-Qt message queue name for testnet
|
||||
#define BITCOINURI_QUEUE_NAME_TESTNET "BitcoinURI-testnet"
|
||||
|
||||
extern std::string strBitcoinURIQueueName;
|
||||
|
||||
void ipcScanRelay(int argc, char *argv[]);
|
||||
void ipcInit(int argc, char *argv[]);
|
||||
|
|
Loading…
Reference in a new issue