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

channel cache doesn't need to know about server provider

Browse Source
This commit is contained in:
Michael Davidsaver
2016-01-28 12:16:30 -05:00
parent 0995c48f90
commit 9e92c67924
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
p2pApp/server.cpp
View File

@@ -137,7 +137,7 @@ struct GWServerChannelProvider : public
if(it!=cache.entries.end() && it->second->channel
&& it->second->channel->isConnected())
{
ret.reset(new GWChannel(it->second, channelRequester, address));
ret.reset(new GWChannel(it->second, shared_from_this(), channelRequester, address));
it->second->interested.insert(ret);
ret->weakref = ret;
}
@@ -189,7 +189,6 @@ struct GWServerChannelProviderFactory : public pva::ChannelProviderFactory
pva::ChannelProvider::shared_pointer P(last_provider.lock());
if(!P) {
P.reset(new GWServerChannelProvider);
((GWServerChannelProvider*)P.get())->cache.server = P;
last_provider = P;
}
return P;
@@ -198,7 +197,6 @@ struct GWServerChannelProviderFactory : public pva::ChannelProviderFactory
virtual pva::ChannelProvider::shared_pointer newInstance()
{
pva::ChannelProvider::shared_pointer P(new GWServerChannelProvider);
((GWServerChannelProvider*)P.get())->cache.server = P;
last_provider = P;
return P;
}