Avoid unsigned int overflow if total number of hosts exceeds the maximum

[netvis.git] / source / netvis.cpp

diff --git a/source/netvis.cpp b/source/netvis.cpp
index 17f113a369a2ba7c879439b0577435077280f172..7bb49bb458e507cb52d3f33cfcd17872f3537142 100644 (file)
--- a/source/netvis.cpp
+++ b/source/netvis.cpp
@@ -126,7 +126,7 @@ void NetVis::tick()
                i->second->tick(dt);
                min_activity = min(min_activity, i->second->get_activity());
        }
-       float del_limit = pow(10, 6-0.1*(max_hosts-hosts.size()-disabled_hosts.size()));
+       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();)
        {
                i->second->tick(dt);
@@ -173,6 +173,19 @@ void NetVis::tick()
                }
        }
 
+       for(map<unsigned, Port *>::iterator i=ports.begin(); i!=ports.end();)
+       {
+               i->second->tick(dt);
+
+               if(!i->second->is_registered() && i->second->get_activity()<0.1)
+               {
+                       delete i->second;
+                       ports.erase(i++);
+               }
+               else
+                       ++i;
+       }
+
        for(list<Packet *>::iterator i=packets.begin(); i!=packets.end();)
        {
                (*i)->tick(dt);
@@ -227,10 +240,12 @@ void NetVis::render()
        GL::pop_matrix();
 
        GL::push_matrix();
-       GL::translate(-500, -360, 0);
+       GL::translate(-500, -348, 0);
        GL::scale_uniform(10);
        font->draw_string(format("%d hosts", hosts.size()+disabled_hosts.size()));
        GL::translate(0, -1.2, 0);
+       font->draw_string(format("%d ports", ports.size()));
+       GL::translate(0, -1.2, 0);
        font->draw_string(format("%.2f fps", fps));
        GL::Texture::unbind();
        GL::pop_matrix();