lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-28 04:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't look at IP to see if a connection is local

Browse Source 
* This fixes an edge case where we are connecting to a local IP that is
  SSH port forwarded to a remote machine. We don't want to identify
  remote files as local files and try to open them, so just do the easy
  check of verifying if the file is available locally.
This commit is contained in:
baldurk
2017-06-13 18:45:40 +01:00
parent f291be452f
commit 4c78c76341
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/core/target_control.cpp
+3 -7
View File
@@ -374,8 +374,7 @@ void RenderDoc::TargetControlServerThread(void *s)
struct TargetControl : public ITargetControl
{
public:
TargetControl(Network::Socket *sock, string clientName, bool forceConnection, bool localhost)
: m_Socket(sock), m_Local(localhost)
TargetControl(Network::Socket *sock, string clientName, bool forceConnection) : m_Socket(sock)
{
PacketType type;
vector<byte> payload;
@@ -599,7 +598,7 @@ public:
string path;
ser->Serialise("", path);
msg.NewCapture.path = path;
msg.NewCapture.local = m_Local;
msg.NewCapture.local = FileIO::exists(path.c_str());
int32_t thumblen = 0;
ser->Serialise("", thumblen);
@@ -659,7 +658,6 @@ public:
private:
Network::Socket *m_Socket;
bool m_Local;
string m_Target, m_API, m_BusyClient;
uint32_t m_PID;
@@ -745,9 +743,7 @@ extern "C" RENDERDOC_API ITargetControl *RENDERDOC_CC RENDERDOC_CreateTargetCont
if(sock == NULL)
return NULL;
bool localhost = !android && (Network::GetIPOctet(sock->GetRemoteIP(), 0) == 127);
TargetControl *remote = new TargetControl(sock, clientName, forceConnection != 0, localhost);
TargetControl *remote = new TargetControl(sock, clientName, forceConnection != 0);
if(remote->Connected())
return remote;