Handle addresses in a more generic way

[netvis.git] / source / netvis.cpp

diff --git a/source/netvis.cpp b/source/netvis.cpp
index 22231b150a4b62356c312d403534fed34ff6f2ff..a8f6209142b2e12505e8017613bf5385c2d88d49 100644 (file)
--- a/source/netvis.cpp
+++ b/source/netvis.cpp
@@ -54,9 +54,10 @@ NetVis::NetVis(int argc, char **argv):
        if(pcap_setnonblock(pcap, true, err)==-1)
                throw runtime_error(err);
 
-       pcap_lookupnet(iface.c_str(), &localnet, &localnet_mask, err);
-       localnet = ntohl(localnet);
-       localnet_mask = ntohl(localnet_mask);
+       unsigned local_addr, local_mask;
+       pcap_lookupnet(iface.c_str(), &local_addr, &local_mask, err);
+       localnet = Address(ntohl(local_addr));
+       localnet.set_mask(Address(ntohl(local_mask)));
 
        resolver = new Resolver;
 
@@ -84,9 +85,9 @@ NetVis::~NetVis()
        delete wnd;
 
        pcap_close(pcap);
-       for(map<unsigned, Host *>::iterator i=hosts.begin(); i!=hosts.end(); ++i)
+       for(map<Address, Host *>::iterator i=hosts.begin(); i!=hosts.end(); ++i)
                delete i->second;
-       for(map<unsigned, Host *>::iterator i=disabled_hosts.begin(); i!=disabled_hosts.end(); ++i)
+       for(map<Address, Host *>::iterator i=disabled_hosts.begin(); i!=disabled_hosts.end(); ++i)
                delete i->second;
        for(map<unsigned, Port *>::iterator i=ports.begin(); i!=ports.end(); ++i)
                delete i->second;
@@ -118,13 +119,13 @@ void NetVis::tick()
 
 
        float min_activity = numeric_limits<float>::max();
-       for(map<unsigned, Host *>::iterator i=hosts.begin(); i!=hosts.end(); ++i)
+       for(map<Address, Host *>::iterator i=hosts.begin(); i!=hosts.end(); ++i)
        {
                i->second->tick(dt);
                min_activity = min(min_activity, i->second->get_activity());
        }
        float del_limit = pow(10, 6-0.1*static_cast<int>(max_hosts-hosts.size()-disabled_hosts.size()));
-       for(map<unsigned, Host *>::iterator i=disabled_hosts.begin(); i!=disabled_hosts.end();)
+       for(map<Address, Host *>::iterator i=disabled_hosts.begin(); i!=disabled_hosts.end();)
        {
                i->second->tick(dt);
 
@@ -149,7 +150,7 @@ void NetVis::tick()
        if(hosts.size()>max_visible_hosts)
        {
                list<float> activity;
-               for(map<unsigned, Host *>::iterator i=hosts.begin(); i!=hosts.end(); ++i)
+               for(map<Address, Host *>::iterator i=hosts.begin(); i!=hosts.end(); ++i)
                        activity.push_back(i->second->get_activity());
                activity.sort();
 
@@ -157,7 +158,7 @@ void NetVis::tick()
                advance(j, activity.size()-max_visible_hosts);
                float limit = *j;
 
-               for(map<unsigned, Host *>::iterator i=hosts.begin(); i!=hosts.end();)
+               for(map<Address, Host *>::iterator i=hosts.begin(); i!=hosts.end();)
                {
                        if(i->second->get_activity()<limit)
                        {
@@ -208,7 +209,7 @@ void NetVis::render()
        GL::MatrixStack::projection() = GL::Matrix::ortho_centered(1024, 768);
        GL::MatrixStack::modelview() = GL::Matrix();
 
-       for(map<unsigned, Host *>::iterator i=hosts.begin(); i!=hosts.end(); ++i)
+       for(map<Address, Host *>::iterator i=hosts.begin(); i!=hosts.end(); ++i)
                i->second->render();
        {
                GL::Immediate imm((GL::COLOR4_UBYTE, GL::VERTEX2));
@@ -244,9 +245,9 @@ void NetVis::render()
        history->render();
 }
 
-Host &NetVis::get_host(unsigned a)
+Host &NetVis::get_host(const Address &a)
 {
-       map<unsigned, Host *>::iterator i = hosts.find(a);
+       map<Address, Host *>::iterator i = hosts.find(a);
        if(i!=hosts.end())
                return *i->second;
 
@@ -255,7 +256,7 @@ Host &NetVis::get_host(unsigned a)
                return *i->second;
 
        Host *host = new Host(*this, a);
-       if((a&localnet_mask)==localnet)
+       if(localnet.masked_match(a))
                host->set_local(true);
        resolver->push(host);
        host->set_position(Vector2(rand()*400.0/RAND_MAX-200.0, rand()*400.0/RAND_MAX-200.0));