oe7drt/YSFClients
1
0
Fork 0
mirror of https://github.com/oe7drt/YSFClients.git synced 2026-04-05 14:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sort reflector list and the beginning of search.

Browse source
This commit is contained in:
Jonathan Naylor 2016-06-09 19:24:04 +01:00
parent 1f2b25de46
commit 0b7280cd81
3 changed files with 122 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
YSFGateway/Reflectors.cpp
View file

@ -86,7 +86,7 @@ CYSFReflector* CReflectors::find(const std::string& id)
return NULL;
}
static int refComparison(const CYSFReflector* r1, const CYSFReflector* r2)
static bool refComparison(const CYSFReflector* r1, const CYSFReflector* r2)
{
assert(r1 != NULL);
assert(r2 != NULL);
@ -94,13 +94,13 @@ static int refComparison(const CYSFReflector* r1, const CYSFReflector* r2)
std::string name1 = r1->m_name;
std::string name2 = r2->m_name;
for (unsigned int i = 0U; i < name1.size() && i < name2.size(); i++) {
for (unsigned int i = 0U; i < 16U; i++) {
int c = ::toupper(name1.at(i)) - ::toupper(name2.at(i));
if (c != 0)
return c;
return c < 0;
}
return int(name1.size()) - int(name2.size());
return false;
}
std::vector<CYSFReflector*>& CReflectors::current()
@ -112,13 +112,17 @@ std::vector<CYSFReflector*>& CReflectors::current()
m_current.push_back(*it);
}
std::sort(m_current.begin(), m_current.end(), ::refComparison);
std::sort(m_current.begin(), m_current.end(), refComparison);
return m_current;
}
void CReflectors::clock(unsigned int ms)
{
// Nothing to do, avoid crashes
if (m_reflectors.size() == 0U)
return;
m_timer.clock(ms);
if (m_timer.isRunning() && m_timer.hasExpired()) {
m_socket.write((unsigned char*)"YSFS", 4U, (*m_it)->m_address, (*m_it)->m_port);