sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2147 from Diapolo/mq_name_testnet

Browse Source 
Bitcoin-Qt: give testnet a unique IPC message queue name
This commit is contained in:
Wladimir J. van der Laan 2013-01-06 05:22:34 -08:00
commit 51b05d0dca
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qt/bitcoin.cpp
View File

@ -113,6 +113,14 @@ static void handleRunawayException(std::exception *e)
#ifndef BITCOIN_QT_TEST #ifndef BITCOIN_QT_TEST
int main(int argc, char *argv[]) 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 // Do this early as we don't want to bother initializing if we are just calling IPC
ipcScanRelay(argc, argv); 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 // Install global event filter that makes sure that long tooltips can be word-wrapped
app.installEventFilter(new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app)); app.installEventFilter(new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app));
// Command-line options take precedence:
ParseParameters(argc, argv);
// ... then bitcoin.conf: // ... then bitcoin.conf:
if (!boost::filesystem::is_directory(GetDataDir(false))) if (!boost::filesystem::is_directory(GetDataDir(false)))
{ {

15
src/qt/qtipcserver.cpp
View File

@ -26,6 +26,9 @@ using namespace boost;
using namespace boost::interprocess; using namespace boost::interprocess;
using namespace boost::posix_time; using namespace boost::posix_time;
// holds Bitcoin-Qt message queue name (initialized in bitcoin.cpp)
std::string strBitcoinURIQueueName;
#if defined MAC_OSX || defined __FreeBSD__ #if defined MAC_OSX || defined __FreeBSD__
// URI handling not implemented on OSX yet // 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]; const char *strURI = argv[i];
try { 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)) if (mq.try_send(strURI, strlen(strURI), 0))
fSent = true; fSent = true;
else if (fRelay) else if (fRelay)
@ -76,7 +79,7 @@ static void ipcThread(void* pArg)
{ {
// Make this thread recognisable as the GUI-IPC thread // Make this thread recognisable as the GUI-IPC thread
RenameThread("bitcoin-gui-ipc"); RenameThread("bitcoin-gui-ipc");
try try
{ {
ipcThread2(pArg); ipcThread2(pArg);
@ -112,7 +115,7 @@ static void ipcThread2(void* pArg)
} }
// Remove message queue // Remove message queue
message_queue::remove(BITCOINURI_QUEUE_NAME); message_queue::remove(strBitcoinURIQueueName.c_str());
// Cleanup allocated memory // Cleanup allocated memory
delete mq; delete mq;
} }
@ -125,7 +128,7 @@ void ipcInit(int argc, char *argv[])
unsigned int nPriority = 0; unsigned int nPriority = 0;
try { 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 // Make sure we don't lose any bitcoin: URIs
for (int i = 0; i < 2; i++) 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 // Make sure only one bitcoin instance is listening
message_queue::remove(BITCOINURI_QUEUE_NAME); message_queue::remove(strBitcoinURIQueueName.c_str());
delete mq; 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) { catch (interprocess_exception &ex) {
printf("ipcInit() - boost interprocess exception #%d: %s\n", ex.get_error_code(), ex.what()); printf("ipcInit() - boost interprocess exception #%d: %s\n", ex.get_error_code(), ex.what());

10
src/qt/qtipcserver.h
View File

@ -1,8 +1,14 @@
#ifndef QTIPCSERVER_H #ifndef QTIPCSERVER_H
#define QTIPCSERVER_H #define QTIPCSERVER_H
// Define Bitcoin-Qt message queue name #include <string>
#define BITCOINURI_QUEUE_NAME "BitcoinURI"
// 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 ipcScanRelay(int argc, char *argv[]);
void ipcInit(int argc, char *argv[]); void ipcInit(int argc, char *argv[]);