mirrors/discord-rpc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

try more pipes

Browse source
This commit is contained in:
Chris Marsh 2017-07-27 16:02:47 -07:00
parent ffab428366
commit 9eb7e41c4b
2 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/connection_unix.cpp
View file

@ -32,7 +32,7 @@ static const char* GetTempPath()
/*static*/ BaseConnection* BaseConnection::Create() /*static*/ BaseConnection* BaseConnection::Create()
{ {
snprintf(PipeAddr.sun_path, sizeof(PipeAddr.sun_path), "%s/discord-ipc-0", GetTempPath());
PipeAddr.sun_family = AF_UNIX; PipeAddr.sun_family = AF_UNIX;
return &Connection; return &Connection;
} }
@ -46,18 +46,22 @@ static const char* GetTempPath()
bool BaseConnection::Open() bool BaseConnection::Open()
{ {
const char* tempPath = GetTempPath();
auto self = reinterpret_cast<BaseConnectionUnix*>(this); auto self = reinterpret_cast<BaseConnectionUnix*>(this);
self->sock = socket(AF_UNIX, SOCK_STREAM, 0); self->sock = socket(AF_UNIX, SOCK_STREAM, 0);
if (self->sock == -1) { if (self->sock == -1) {
return false; return false;
} }
fcntl(self->sock, F_SETFL, O_NONBLOCK); fcntl(self->sock, F_SETFL, O_NONBLOCK);
int err = connect(self->sock, (const sockaddr*)&PipeAddr, sizeof(PipeAddr)); for (int pipeNum = 0; pipeNum < 10; ++pipeNum) {
if (err != 0) { snprintf(PipeAddr.sun_path, sizeof(PipeAddr.sun_path), "%s/discord-ipc-%d", tempPath, pipeNum);
self->Close(); int err = connect(self->sock, (const sockaddr*)&PipeAddr, sizeof(PipeAddr));
return false; if (err == 0) {
return true;
}
} }
return true; self->Close();
return false;
} }
bool BaseConnection::Close() bool BaseConnection::Close()

24
src/connection_win.cpp
View file

@ -16,8 +16,6 @@ struct BaseConnectionWin : public BaseConnection {
}; };
static BaseConnectionWin Connection; static BaseConnectionWin Connection;
// static const wchar_t* PipeName = L"\\\\?\\pipe\\discord-ipc";
static const wchar_t* PipeName = L"\\\\?\\pipe\\discord-ipc-0";
/*static*/ BaseConnection* BaseConnection::Create() /*static*/ BaseConnection* BaseConnection::Create()
{ {
@ -33,21 +31,31 @@ static const wchar_t* PipeName = L"\\\\?\\pipe\\discord-ipc-0";
bool BaseConnection::Open() bool BaseConnection::Open()
{ {
wchar_t pipeName[]{L"\\\\?\\pipe\\discord-ipc-0"};
const size_t pipeDigit = sizeof(pipeName) / sizeof(wchar_t) - 2;
pipeName[pipeDigit] = L'0';
auto self = reinterpret_cast<BaseConnectionWin*>(this); auto self = reinterpret_cast<BaseConnectionWin*>(this);
for (;;) { for (;;) {
self->pipe = ::CreateFileW( self->pipe = ::CreateFileW(
PipeName, GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, 0, nullptr); pipeName, GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, 0, nullptr);
if (self->pipe != INVALID_HANDLE_VALUE) { if (self->pipe != INVALID_HANDLE_VALUE) {
return true; return true;
} }
if (GetLastError() != ERROR_PIPE_BUSY) { auto lastError = GetLastError();
return false; if (lastError == ERROR_FILE_NOT_FOUND) {
if (pipeName[pipeDigit] < L'9') {
pipeName[pipeDigit]++;
continue;
}
} }
else if (lastError == ERROR_PIPE_BUSY) {
if (!WaitNamedPipeW(PipeName, 10000)) { if (!WaitNamedPipeW(pipeName, 10000)) {
return false; return false;
}
continue;
} }
return false;
} }
} }