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;
{
my $self = shift;
- $self->send($self->gen1);
+ $self->send($self->genI);
}
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;
return unless $noderef->newid($msgid);
- $_[0]->handle($id, $fromnode, $msgid, $_[1]);
+ $_[0]->handle($sort, $tonode, $fromnode, $msgid, $_[1]);
return;
}
{
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;
}
{
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;
}
$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
{
}