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

Change remote server config file to more friendly/extensible syntax

Browse Source 
* lines like "whitelist IP/range" instead of just IP/range
This commit is contained in:
baldurk
2016-08-02 16:28:45 +02:00
parent a5c7620d24
commit 18a843fd3d
1 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/core/remote_replay.cpp
+34 -16
View File
@@ -80,35 +80,48 @@ void RenderDoc::BecomeRemoteServer(const char *listenhost, uint16_t port, volati
bool newlyReady = true;
std::vector<std::pair<uint32_t, uint32_t> > listenRanges;
bool allowExecution = true;
FILE *f = FileIO::fopen(FileIO::GetAppFolderFilename("replayserver.conf").c_str(), "r");
FILE *f = FileIO::fopen(FileIO::GetAppFolderFilename("remoteserver.conf").c_str(), "r");
while(f && !FileIO::feof(f))
{
string line = FileIO::getline(f);
string line = trim(FileIO::getline(f));
size_t nonws = line.find_first_not_of("\t ");
// skip blank lines
if(nonws == string::npos)
if(line == "")
continue;
// skip comments
if(line[nonws] == '#')
if(line[0] == '#')
continue;
uint32_t ip = 0, mask = 0;
// CIDR notation
bool found = Network::ParseIPRangeCIDR(line.c_str() + nonws, ip, mask);
if(found)
if(line.substr(0, sizeof("whitelist") - 1) == "whitelist")
{
listenRanges.push_back(std::make_pair(ip, mask));
uint32_t ip = 0, mask = 0;
// CIDR notation
bool found = Network::ParseIPRangeCIDR(line.c_str() + sizeof("whitelist"), ip, mask);
if(found)
{
listenRanges.push_back(std::make_pair(ip, mask));
continue;
}
else
{
RDCLOG("Couldn't parse IP range from: %s", line.c_str() + sizeof("whitelist"));
}
continue;
}
else if(line.substr(0, sizeof("noexec") - 1) == "noexec")
{
allowExecution = false;
continue;
}
RDCLOG("Malformed line '%s'. Expect CIDR notation: aaa.bbb.ccc.ddd/nn", line.c_str());
RDCLOG("Malformed line '%s'. See documentation for file format.", line.c_str());
}
if(f)
@@ -118,7 +131,7 @@ void RenderDoc::BecomeRemoteServer(const char *listenhost, uint16_t port, volati
{
RDCLOG("No whitelist IP ranges configured - using default private IP ranges.");
RDCLOG(
"Create a config file replayserver.conf in ~/.renderdoc or %%APPDATA%%/renderdoc to narrow "
"Create a config file remoteserver.conf in ~/.renderdoc or %%APPDATA%%/renderdoc to narrow "
"this down or accept connections from more ranges.");
listenRanges.push_back(std::make_pair(Network::MakeIP(10, 0, 0, 0), 0xff000000));
@@ -138,6 +151,11 @@ void RenderDoc::BecomeRemoteServer(const char *listenhost, uint16_t port, volati
Network::GetIPOctet(mask, 1), Network::GetIPOctet(mask, 2), Network::GetIPOctet(mask, 3));
}
if(allowExecution)
RDCLOG("Allowing execution commands");
else
RDCLOG("Blocking execution commands");
while(!killReplay)
{
if(newlyReady)