diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2012-08-27 11:52:56 -0400 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-08-27 11:52:56 -0400 |
commit | 8cd98a9a26f7d3fa248eb44026239054ae9ed8d8 (patch) | |
tree | f4b208a6c01494f1b4111257e76efce651fab7c0 /src/qt/qtipcserver.cpp | |
parent | 772351b0d5b298a93bb90b403b4ec151ca5f9770 (diff) | |
parent | d0377a70e235511581b81f1701377bdfd490e286 (diff) | |
download | bitcoin-8cd98a9a26f7d3fa248eb44026239054ae9ed8d8.tar.xz |
Merge branch 'bugfix_gitian' of git://github.com/luke-jr/bitcoin
Diffstat (limited to 'src/qt/qtipcserver.cpp')
-rw-r--r-- | src/qt/qtipcserver.cpp | 50 |
1 files changed, 48 insertions, 2 deletions
diff --git a/src/qt/qtipcserver.cpp b/src/qt/qtipcserver.cpp index ccdfc66bad..0ce9ec8147 100644 --- a/src/qt/qtipcserver.cpp +++ b/src/qt/qtipcserver.cpp @@ -2,11 +2,18 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include <boost/version.hpp> +#if defined(WIN32) && BOOST_VERSION == 104900 +#define BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME +#define BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME +#endif + #include "qtipcserver.h" #include "guiconstants.h" #include "ui_interface.h" #include "util.h" +#include <boost/algorithm/string/predicate.hpp> #include <boost/date_time/posix_time/posix_time.hpp> #include <boost/interprocess/ipc/message_queue.hpp> #include <boost/version.hpp> @@ -24,10 +31,47 @@ static void ipcThread2(void* pArg); #ifdef MAC_OSX // URI handling not implemented on OSX yet -void ipcInit() { } +void ipcScanRelay(int argc, char *argv[]) { } +void ipcInit(int argc, char *argv[]) { } #else +static bool ipcScanCmd(int argc, char *argv[], bool fRelay) +{ + // Check for URI in argv + bool fSent = false; + for (int i = 1; i < argc; i++) + { + if (boost::algorithm::istarts_with(argv[i], "bitcoin:")) + { + const char *strURI = argv[i]; + try { + boost::interprocess::message_queue mq(boost::interprocess::open_only, BITCOINURI_QUEUE_NAME); + if (mq.try_send(strURI, strlen(strURI), 0)) + fSent = true; + else if (fRelay) + break; + } + catch (boost::interprocess::interprocess_exception &ex) { + // don't log the "file not found" exception, because that's normal for + // the first start of the first instance + if (ex.get_error_code() != boost::interprocess::not_found_error || !fRelay) + { + printf("main() - boost interprocess exception #%d: %s\n", ex.get_error_code(), ex.what()); + break; + } + } + } + } + return fSent; +} + +void ipcScanRelay(int argc, char *argv[]) +{ + if (ipcScanCmd(argc, argv, true)) + exit(0); +} + static void ipcThread(void* pArg) { IMPLEMENT_RANDOMIZE_STACK(ipcThread(pArg)); @@ -75,7 +119,7 @@ static void ipcThread2(void* pArg) delete mq; } -void ipcInit() +void ipcInit(int argc, char *argv[]) { message_queue* mq = NULL; char buffer[MAX_URI_LENGTH + 1] = ""; @@ -113,6 +157,8 @@ void ipcInit() delete mq; return; } + + ipcScanCmd(argc, argv, false); } #endif |