X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetvis.cpp;h=cece749e9be6a2ab6003e5d02447673a5ad2d983;hb=c147c9caaf9bc2f6323baf188a438ced9f0f5894;hp=e9c6d50a3719da9628e935911a2c3f75b94b63df;hpb=8814de48529f0b5b828372e471a7523b5f2bb6de;p=netvis.git diff --git a/source/netvis.cpp b/source/netvis.cpp index e9c6d50..cece749 100644 --- a/source/netvis.cpp +++ b/source/netvis.cpp @@ -5,7 +5,6 @@ Copyright @ 2008 Mikko Rasa, Mikkosoft Productions Distributed unter the GPL */ -#include #include #include #include @@ -16,6 +15,8 @@ Distributed unter the GPL #include #include #include +#include +#include #include #include #include @@ -28,12 +29,17 @@ Distributed unter the GPL #include "host.h" #include "netvis.h" #include "packet.h" +#include "port.h" #include "resolver.h" using namespace std; using namespace Msp; NetVis::NetVis(int argc, char **argv): + pcap(0), + resolver(0), + wnd(0), + font(0), max_hosts(1000), max_visible_hosts(30), draw_labels(true), @@ -43,10 +49,7 @@ NetVis::NetVis(int argc, char **argv): if(argc<2) throw UsageError("No interface given"); iface = argv[1]; -} -int NetVis::main() -{ char err[1024]; pcap = pcap_open_live(iface.c_str(), 128, true, 0, err); if(!pcap) @@ -59,39 +62,29 @@ int NetVis::main() localnet = ntohl(localnet); localnet_mask = ntohl(localnet_mask); - dpy = new Graphics::Display; - wnd = new Graphics::Window(*dpy, 1024, 768); - glc = new Graphics::GLContext(*wnd); + resolver = new Resolver; + + 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); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GL::enable(GL::BLEND); + GL::blend_func(GL::SRC_ALPHA, GL::ONE_MINUS_SRC_ALPHA); font = new GL::Font; DataFile::load(*font, "dejavu-10.font"); catch_signal(SIGINT); +} - resolver = new Resolver; - - //set_loop_mode(TICK_BUSY); - - Application::main(); - +NetVis::~NetVis() +{ delete resolver; delete font; - delete glc; delete wnd; - delete dpy; - - cout<::iterator i=hosts.begin(); i!=hosts.end(); ++i) @@ -100,8 +93,6 @@ int NetVis::main() delete i->second; for(list::iterator i=packets.begin(); i!=packets.end(); ++i) delete *i; - - return exit_code; } void NetVis::tick() @@ -119,7 +110,7 @@ void NetVis::tick() frames = 0; } - dpy->tick(); + wnd->get_display().tick(); { Debug::ProfilingScope s(profiler, "capture"); @@ -196,7 +187,7 @@ void NetVis::tick() { Debug::ProfilingScope s(profiler, "render"); - glClear(GL_COLOR_BUFFER_BIT); + GL::clear(GL::COLOR_BUFFER_BIT); GL::matrix_mode(GL::PROJECTION); GL::load_identity(); @@ -208,7 +199,6 @@ void NetVis::tick() i->second->render(); if(draw_labels) { - glColor4f(1.0, 1.0, 1.0, 1.0); for(map::iterator i=hosts.begin(); i!=hosts.end(); ++i) i->second->render_label(); GL::Texture::unbind(); @@ -222,9 +212,9 @@ void NetVis::tick() 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) + for(map::iterator i=ports.begin(); (i!=ports.end() && n<50); ++i, ++n) { - GL::Color &color = i->second; + const GL::Color &color = i->second.get_color(); imm.begin(GL::QUADS); imm.color(color.r, color.g, color.b, color.a); @@ -247,11 +237,12 @@ void NetVis::tick() GL::push_matrix(); GL::translate(-484, 361, 0); GL::scale_uniform(10); - glColor4f(1.0, 1.0, 1.0, 1.0); n = 0; - for(map::iterator i=port_colors.begin(); (i!=port_colors.end() && n<20); ++i, ++n) + for(map::iterator i=ports.begin(); (i!=ports.end() && n<50); ++i, ++n) { - font->draw_string(format("%d", i->first)); + GL::Immediate imm2((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2)); + imm.color(1.0f, 1.0f, 1.0f); + font->draw_string(i->second.get_name(), imm2); GL::translate(0, -1.2, 0); } @@ -269,7 +260,7 @@ void NetVis::tick() GL::pop_matrix(); GL::Texture::unbind(); - glc->swap_buffers(); + wnd->swap_buffers(); } ++frames; @@ -294,23 +285,54 @@ Host &NetVis::get_host(unsigned a) return *host; } -GL::Color &NetVis::get_port_color(unsigned port) +GL::Color NetVis::generate_color(bool privileged) const { - map::iterator i = port_colors.find(port); - if(i!=port_colors.end()) + GL::Color color; + color.r = rand()*1.0/RAND_MAX; + color.g = rand()*1.0/RAND_MAX; + color.b = rand()*1.0/RAND_MAX; + float high = max(max(color.r, color.g), color.b); + color = color*(1.0/high); + if(privileged) + { + float low = min(min(color.r, color.g), color.b); + color = (color+-low)*(1/(1-low)); + } + else + color = color*0.6+0.4; + return color; +} + +const Port &NetVis::get_port(unsigned number) +{ + map::iterator i = ports.find(number); + if(i!=ports.end()) return i->second; - GL::Color color; - while(1) + GL::Color best_color; + float best_score = 0; + for(unsigned j=0; (j<100 && best_score<1); ++j) { - 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; + GL::Color color = generate_color(number<1024); + + float score = 2; + for(i=ports.begin(); i!=ports.end(); ++i) + { + const GL::Color &other = i->second.get_color(); + float dr = color.r-other.r; + float dg = color.g-other.g; + float db = color.b-other.b; + score = min(score, dr*dr+dg*dg+db*db); + } + if(score>best_score) + { + best_score = score; + best_color = color; + } } - color.a = 0.4f; - return port_colors[port] = color; + best_color.a = 0.4f; + i = ports.insert(map::value_type(number, Port(number, best_color))).first; + return i->second; } void NetVis::key_press(unsigned key, unsigned, wchar_t) @@ -353,7 +375,7 @@ 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); }