backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-12 22:55:53 +08:00
Code Issues Projects Releases Wiki Activity

Checkpoint. Code does not run. Still converting over to new

Browse Source 
event loop model.  Streams, stream filters, and sockets are
converted.  Client proxies are almost converted.  CServer is
in progress.  Removed all HTTP code.  Haven't converted the
necessary win32 arch stuff.
This commit is contained in:
crs
2004-02-01 21:09:22 +00:00
parent 618aa7fedd
commit 848aee7a3a
64 changed files with 2581 additions and 2942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/server/CConfig.cpp
View File

@@ -239,12 +239,6 @@ CConfig::setSynergyAddress(const CNetworkAddress& addr)
m_synergyAddress = addr;
}
void
CConfig::setHTTPAddress(const CNetworkAddress& addr)
{
m_httpAddress = addr;
}
bool
CConfig::addOption(const CString& name, OptionID option, OptionValue value)
{
@@ -430,12 +424,6 @@ CConfig::getSynergyAddress() const
return m_synergyAddress;
}
const CNetworkAddress&
CConfig::getHTTPAddress() const
{
return m_httpAddress;
}
const CConfig::CScreenOptions*
CConfig::getOptions(const CString& name) const
{
@@ -462,9 +450,6 @@ CConfig::operator==(const CConfig& x) const
if (m_synergyAddress != x.m_synergyAddress) {
return false;
}
if (m_httpAddress != x.m_httpAddress) {
return false;
}
*/
if (m_map.size() != x.m_map.size()) {
return false;
@@ -782,14 +767,6 @@ CConfig::readSectionOptions(std::istream& s)
throw XConfigRead("invalid address argument");
}
}
else if (name == "http") {
try {
m_httpAddress = CNetworkAddress(value, kDefaultPort + 1);
}
catch (XSocketAddress&) {
throw XConfigRead("invalid http argument");
}
}
else if (name == "heartbeat") {
addOption("", kOptionHeartbeat, parseInt(value));
}
@@ -1063,10 +1040,6 @@ operator<<(std::ostream& s, const CConfig& config)
s << "\taddress = " <<
config.m_synergyAddress.getHostname().c_str() << std::endl;
}
if (config.m_httpAddress.isValid()) {
s << "\thttp = " <<
config.m_httpAddress.getHostname().c_str() << std::endl;
}
s << "end" << std::endl;
// screens section