X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAranea.pm;h=ed1c99cda1e429ce27928c5099e9a2e856206596;hb=6c06ed486e67b3e36e9af4794d2eb84f59f249c4;hp=7f0134c33e32bb0b8061d18684245b514d51f6a4;hpb=b045cd59e152bf125fb32d3c28cc49cf659b8a4d;p=spider.git

diff --git a/perl/Aranea.pm b/perl/Aranea.pm
index 7f0134c3..ed1c99cd 100644
--- a/perl/Aranea.pm
+++ b/perl/Aranea.pm
@@ -152,9 +152,12 @@ sub disconnect
 	my $call = $self->call;
 
 	return if $self->{disconnecting}++;
-	
+
+	my $thing = Thingy::Bye->new(origin=>$main::mycall, user=>$call);
+	$thing->process($self);
+
 	# get rid of any PC16/17/19
-#	eph_del_regex("^PC1[679]*$call");
+	eph_del_regex("^PC1[679]*$call");
 
 	# do routing stuff, remove me from routing table
 	my $node = Route::Node::get($call);
@@ -165,7 +168,7 @@ sub disconnect
 		# and all my ephemera as well
 		for (@rout) {
 			my $c = $_->call;
-#			eph_del_regex("^PC1[679].*$c");
+			eph_del_regex("^PC1[679].*$c");
 		}
 	}
 
@@ -197,6 +200,23 @@ sub disconnect
 # because it has to be used before a channel is fully initialised).
 #
 
+sub formathead
+{
+	my $mycall = shift;
+	my $dts = shift;
+	my $hop = shift;
+	my $user = shift;
+	my $group = shift;
+	
+	my $s = "$mycall,$dts,$hop";
+	$s .= ",$user" if $user;
+	if ($group) {
+		$s .= "," unless $user;
+		$s .= ",$group" if $group;
+	} 
+	return $s;
+}
+
 sub genheader
 {
 	my $mycall = shift;
@@ -204,10 +224,7 @@ sub genheader
 	my $from = shift;
 	
 	my $date = ((($dayno << 1) | $ntpflag) << 18) |  ($main::systime % 86400);
-	my $r = "$mycall," . sprintf('%6X%04X,0', $date, $seqno);
-	$r .= ",$to" if $to;
-	$r .= "," if $from && !$to;
-	$r .= ",$from" if $from;
+	my $r = formathead($mycall, sprintf('%6X%04X', $date, $seqno), 0, $from, $to);
 	$seqno++;
 	$seqno = 0 if $seqno > 0x0ffff;
 	return $r;
@@ -285,7 +302,7 @@ sub input
 	my ($head, $data) = split /\|/, $line, 2;
 	return unless $head && $data;
 
-	my ($origin, $dts, $hop, $group, $user) = split /,/, $head;
+	my ($origin, $dts, $hop, $user, $group) = split /,/, $head;
 	return if DXDupe::check("Ara,$origin,$dts", $dupeage);
 	my $err;
 	$err .= "incomplete header," unless $origin && $dts && defined $hop;
@@ -313,9 +330,7 @@ sub input
 		$thing = $class->new();
 
 		# reconstitute the header but wth hop increased by one
-		$head = join(',', $origin, $dts, ++$hop);
-		$head .= ",$group" if $group;
-		$head .= ",$user" if $user;
+		$head = formathead($origin, $dts, ++$hop, $user, $group);
 		$thing->{Aranea} = "$head|$data";
 
 		# store useful data