X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetvis.cpp;h=7bb49bb458e507cb52d3f33cfcd17872f3537142;hb=049518d751b3e2bada5af0bd1af63273e782775f;hp=ff05507a2fc04364d31d1814037b9c247b1bdbbe;hpb=398c5e3e6e03080b6b057fd56858ab04694969ed;p=netvis.git

diff --git a/source/netvis.cpp b/source/netvis.cpp
index ff05507..7bb49bb 100644
--- 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);
@@ -135,10 +135,13 @@ void NetVis::tick()
 		{
 			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++);
 		}
 		else if(i->second->get_activity()<del_limit)
 		{
+			resolver->cancel(i->second);
 			delete i->second;
 			disabled_hosts.erase(i++);
 		}
@@ -170,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);
@@ -211,18 +227,25 @@ void NetVis::render()
 	GL::push_matrix();
 	GL::translate(-500, 360, 0);
 	unsigned n = 0;
-	for(map<unsigned, Port *>::iterator i=ports.begin(); (i!=ports.end() && n<50); ++i, ++n)
+	for(map<unsigned, Port *>::iterator i=ports.begin(); (i!=ports.end() && n<50); ++i)
 	{
-		i->second->render();
-		GL::translate(0, -12, 0);
+		float act = i->second->get_activity();
+		if((i->second->is_registered() && act>1) || act>200)
+		{
+			i->second->render();
+			GL::translate(0, -12, 0);
+			++n;
+		}
 	}
 	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();
@@ -248,11 +271,13 @@ 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;
 }
 
-const Port &NetVis::get_port(unsigned number)
+Port &NetVis::get_port(unsigned number)
 {
 	map<unsigned, Port *>::iterator i = ports.find(number);
 	if(i!=ports.end())
@@ -272,17 +297,40 @@ void NetVis::capture_handler(unsigned char *user, const pcap_pkthdr *, const uns
 		const iphdr *ip = reinterpret_cast<const iphdr *>(eth+1);
 
 		unsigned size = ntohs(ip->tot_len);
-		unsigned port = 0;
+
+		Port *sport = 0;
+		Port *dport = 0;
 		if(ip->protocol==IPPROTO_TCP)
 		{
 			const tcphdr *tcp = reinterpret_cast<const tcphdr *>(ip+1);
-			port = min(ntohs(tcp->source), ntohs(tcp->dest));
+			sport = &self->get_port(ntohs(tcp->source));
+			dport = &self->get_port(ntohs(tcp->dest));
 		}
 		else if(ip->protocol==IPPROTO_UDP)
 		{
 			const udphdr *udp = reinterpret_cast<const udphdr *>(ip+1);
-			port = min(ntohs(udp->source), ntohs(udp->dest));
+			sport = &self->get_port(ntohs(udp->source));
+			dport = &self->get_port(ntohs(udp->dest));
+		}
+
+		Port *port = 0;
+		if(sport && dport)
+		{
+			if(sport->is_registered()!=dport->is_registered())
+			{
+				if(sport->is_registered())
+					port = sport;
+				else
+					port = dport;
+			}
+			else if(sport->get_number()<dport->get_number())
+				port = sport;
+			else
+				port = dport;
 		}
+		else
+			port = &self->get_port(0);
+
 		Host &shost = self->get_host(ntohl(ip->saddr));
 		Host *dhost = 0;
 		if((ntohl(ip->daddr)&0xFF)!=0xFF)
@@ -291,7 +339,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(port).get_color(), size));
+			self->packets.push_back(new Packet(shost, dhost, port->get_color(), size));
 			self->packets.back()->tick(-throttle*Msp::Time::sec);
 		}
 
@@ -299,6 +347,11 @@ void NetVis::capture_handler(unsigned char *user, const pcap_pkthdr *, const uns
 		if(dhost)
 			dhost->add_activity(size);
 
+		if(sport)
+			sport->add_activity(size);
+		if(dport)
+			dport->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)