X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FQXProt.pm;h=b9cf952cb497a553d4fed6aa0069f09d7d20e2f5;hb=aeb4f9f10e93aed5a0f60ce4c387bee11365d60e;hp=b277e3bd910687f8f6b4602a47122287a3c72dfa;hpb=148f4d43135748ba5aff985c50720b370ca1e336;p=spider.git

diff --git a/perl/QXProt.pm b/perl/QXProt.pm
index b277e3bd..b9cf952c 100644
--- a/perl/QXProt.pm
+++ b/perl/QXProt.pm
@@ -35,7 +35,7 @@ use strict;
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -67,7 +67,7 @@ sub sendinit
 {
 	my $self = shift;
 	
-	$self->send($self->gen1);
+	$self->send($self->genI);
 }
 
 sub normal
@@ -76,15 +76,15 @@ sub normal
 		DXProt::normal(@_);
 		return;
 	}
-	my ($id, $fromnode, $msgid, $incs);
-	return unless ($id, $fromnode, $msgid, $incs) = $_[1] =~ /^QX(\d\d)\^([-A-Z0-9]+)\^([0-9A-F]{1,4})\^.*\^([0-9A-F]{2})$/;
+	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 $user = DXChannel->get_current($fromnode);
 
 	my $il = length $incs; 
-	my $cs = sprintf("%02X", unpack("%32C*", substr($_[1], 0, length($_[1]) - ($il+1))));
+	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;
@@ -92,7 +92,7 @@ sub normal
 
 	return unless $noderef->newid($msgid);
 
-	$_[0]->handle($id, $fromnode, $msgid, $_[1]);
+	$_[0]->handle($sort, $tonode, $fromnode, $msgid, $_[1]);
 	return;
 }
 
@@ -100,9 +100,9 @@ sub handle
 {
 	no strict 'subs';
 	my $self = shift;
-	my $id = 0 + shift;
-	my $sub = "handle$id";
-	$self->$sub($self, @_) if $self->can($sub);
+	my $sort = shift;
+	my $sub = "handle$sort";
+	$self->$sub(@_) if $self->can($sub);
 	return;
 }
 
@@ -110,9 +110,9 @@ sub gen
 {
 	no strict 'subs';
 	my $self = shift;
-	my $id = 0 + shift;
-	my $sub = "gen$id";
-	$self->$sub($self, @_) if $self->can($sub);
+	my $sort = shift;
+	my $sub = "gen$sort";
+ 	$self->$sub(@_) if $self->can($sub);
 	return;
 }
 
@@ -134,60 +134,76 @@ sub disconnect
 	$self->DXProt::disconnect(@_);
 }
 
-sub sendallnodes
-{
-}
-
-sub sendallusers
-{
-
-}
-
 my $msgid = 1;
 
 sub frame
 {
-	my $pcno = shift;
+	my $sort = shift;
+	my $to = shift || "*";
 	my $ht;
 	
 	$ht = sprintf "%X", $msgid;
-	my $line = join '^', sprintf("QX%02d", $pcno), $main::mycall, $ht, @_;
+	my $line = join '^', "QX$sort", $to, $main::mycall, $ht, @_;
 	my $cs = sprintf "%02X", unpack("%32C*", $line) & 255;
 	$msgid = 1 if ++$msgid > 0xffff;
 	return "$line^$cs";
 }
 
-sub handle1
+sub handleI
 {
 	my $self = shift;
 	
-	my @f = split /\^/, $_[2];
-	my $inv = Verify->new($f[5]);
-	unless ($inv->verify($main::me->user->passphrase, $f[6], $main::mycall, $self->call)) {
-		$self->sendnow('D','Sorry...');
-		$self->disconnect;
+	my @f = split /\^/, $_[3];
+	if ($self->passphrase && $f[7] && $f[8]) {
+		my $inv = Verify->new($f[7]);
+		unless ($inv->verify($f[8], $main::me->user->passphrase, $main::mycall, $self->call)) {
+			$self->sendnow('D','Sorry...');
+			$self->disconnect;
+		}
+		$self->{verified} = 1;
+	} else {
+		$self->{verified} = 0;
 	}
 	if ($self->{outbound}) {
-		$self->send($self->gen1);
+		$self->send($self->genI);
 	} 
-	if ($self->{sort} ne 'S' && $f[2] eq 'DXSpider') {
+	if ($self->{sort} ne 'S' && $f[4] eq 'DXSpider') {
 		$self->{user}->{sort} = $self->{sort} = 'S';
 		$self->{user}->{priv} = $self->{priv} = 1 unless $self->{priv};
 	}
-	$self->{version} = $f[3];
-	$self->{build} = $f[4];
-	$self->state('normal');
+	$self->{version} = $f[5];
+	$self->{build} = $f[6];
+	$self->state('init1');
 	$self->{lastping} = 0;
 }
 
-sub gen1
+sub genI
 {
 	my $self = shift;
-	my $inp = Verify->new;
-	return frame(1, 1, "DXSpider", $main::version + 53, $main::build, $inp->challenge, $inp->response($self->user->passphrase, $self->call, $main::mycall));
+	my @out = ('I', $self->call, "DXSpider", ($main::version + 53) * 100, $main::build);
+	if (my $pass = $self->user->passphrase) {
+		my $inp = Verify->new;
+		push @out, $inp->challenge, $inp->response($pass, $self->call, $main::mycall);
+	}
+	return frame(@out);
+}
+
+sub handleR
+{
+
+}
+
+sub genR
+{
+
+}
+
+sub handleP
+{
+
 }
 
-sub handle2
+sub genP
 {
 
 }