EPICS_base/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

remove x/y name prefix hack

Browse Source
This commit is contained in:
Michael Davidsaver
2016-01-05 20:06:36 -05:00
parent dd17fbc52b
commit b7467d5d54
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
p2pApp/server.cpp
View File

@ -48,18 +48,12 @@ struct GWServerChannelProvider : public
pva::ChannelFind::shared_pointer ret;
bool found = false;
// TODO
// until GW can bind client and server to specific (and different) interfaces
// use a naming convension to avoid loops (GW talks to itself).
// Server listens for names beginning with 'x',
// and re-writes these to start with 'y' for client search.
if(!channelName.empty() && channelName[0]=='x')
if(!channelName.empty())
{
std::string newName;
// rewrite name
newName = channelName;
newName[0] = 'y';
Guard G(cache.cacheLock);
@ -130,12 +124,11 @@ struct GWServerChannelProvider : public
GWChannel::shared_pointer ret;
std::string newName;
if(!channelName.empty() && channelName[0]=='x')
if(!channelName.empty())
{
// rewrite name
newName = channelName;
newName[0] = 'y';
Guard G(cache.cacheLock);