X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetvis.cpp;h=3aff9cd48ef210a3f543a8e2adc2e5f258773ed9;hb=afc5702fb7a8cb7011886093cd4ea0357ce8abce;hp=7f0ac9e6b5de33f0d9fec3ca86bd5721ebeab22f;hpb=6ffe2b950143c5474659cbca2bbcdf58d6b8322c;p=netvis.git diff --git a/source/netvis.cpp b/source/netvis.cpp index 7f0ac9e..3aff9cd 100644 --- a/source/netvis.cpp +++ b/source/netvis.cpp @@ -9,10 +9,10 @@ Distributed unter the GPL #include #include #include +#include #include #include #include -#include #include #include #include @@ -26,9 +26,11 @@ Distributed unter the GPL #include #include #include +#include "history.h" #include "host.h" #include "netvis.h" #include "packet.h" +#include "port.h" #include "resolver.h" using namespace std; @@ -41,8 +43,6 @@ NetVis::NetVis(int argc, char **argv): font(0), max_hosts(1000), max_visible_hosts(30), - draw_labels(true), - blend(true), frames(0) { if(argc<2) @@ -66,7 +66,6 @@ NetVis::NetVis(int argc, char **argv): wnd = new Graphics::SimpleGLWindow(1024, 768); wnd->set_title("NetVis"); wnd->signal_close.connect(sigc::bind(sigc::mem_fun(this, &NetVis::exit), 0)); - wnd->signal_key_press.connect(sigc::mem_fun(this, &NetVis::key_press)); wnd->show(); GL::enable(GL::BLEND); @@ -75,6 +74,8 @@ NetVis::NetVis(int argc, char **argv): font = new GL::Font; DataFile::load(*font, "dejavu-10.font"); + history = new History(*this, 301, 100); + catch_signal(SIGINT); } @@ -90,6 +91,8 @@ NetVis::~NetVis() delete i->second; for(map::iterator i=disabled_hosts.begin(); i!=disabled_hosts.end(); ++i) delete i->second; + for(map::iterator i=ports.begin(); i!=ports.end(); ++i) + delete i->second; for(list::iterator i=packets.begin(); i!=packets.end(); ++i) delete *i; } @@ -111,158 +114,125 @@ void NetVis::tick() wnd->get_display().tick(); + while(pcap_dispatch(pcap, -1, &capture_handler, reinterpret_cast(this))>0) ; + + resolver->tick(); + history->tick(tick_t); + + + float min_activity = numeric_limits::max(); + for(map::iterator i=hosts.begin(); i!=hosts.end(); ++i) { - Debug::ProfilingScope s(profiler, "capture"); - while(pcap_dispatch(pcap, -1, &capture_handler, reinterpret_cast(this))>0) ; + 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())); + for(map::iterator i=disabled_hosts.begin(); i!=disabled_hosts.end();) { - Debug::ProfilingScope s(profiler, "tick"); - - resolver->tick(); + i->second->tick(dt); - float min_activity = numeric_limits::max(); - for(map::iterator i=hosts.begin(); i!=hosts.end(); ++i) + if(i->second->get_activity()>min_activity) { - i->second->tick(dt); - min_activity = min(min_activity, i->second->get_activity()); + i->second->set_active(true); + hosts.insert(*i); + for(unsigned j=0; j<100; ++j) + i->second->tick(100*Time::msec); + disabled_hosts.erase(i++); } - float del_limit = pow(10, 6-0.1*(max_hosts-hosts.size()-disabled_hosts.size())); - for(map::iterator i=disabled_hosts.begin(); i!=disabled_hosts.end();) + else if(i->second->get_activity()second->tick(dt); - - if(i->second->get_activity()>min_activity) - { - i->second->set_active(true); - hosts.insert(*i); - disabled_hosts.erase(i++); - } - else if(i->second->get_activity()second; - disabled_hosts.erase(i++); - } - else - ++i; + delete i->second; + disabled_hosts.erase(i++); } + else + ++i; + } - if(hosts.size()>max_visible_hosts) - { - list activity; - for(map::iterator i=hosts.begin(); i!=hosts.end(); ++i) - activity.push_back(i->second->get_activity()); - activity.sort(); - - list::iterator j = activity.begin(); - advance(j, activity.size()-max_visible_hosts); - float limit = *j; + if(hosts.size()>max_visible_hosts) + { + list activity; + for(map::iterator i=hosts.begin(); i!=hosts.end(); ++i) + activity.push_back(i->second->get_activity()); + activity.sort(); - for(map::iterator i=hosts.begin(); i!=hosts.end();) - { - if(i->second->get_activity()second->set_active(false); - disabled_hosts.insert(*i); - hosts.erase(i++); - } - else - ++i; - } - } + list::iterator j = activity.begin(); + advance(j, activity.size()-max_visible_hosts); + float limit = *j; - for(list::iterator i=packets.begin(); i!=packets.end();) + for(map::iterator i=hosts.begin(); i!=hosts.end();) { - (*i)->tick(dt); - if((*i)->get_stale()) + if(i->second->get_activity()second->set_active(false); + disabled_hosts.insert(*i); + hosts.erase(i++); } else ++i; } } + for(list::iterator i=packets.begin(); i!=packets.end();) { - Debug::ProfilingScope s(profiler, "render"); - GL::clear(GL::COLOR_BUFFER_BIT); - - GL::matrix_mode(GL::PROJECTION); - GL::load_identity(); - GL::ortho_centered(1024, 768); - GL::matrix_mode(GL::MODELVIEW); - GL::load_identity(); - - for(map::iterator i=hosts.begin(); i!=hosts.end(); ++i) - i->second->render(); - if(draw_labels) + (*i)->tick(dt); + if((*i)->get_stale()) { - for(map::iterator i=hosts.begin(); i!=hosts.end(); ++i) - i->second->render_label(); - GL::Texture::unbind(); + delete *i; + i = packets.erase(i); } - GL::Immediate imm((GL::COLOR4_UBYTE, GL::VERTEX2)); - imm.begin(GL::QUADS); - for(list::iterator i=packets.begin(); i!=packets.end(); ++i) - (*i)->render(imm); - imm.end(); + else + ++i; + } - GL::push_matrix(); - GL::translate(-500, 360, 0); - unsigned n = 0; - for(map::iterator i=port_colors.begin(); (i!=port_colors.end() && n<20); ++i, ++n) - { - GL::Color &color = i->second; + render(); + wnd->swap_buffers(); - imm.begin(GL::QUADS); - imm.color(color.r, color.g, color.b, color.a); - for(unsigned x=0; x<=4; x+=2) - { - imm.vertex(x+0, 0); - imm.vertex(x+10, 0); - imm.vertex(x+10, 10); - imm.vertex(x+0, 10); - } - imm.end(); + ++frames; +} - GL::translate(0, -12, 0); - } - GL::pop_matrix(); +void NetVis::render() +{ + GL::clear(GL::COLOR_BUFFER_BIT); - GL::push_matrix(); - if(draw_labels) - { - GL::push_matrix(); - GL::translate(-484, 361, 0); - GL::scale_uniform(10); - n = 0; - for(map::iterator i=port_colors.begin(); (i!=port_colors.end() && n<20); ++i, ++n) - { - GL::Immediate imm2((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2)); - imm.color(1.0f, 1.0f, 1.0f); - font->draw_string(format("%d", i->first), imm2); + GL::matrix_mode(GL::PROJECTION); + GL::load_identity(); + GL::ortho_centered(1024, 768); + GL::matrix_mode(GL::MODELVIEW); + GL::load_identity(); - GL::translate(0, -1.2, 0); - } - GL::pop_matrix(); - GL::Texture::unbind(); - } - GL::pop_matrix(); - - GL::push_matrix(); - GL::translate(-500, -360, 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("%.2f fps", fps)); - GL::pop_matrix(); - GL::Texture::unbind(); - - wnd->swap_buffers(); + for(map::iterator i=hosts.begin(); i!=hosts.end(); ++i) + i->second->render(); + { + GL::Immediate imm((GL::COLOR4_UBYTE, GL::VERTEX2)); + imm.begin(GL::QUADS); + for(list::iterator i=packets.begin(); i!=packets.end(); ++i) + (*i)->render(imm); + imm.end(); } - ++frames; + GL::push_matrix(); + GL::translate(-500, 360, 0); + unsigned n = 0; + for(map::iterator i=ports.begin(); (i!=ports.end() && n<50); ++i, ++n) + { + i->second->render(); + GL::translate(0, -12, 0); + } + GL::pop_matrix(); + + GL::push_matrix(); + GL::translate(-500, -360, 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("%.2f fps", fps)); + GL::Texture::unbind(); + GL::pop_matrix(); + + GL::push_matrix(); + GL::translate(170, -370, 0); + history->render(); + GL::pop_matrix(); } Host &NetVis::get_host(unsigned a) @@ -280,38 +250,20 @@ Host &NetVis::get_host(unsigned 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)); + for(unsigned j=0; j<100; ++j) + host->tick(100*Time::msec); hosts[a] = host; return *host; } -GL::Color &NetVis::get_port_color(unsigned port) -{ - map::iterator i = port_colors.find(port); - if(i!=port_colors.end()) - return i->second; - - GL::Color color; - while(1) - { - color.r = rand()*1.0/RAND_MAX; - color.g = rand()*1.0/RAND_MAX; - color.b = rand()*1.0/RAND_MAX; - if(color.r>0.5 || color.g>0.5 || color.b>0.7) - break; - } - color.a = 0.4f; - return port_colors[port] = color; -} - -void NetVis::key_press(unsigned key, unsigned, wchar_t) +const Port &NetVis::get_port(unsigned number) { - if(key==46) - draw_labels = !draw_labels; - else if(key==56) - { - blend = !blend; - GL::set(GL_BLEND, blend); - } + map::iterator i = ports.find(number); + if(i!=ports.end()) + return *i->second; + Port *port = new Port(*this, number); + ports[number] = port; + return *port; } void NetVis::capture_handler(unsigned char *user, const pcap_pkthdr *, const unsigned char *data) @@ -343,13 +295,18 @@ void NetVis::capture_handler(unsigned char *user, const pcap_pkthdr *, const uns float throttle = shost.send_packet(); if(throttle<1) { - self->packets.push_back(new Packet(shost, dhost, self->get_port_color(port), size)); + self->packets.push_back(new Packet(shost, dhost, self->get_port(port).get_color(), size)); self->packets.back()->tick(-throttle*Msp::Time::sec); } shost.add_activity(size); if(dhost) dhost->add_activity(size); + + if((ntohl(ip->saddr)&self->localnet_mask)==self->localnet) + self->history->activity(0, size); + else if((ntohl(ip->daddr)&self->localnet_mask)==self->localnet) + self->history->activity(size, 0); } }