c_meyer/googerteller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve output somewhat (add tracker name when reporting a match), clean up code a bit

Browse Source
This commit is contained in:
bert hubert 2024-04-25 23:20:14 +02:00
parent 9fb88577a3
commit ef47d7cfae
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
teller.cc
View File

@ -14,6 +14,7 @@ using namespace std;
struct TrackerConf struct TrackerConf
{ {
string name; // superfluous but makes life easier
double freq{400}; double freq{400};
double balance{0.5}; // 0 is left, 1 is right double balance{0.5}; // 0 is left, 1 is right
std::atomic<int64_t> counter{0}; std::atomic<int64_t> counter{0};
@ -86,6 +87,7 @@ int main(int argc, char** argv)
auto tellerarr = conftbl.as_table(); auto tellerarr = conftbl.as_table();
for(const auto& t : *tellerarr) { for(const auto& t : *tellerarr) {
auto& entry = trackerdb[(string)t.first]; auto& entry = trackerdb[(string)t.first];
entry.name = t.first;
entry.balance = conftbl[t.first]["balance"].value_or(0.5); entry.balance = conftbl[t.first]["balance"].value_or(0.5);
entry.freq = conftbl[t.first]["freq"].value_or(500); entry.freq = conftbl[t.first]["freq"].value_or(500);
cout <<"Want to play sound for tracker "<<t.first<<", balance= "<<entry.balance<<" frequency = "<<entry.freq<<endl; cout <<"Want to play sound for tracker "<<t.first<<", balance= "<<entry.balance<<" frequency = "<<entry.freq<<endl;
@ -113,7 +115,7 @@ int main(int argc, char** argv)
}); });
} }
else { else {
cout<<"Not array?"<<endl; cout<<"Not array, or empty"<<endl;
} }
track = trackertbl[t.first]["negative"].as_array(); track = trackertbl[t.first]["negative"].as_array();
@ -126,7 +128,7 @@ int main(int argc, char** argv)
}); });
} }
else { else {
cout<<"Negative "<<t.first<<" not array?"<<endl; cout<<"Negative "<<t.first<<" not array, or empty"<<endl;
} }
} }
@ -150,17 +152,19 @@ int main(int argc, char** argv)
auto pos = line.find('>'); auto pos = line.find('>');
if(pos == string::npos) if(pos == string::npos)
continue; continue;
auto pos2 = line.find('.', pos); auto pos2 = line.find('.', pos); // this misses out on IPv6 ICMP
if(pos2 == string::npos) continue; if(pos2 == string::npos) continue;
line.resize(pos2); line.resize(pos2);
string ip = line.substr(pos+2, pos2 - pos - 2); string ip = line.substr(pos+2, pos2 - pos - 2);
if(tracksneg.lookup(&line.at(pos+2))) { if(auto fptr = tracksneg.lookup(ip.c_str())) {
cout<<ip<<" negative match"<<endl; auto ptr = (TrackerConf*)fptr;
cout<<ip<<" negative match ("<<ptr->name<<")"<<endl;
} }
else if(auto fptr = trackspos.lookup(&line.at(pos+2))) { else if(auto fptr = trackspos.lookup(ip.c_str())) {
cout<<ip<<" match!"<<endl; auto ptr = (TrackerConf*)fptr;
((TrackerConf*)fptr)->counter++; cout<<ip<<" match ("<<ptr->name<<")"<<endl;
ptr->counter++;
} }
} }
else { else {
@ -179,13 +183,15 @@ int main(int argc, char** argv)
line.resize(pos2); line.resize(pos2);
string ip=line.substr(pos+2, pos2 - pos - 2); string ip=line.substr(pos+2, pos2 - pos - 2);
// cout<<&line.at(pos+2)<<endl;
if(tracksneg.lookup(&line.at(pos+2))) { if(auto fptr = tracksneg.lookup(ip.c_str())) {
cout<<ip<<" negative match"<<endl; auto ptr = (TrackerConf*)fptr;
cout<<ip<<" negative match ("<<ptr->name<<")"<<endl;
} }
else if(auto fptr = trackspos.lookup(&line.at(pos+2))) { else if(auto fptr = trackspos.lookup(ip.c_str())) {
cout<<ip<<" match!"<<endl; auto ptr = (TrackerConf*)fptr;
((TrackerConf*)fptr)->counter++; cout<<ip<<" match ("<<ptr->name<<")"<<endl;
ptr->counter++;
} }
} }