From 1ae51ff94d0f1f27a4e4cc657371578db13c3ca1 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Fri, 8 Feb 2019 20:26:14 +0100 Subject: Make code compile again (fix bitrot dating back from 2013). --- src/connectionhandler.cc | 172 ++++++++++++++++++++++++----------------------- 1 file changed, 88 insertions(+), 84 deletions(-) (limited to 'src/connectionhandler.cc') diff --git a/src/connectionhandler.cc b/src/connectionhandler.cc index 1a4dce1..d264abe 100644 --- a/src/connectionhandler.cc +++ b/src/connectionhandler.cc @@ -40,72 +40,76 @@ ConnectionHandler::ConnectionHandler() void ConnectionHandler::init(clientid_t clientid) { - DEBUG(conn, "Adding client %p to connection list\n", clientid); - connlist[clientid] = std::set(); + DEBUG(conn, "Adding client %p to connection list\n", clientid); + connlist[clientid] = std::set(); - DEBUG(conn, "Connections (%d):\n", (int)connlist.size()); - ConnectionList::iterator it; - for(it = connlist.begin(); it != connlist.end(); it++) { - DEBUG(conn, "\t%p\n", it->first); - } + DEBUG(conn, "Connections (%d):\n", (int)connlist.size()); + ConnectionList::iterator it; + for(it = connlist.begin(); it != connlist.end(); it++) + { + DEBUG(conn, "\t%p\n", it->first); + } } void ConnectionHandler::close(clientid_t clientid) { - connlist.erase(clientid); - DEBUG(conn, "Removed connection\n"); + connlist.erase(clientid); + DEBUG(conn, "Removed connection\n"); } void ConnectionHandler::login(clientid_t clientid, std::string user, std::string password) { - authlist[clientid] = (password == "hundemad"); - DEBUG(conn, "Authentication %d\n", authlist[clientid]); + authlist[clientid] = (password == "hundemad"); + DEBUG(conn, "Authentication %d\n", authlist[clientid]); } void ConnectionHandler::logout(clientid_t clientid) { - authlist[clientid] = false; - DEBUG(conn, "Authentication %d\n", authlist[clientid]); + authlist[clientid] = false; + DEBUG(conn, "Authentication %d\n", authlist[clientid]); } bool ConnectionHandler::authenticated(clientid_t clientid) { - return authlist.find(clientid) != authlist.end() && authlist[clientid]; + return authlist.find(clientid) != authlist.end() && authlist[clientid]; } void ConnectionHandler::observe(clientid_t clientid, taskid_t taskid) { - connlist[clientid].insert(taskid); - DEBUG(conn, "Added observer of %d\n", taskid); + connlist[clientid].insert(taskid); + DEBUG(conn, "Added observer of %d\n", taskid); } void ConnectionHandler::unobserve(clientid_t clientid, taskid_t taskid) { - connlist[clientid].erase(taskid); + connlist[clientid].erase(taskid); } ObserverList ConnectionHandler::observerlist(TaskIdList tasks) { - DEBUG(conn, "Observerlist request (#tasks: %d)\n", (int)tasks.size()); - ObserverList clients; + DEBUG(conn, "Observerlist request (#tasks: %d)\n", (int)tasks.size()); + ObserverList clients; - for(TaskIdList::iterator i = tasks.begin(); i != tasks.end(); i++) { - taskid_t tid = *i; + for(TaskIdList::iterator i = tasks.begin(); i != tasks.end(); i++) + { + taskid_t tid = *i; - DEBUG(conn, "Locating observers of node %d\n", tid); - for(ConnectionList::iterator ci = connlist.begin(); - ci != connlist.end(); ci++) { - std::set::iterator ti = ci->second.find(tid); - if(ti != ci->second.end()) { - std::pair m; - m.first = ci->first; - m.second = tid; - clients.push_back(m); - } - } - } + DEBUG(conn, "Locating observers of node %d\n", tid); + for(ConnectionList::iterator ci = connlist.begin(); + ci != connlist.end(); ci++) + { + std::set::iterator ti = ci->second.find(tid); + if(ti != ci->second.end()) + { + std::pair m; + m.first = ci->first; + m.second = tid; + clients.push_back(m); + } + } + } - return clients; + return clients; } @@ -132,84 +136,84 @@ h.init((clientid_t)3); h.observe((clientid_t)3, (taskid_t)3); { - TaskIdList tasks; - tasks.push_back((taskid_t)1); - ObserverList clst = h.observerlist(tasks); + TaskIdList tasks; + tasks.push_back((taskid_t)1); + ObserverList clst = h.observerlist(tasks); - TEST_TRUE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_FALSE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); + TEST_TRUE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); + TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); + TEST_FALSE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); } { - TaskIdList tasks; - tasks.push_back((taskid_t)3); - ObserverList clst = h.observerlist(tasks); + TaskIdList tasks; + tasks.push_back((taskid_t)3); + ObserverList clst = h.observerlist(tasks); - TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_TRUE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); + TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); + TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); + TEST_TRUE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); } { - TaskIdList tasks; - tasks.push_back((taskid_t)4); - ObserverList clst = h.observerlist(tasks); + TaskIdList tasks; + tasks.push_back((taskid_t)4); + ObserverList clst = h.observerlist(tasks); - TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_FALSE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); + TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); + TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); + TEST_FALSE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); } { - TaskIdList tasks; - tasks.push_back((taskid_t)1); - tasks.push_back((taskid_t)2); - tasks.push_back((taskid_t)3); - ObserverList clst = h.observerlist(tasks); + TaskIdList tasks; + tasks.push_back((taskid_t)1); + tasks.push_back((taskid_t)2); + tasks.push_back((taskid_t)3); + ObserverList clst = h.observerlist(tasks); - TEST_TRUE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_TRUE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); + TEST_TRUE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); + TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); + TEST_TRUE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); } h.close((clientid_t)1); { - TaskIdList tasks; - tasks.push_back((taskid_t)1); - tasks.push_back((taskid_t)2); - tasks.push_back((taskid_t)3); - ObserverList clst = h.observerlist(tasks); + TaskIdList tasks; + tasks.push_back((taskid_t)1); + tasks.push_back((taskid_t)2); + tasks.push_back((taskid_t)3); + ObserverList clst = h.observerlist(tasks); - TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_TRUE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); + TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); + TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); + TEST_TRUE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); } h.close((clientid_t)2); { - TaskIdList tasks; - tasks.push_back((taskid_t)1); - tasks.push_back((taskid_t)2); - tasks.push_back((taskid_t)3); - ObserverList clst = h.observerlist(tasks); + TaskIdList tasks; + tasks.push_back((taskid_t)1); + tasks.push_back((taskid_t)2); + tasks.push_back((taskid_t)3); + ObserverList clst = h.observerlist(tasks); - TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_TRUE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); + TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); + TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); + TEST_TRUE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); } h.close((clientid_t)3); { - TaskIdList tasks; - tasks.push_back((taskid_t)1); - tasks.push_back((taskid_t)2); - tasks.push_back((taskid_t)3); - ObserverList clst = h.observerlist(tasks); + TaskIdList tasks; + tasks.push_back((taskid_t)1); + tasks.push_back((taskid_t)2); + tasks.push_back((taskid_t)3); + ObserverList clst = h.observerlist(tasks); - TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_FALSE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); + TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); + TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); + TEST_FALSE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); } TEST_END; -- cgit v1.2.3