X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy.pm;h=a420206d5ef402a7c70f038927ab575a068fd41d;hb=c3c15883cf25add24fc49e32eb0d17dce6839a62;hp=c358389fd0318f1f96632f52e06553d41089d97f;hpb=5b3c2c5e342c23fbab96b7573c5963344617878f;p=spider.git

diff --git a/perl/Thingy.pm b/perl/Thingy.pm
index c358389f..a420206d 100644
--- a/perl/Thingy.pm
+++ b/perl/Thingy.pm
@@ -16,10 +16,8 @@ use strict;
 package Thingy;
 
 use vars qw($VERSION $BRANCH @queue @permin @persec);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 @queue = ();					# the input / processing queue
 
@@ -44,6 +42,8 @@ sub new
 {
 	my $class = shift;
 	my $thing = {@_};
+
+	$thing->{origin} ||= $main::mycall;
 	
 	bless $thing, $class;
 	return $thing;
@@ -63,19 +63,17 @@ sub send
 
 	# do output filtering
 	if ($thing->can('out_filter')) {
-		return unless $thing->out_filter;
+		return unless $thing->out_filter($dxchan);
 	}
 
 	# generate the line which may (or not) be cached
-	my @out;
-	if (my $ref = $thing->{class}) {
-		push @out, ref $ref ? @$ref : $ref;
-	} else {
+	my $ref;
+	unless ($ref = $thing->{class}) {
 		no strict 'refs';
 		my $sub = "gen_$class";
-		push @out, $thing->$sub($dxchan) if $thing->can($sub);
+		$ref = $thing->$sub($dxchan) if $thing->can($sub);
 	}
-	$dxchan->send(@out) if @out;
+	$dxchan->send(ref $ref ? @$ref : $ref) if $ref;
 }
 
 # broadcast to all except @_
@@ -100,18 +98,33 @@ sub queue
 	push @queue, $thing;
 }
 
+#
 # this is the main commutator loop. In due course it will
-# become the *only* commutator loop
+# become the *only* commutator loop, This can be called in one
+# of two ways: either with 2 args or with none.
+#
+# The two arg form is an immediate "queue and handle" and does
+# a full cycle, immediately
+#
 sub process
 {
 	my $thing;
+	if (@_ == 2) {
+		$thing = shift;
+		$thing->queue(shift);
+	}
 	while (@queue) {
 		$thing = shift @queue;
-		my $dxchan = DXChannel->get($thing->{dxchan});
+		my $dxchan = DXChannel::get($thing->{dxchan});
 		if ($dxchan) {
 			if ($thing->can('in_filter')) {
 				next unless $thing->in_filter($dxchan);
 			}
+
+			# remember any useful routes
+			RouteDB::update($thing->{origin}, $dxchan->{call}, $thing->{hopsaway});
+			RouteDB::update($thing->{user}, $dxchan->{call}, $thing->{hopsaway}) if exists $thing->{user};
+		
 			$thing->handle($dxchan);
 		}
 	}
@@ -160,5 +173,14 @@ sub ascii
     $dd->Quotekeys($] < 5.005 ? 1 : 0);
 	return $dd->Dumpxs;
 }
+
+sub add_auth
+{
+	my $thing = shift;
+	my $s = $thing->{'s'} = sprintf "%X", int(rand() * 100000000);
+	my $auth = Verify->new("DXSp,$main::mycall,$s,$main::version,$main::build");
+	$thing->{auth} = $auth->challenge($main::me->user->passphrase);
+}
+
 1;