X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FQXProt.pm;h=3aabb5ed07e8c9d206d24024483cbc71dfc70a08;hb=42c0c882a3feb6dd2c70447066f980cc0f3d1b85;hp=b0d9a167eedc6e886ba8ce6abc3786b6814833d1;hpb=f70b281ed9f65940d33827bbf36ab5bc4d9c87bb;p=spider.git

diff --git a/perl/QXProt.pm b/perl/QXProt.pm
index b0d9a167..3aabb5ed 100644
--- a/perl/QXProt.pm
+++ b/perl/QXProt.pm
@@ -72,28 +72,45 @@ sub sendinit
 
 sub normal
 {
-	if ($_[1] =~ /^PC\d\d\^/) {
-		DXProt::normal(@_);
-		return;
+	my $r;
+	
+	if  (ref $_[1] && $_->isa('Thingy')) {
+		$_[1]->handle($_[0]);
+	} else {
+		if ($_[1] =~ /^PC\d\d\^/) {
+			DXProt::normal(@_);
+		} elsif ($_[1] =~ /^QX\w\^/){
+
+			my ($sort, $tonode, $fromnode, $msgid, $incs);
+			return unless ($sort, $tonode, $fromnode, $msgid, $incs) = $_[1] =~ /^QX([A-Z])\^(\*|[-A-Z0-9]+)\^([-A-Z0-9]+)\^([0-9A-F]{1,4})\^.*\^([0-9A-F]{2})$/;
+			
+			$msgid = hex $msgid;
+			my $noderef = Route::Node::get($fromnode);
+			$noderef = Route::Node::new($fromnode) unless $noderef;
+			
+			my $il = length $incs; 
+			my $cs = sprintf("%02X", unpack("%32C*", substr($_[1], 0, length($_[1]) - ($il+1))) & 255);
+			if ($incs ne $cs) {
+				dbg("QXPROT: Checksum fail in: $incs ne calc: $cs" ) if isdbg('chanerr');
+				return;
+			}
+			
+			unless ($noderef->newid($msgid)) {
+				dbg("QXPROT: Dupe, dropped") if isdbg('chanerr');
+				return;
+			}
+			
+			no strict 'subs';
+			my $sub = "Thingy::QX$sort";
+			my $thing = $sub->new(sort => $sort, tonode => $tonode, fromnode => $fromnode, id=> $msgid, line => $line);
+			$r = $thing->handle($_[0]); 
+		} else {
+			dbg("QXProt: unrecognised protocol, dropped") if isdbg('chanerr') 
+		}
 	}
-	my ($sort, $tonode, $fromnode, $msgid, $incs);
-	return unless ($sort, $tonode, $fromnode, $msgid, $incs) = $_[1] =~ /^QX([A-Z])\^(\*|[-A-Z0-9]+)\^([-A-Z0-9]+)\^([0-9A-F]{1,4})\^.*\^([0-9A-F]{2})$/;
-
-	$msgid = hex $msgid;
-	my $noderef = Route::Node::get($fromnode);
-	$noderef = Route::Node::new($fromnode) unless $noderef;
-
-	my $il = length $incs; 
-	my $cs = sprintf("%02X", unpack("%32C*", substr($_[1], 0, length($_[1]) - ($il+1))) & 255);
-	if ($incs ne $cs) {
-		dbg("QXPROT: Checksum fail in: $incs ne calc: $cs" ) if isdbg('chanerr');
-		return;
+	unless (ref $r) {
+		dbg($r) if isdbg("chanerr");
 	}
-
-	return unless $noderef->newid($msgid);
-
-	$_[0]->handle($sort, $tonode, $fromnode, $msgid, $_[1]);
-	return;
 }
 
 sub handle
@@ -220,12 +237,12 @@ sub genP
 sub handleX
 {
 	my $self = shift;
-	my ($tonode, $fromnode, $msgid, $line) = @_[0..3];
-	my ($origin, $l) = split /\^/, $line, 2;
+	my ($sort, $to, $from, $msgid, $origin, $line) = split /\^/, $_[3], 6;
 
-	my ($pcno) = $l =~ /^PC(\d\d)/;
+	my ($pcno) = $line =~ /^PC(\d\d)/;
 	if ($pcno) {
-		DXProt::normal($self, $l);
+		$line =~ s/\^[[0-9A-F]+]$//;
+		DXProt::normal($self, $line);
 	}
 }