use DXProt;
use Verify;
+# sub modules
+use QXProt::QXI;
+use QXProt::QXP;
+use QXProt::QXR;
+
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;
{
my $self = shift;
- $self->send($self->gen1);
+ $self->send($self->QXI::gen);
}
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, $line, $incs);
+ return unless ($sort, $tonode, $fromnode, $msgid, $line, $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]);
- return;
-}
-
-sub handle
-{
- no strict 'subs';
- my $self = shift;
- my $id = 0 + shift;
- my $sub = "handle$id";
- $self->$sub($self, @_) if $self->can($sub);
- return;
-}
-
-sub gen
-{
- no strict 'subs';
- my $self = shift;
- my $id = 0 + shift;
- my $sub = "gen$id";
- $self->$sub($self, @_) if $self->can($sub);
+ {
+ no strict 'subs';
+ my $sub = "QX${sort}::handle";
+ $_[0]->$sub($tonode, $fromnode, $msgid, $line) if $_[0]->can($sub);
+ }
return;
}
sub process
{
- if ($main::systime >= $last_node_update+$node_update_interval) {
+
+ my $t = $main::systime;
+
+ foreach my $dxchan (DXChannel->get_all()) {
+ next unless $dxchan->is_np;
+ next if $dxchan == $main::me;
+
+ # send a ping out on this channel
+ if ($dxchan->{pingint} && $t >= $dxchan->{pingint} + $dxchan->{lastping}) {
+ if ($dxchan->{nopings} <= 0) {
+ $dxchan->disconnect;
+ } else {
+ $dxchan->addping($main::mycall, $dxchan->call);
+ $dxchan->{nopings} -= 1;
+ $dxchan->{lastping} = $t;
+ }
+ }
+ }
+
+ if ($t >= $last_node_update+$node_update_interval) {
# sendallnodes();
# sendallusers();
$last_node_update = $main::systime;
}
}
-sub disconnect
-{
- my $self = shift;
- $self->DXProt::disconnect(@_);
-}
-
-sub sendallnodes
+sub adjust_hops
{
+ return $_[1];
}
-sub sendallusers
+sub disconnect
{
-
+ my $self = shift;
+ $self->DXProt::disconnect(@_);
}
my $msgid = 1;
sub frame
{
- my $pcno = shift;
+ my $self = 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
+# add a ping request to the ping queues
+sub addping
{
- 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;
- }
- if ($self->{outbound}) {
- $self->send($self->gen1);
- }
- if ($self->{sort} ne 'S' && $f[2] 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->{lastping} = 0;
-}
-
-sub gen1
-{
- 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 ($self, $usercall, $to) = @_;
+ my $ref = $DXChannel::pings{$to} || [];
+ my $r = {};
+ $r->{call} = $usercall;
+ $r->{t} = [ gettimeofday ];
+ DXChannel::route(undef, $to, $self->QXP::gen($to, 1, $usercall, @{$r->{t}}));
+ push @$ref, $r;
+ $DXCHannel::pings{$to} = $ref;
}
-sub handle2
-{
-
-}
-sub gen2
-{
- my $self = shift;
-
- my $node = shift;
- my $sort = shift;
- my @out;
- my $dxchan;
-
- while (@_) {
- my $str = '';
- for (; @_ && length $str <= 230;) {
- my $ref = shift;
- my $call = $ref->call;
- my $flag = 0;
-
- $flag += 1 if $ref->here;
- $flag += 2 if $ref->conf;
- if ($ref->is_node) {
- my $ping = int($ref->pingave * 10);
- $str .= "^N$flag$call,$ping";
- my $v = $ref->build || $ref->version;
- $str .= ",$v" if defined $v;
- } else {
- $str .= "^U$flag$call";
- }
- }
- push @out, $str if $str;
- }
- my $n = @out;
- my $h = get_hops(90);
- @out = map { sprintf "PC90^%s^%X^%s%d%s^%s^", $node->call, $main::systime, $sort, --$n, $_, $h } @out;
- return @out;
-}
1;