backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-09 05:13:36 +08:00
Code Issues Projects Releases Wiki Activity

added command line option to choose the screen name. also now

Browse Source 
using the hostname as the default name.  this is on both client
and server.
This commit is contained in:
crs
2002-06-09 17:59:32 +00:00
parent c357180530
commit 7ca4804667
4 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/CServer.cpp
View File

@@ -47,7 +47,9 @@ else { wait(0); exit(1); }
const SInt32 CServer::s_httpMaxSimultaneousRequests = 3;
CServer::CServer() : m_cleanupSize(&m_mutex, 0),
CServer::CServer(const CString& serverName) :
m_name(serverName),
m_cleanupSize(&m_mutex, 0),
m_primary(NULL),
m_active(NULL),
m_primaryInfo(NULL),
@@ -81,6 +83,12 @@ void CServer::run()
log((CLOG_INFO "failed to open screen. waiting to retry."));
CThread::sleep(3.0);
}
catch (XUnknownClient& e) {
// can't open screen yet. wait a few seconds to retry.
log((CLOG_CRIT "unknown screen name `%s'", e.getName().c_str()));
log((CLOG_NOTE "stopping server"));
return;
}
}
// start listening for new clients
@@ -222,8 +230,7 @@ bool CServer::setConfig(const CConfig& config)
CString CServer::getPrimaryScreenName() const
{
CLock lock(&m_mutex);
return (m_primaryInfo == NULL) ? "" : m_primaryInfo->m_name;
return m_name;
}
void CServer::getConfig(CConfig* config) const
@@ -1337,7 +1344,10 @@ void CServer::openPrimaryScreen()
// reset sequence number
m_seqNum = 0;
CString primary = m_config.getCanonicalName("primary"); // FIXME
CString primary = m_config.getCanonicalName(m_name);
if (primary.empty()) {
throw XUnknownClient(m_name);
}
try {
// add connection
m_active = addConnection(primary, NULL);
@@ -1380,7 +1390,7 @@ void CServer::closePrimaryScreen()
assert(m_primary != NULL);
// remove connection
CString primary = m_config.getCanonicalName("primary"); // FIXME
CString primary = m_config.getCanonicalName(m_name);
removeConnection(primary);
// close the primary screen