cryptogera/dogecoin
1
0
Fork 0
mirror of https://github.com/dogecoin/dogecoin.git synced 2026-01-31 10:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve Qt payment server IPC

Browse Source 
Add a unique suffix to the IPC server name before hashing, to avoid
things like network collisions or attempts to reuse old sockets on
restart.

Remove now-superfluous code that removed the old socket after a crash.
This commit is contained in:
chromatic 2022-06-09 20:47:03 -07:00
parent 82d1997235
commit f0f50cf9ce
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qt/paymentserver.cpp
View File

@ -11,6 +11,7 @@
#include "base58.h"
#include "chainparams.h"
#include "policy/policy.h"
#include "random.h"
#include "ui_interface.h"
#include "util.h"
#include "wallet/wallet.h"
@ -55,6 +56,7 @@ const char* BIP70_MESSAGE_PAYMENTREQUEST = "PaymentRequest";
const char* BIP71_MIMETYPE_PAYMENT = "application/bitcoin-payment";
const char* BIP71_MIMETYPE_PAYMENTACK = "application/bitcoin-paymentack";
const char* BIP71_MIMETYPE_PAYMENTREQUEST = "application/bitcoin-paymentrequest";
const int IPC_SOCKET_HASH = GetRandInt(INT_MAX);
struct X509StoreDeleter {
void operator()(X509_STORE* b) {
@ -84,7 +86,7 @@ static QString ipcServerName()
// Note that GetDataDir(true) returns a different path
// for -testnet versus main net
QString ddir(GUIUtil::boostPathToQString(GetDataDir(true)));
name.append(QString::number(qHash(ddir)));
name.append(QString::number(qHash(ddir, IPC_SOCKET_HASH)));
return name;
}
@ -314,9 +316,6 @@ PaymentServer::PaymentServer(QObject* parent, bool startLocalServer) :
QString name = ipcServerName();
// Clean up old socket leftover from a crash:
QLocalServer::removeServer(name);
if (startLocalServer)
{
uriServer = new QLocalServer(this);