Browse Source

Avoid pulling in unnecessary stuff.

Avoid over-warning.
cl-refactor
Gav Wood 10 years ago
parent
commit
cfea250787
  1. 3
      libdevcore/CMakeLists.txt
  2. 2
      libp2p/Capability.cpp
  3. 7
      libp2p/Session.cpp

3
libdevcore/CMakeLists.txt

@ -26,9 +26,8 @@ else()
endif() endif()
target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARIES}) target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARIES})
target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES}) #target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARIES}) target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARIES})
target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
if (APPLE) if (APPLE)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)

2
libp2p/Capability.cpp

@ -39,7 +39,7 @@ Capability::Capability(Session* _s, HostCapabilityFace* _h, unsigned _idOffset):
void Capability::disable(std::string const& _problem) void Capability::disable(std::string const& _problem)
{ {
clogS(NetConnect) << "Disabling capability '" << m_host->name() << "'. Reason:" << _problem; clogS(NetWarn) << "DISABLE: Disabling capability '" << m_host->name() << "'. Reason:" << _problem;
m_enabled = false; m_enabled = false;
} }

7
libp2p/Session.cpp

@ -369,8 +369,13 @@ bool Session::interpret(RLP const& _r)
{ {
auto id = _r[0].toInt<unsigned>(); auto id = _r[0].toInt<unsigned>();
for (auto const& i: m_capabilities) for (auto const& i: m_capabilities)
if (i.second->m_enabled && id >= i.second->m_idOffset && id - i.second->m_idOffset < i.second->hostCapability()->messageCount() && i.second->interpret(id - i.second->m_idOffset, _r)) if (id >= i.second->m_idOffset && id - i.second->m_idOffset < i.second->hostCapability()->messageCount())
{
if (i.second->m_enabled)
return i.second->interpret(id - i.second->m_idOffset, _r);
else
return true; return true;
}
return false; return false;
} }
} }

Loading…
Cancel
Save