epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

ServerChannelRequesterImpl::getRequesterName() returns client's address

Browse Source
This commit is contained in:
Matej Sekoranja
2015-12-16 23:30:53 +01:00
parent 4a7f057af1
commit a692546170
3 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
testApp/remote/testServer.cpp
View File

@@ -2649,28 +2649,38 @@ public:
short /*priority*/,
std::string const & address)
{
// this is a server instance provider, address holds remote socket IP
if (channelName == "testCounter")
if (address == "local")
{
channelRequester->channelCreated(Status::Ok, m_counterChannel);
return m_counterChannel;
}
else if (channelName == "testADC")
{
channelRequester->channelCreated(Status::Ok, m_adcChannel);
return m_adcChannel;
}
else if (channelName == "testMP")
{
channelRequester->channelCreated(Status::Ok, m_mpChannel);
return m_mpChannel;
// this is a server instance provider, address holds remote socket IP
if (channelName == "testCounter")
{
channelRequester->channelCreated(Status::Ok, m_counterChannel);
return m_counterChannel;
}
else if (channelName == "testADC")
{
channelRequester->channelCreated(Status::Ok, m_adcChannel);
return m_adcChannel;
}
else if (channelName == "testMP")
{
channelRequester->channelCreated(Status::Ok, m_mpChannel);
return m_mpChannel;
}
else
{
ChannelProvider::shared_pointer chProviderPtr = shared_from_this();
Channel::shared_pointer channel = MockChannel::create(chProviderPtr, channelRequester, channelName, address);
channelRequester->channelCreated(Status::Ok, channel);
return channel;
}
}
else
{
ChannelProvider::shared_pointer chProviderPtr = shared_from_this();
Channel::shared_pointer channel = MockChannel::create(chProviderPtr, channelRequester, channelName, address);
channelRequester->channelCreated(Status::Ok, channel);
return channel;
Channel::shared_pointer nullPtr;
Status errorStatus(Status::STATUSTYPE_ERROR, "only local supported");
channelRequester->channelCreated(errorStatus, nullPtr);
return nullPtr;
}
}
private: