projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix typo
[spider.git]
/
perl
/
DXXml.pm
diff --git
a/perl/DXXml.pm
b/perl/DXXml.pm
index 00fccde4cddd5f17f0668e55fe935ab6569a1104..6bf1fa5967a5bbb4bc248312355899a2b9407e59 100644
(file)
--- a/
perl/DXXml.pm
+++ b/
perl/DXXml.pm
@@
-18,6
+18,8
@@
use DXUtil;
use DXXml::Ping;
use DXXml::Dx;
use DXXml::IM;
use DXXml::Ping;
use DXXml::Dx;
use DXXml::IM;
+use DXXml::Text;
+use DXXml::Cmd;
use vars qw($VERSION $BRANCH $xs $id $max_old_age $max_future_age $dupeage);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
use vars qw($VERSION $BRANCH $xs $id $max_old_age $max_future_age $dupeage);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
@@
-37,7
+39,13
@@
sub new
{
my $pkg = shift;
my $class = ref $pkg || $pkg;
{
my $pkg = shift;
my $class = ref $pkg || $pkg;
- return bless{@_}, $class;
+ my $self = bless{}, $class;
+ while (@_) {
+ my $key = shift;
+ my $val = shift;
+ $self->{$key} = $val if defined $val;
+ }
+ return $self;
}
#
}
#
@@
-51,16
+59,21
@@
sub init
eval { require XML::Parser } unless $@;
if ($@) {
LogDbg('err', "do_xml was set to 1 and the XML routines failed to load ($@)");
eval { require XML::Parser } unless $@;
if ($@) {
LogDbg('err', "do_xml was set to 1 and the XML routines failed to load ($@)");
- $main::do_xml = 0;
+ $main::do_xml =
$xs =
0;
} else {
$XML::Simple::PREFERRED_PARSER = 'XML::Parser';
import XML::Simple;
} else {
$XML::Simple::PREFERRED_PARSER = 'XML::Parser';
import XML::Simple;
- $DXProt::handle_xml = 1;
- $xs = new XML::Simple(Cache=>[]);
+ $xs = new XML::Simple(ContentKey=>'content', ForceArray=>1);
}
undef $@;
}
}
undef $@;
}
+# is XML avaiable and active
+sub available
+{
+ return $main::do_xml && $xs;
+}
+
#
# note that this a function not a method
#
#
# note that this a function not a method
#
@@
-69,7
+82,7
@@
sub normal
my $dxchan = shift;
my $line = shift;
my $dxchan = shift;
my $line = shift;
- unless (
$main::do_xml
) {
+ unless (
available()
) {
dbg("xml not enabled, IGNORED") if isdbg('chanerr');
return;
}
dbg("xml not enabled, IGNORED") if isdbg('chanerr');
return;
}
@@
-99,11
+112,11
@@
sub normal
dbg("Invalid, non-existant or zero time") if isdbg('chanerr');
return;
}
dbg("Invalid, non-existant or zero time") if isdbg('chanerr');
return;
}
- unless ($t
< $main::systime - $max_old_age || $t >
$main::systime + $max_future_age) {
+ unless ($t
> $main::systime - $max_old_age && $t <
$main::systime + $max_future_age) {
dbg("Too old or too far in the future") if isdbg('chanerr');
return;
}
dbg("Too old or too far in the future") if isdbg('chanerr');
return;
}
- unless (exists $xref->{id} && ($id = $xref->{id}) >= 0 && $id <= 999
9
) {
+ unless (exists $xref->{id} && ($id = $xref->{id}) >= 0 && $id <= 999) {
dbg("Invalid or non-existant id") if isdbg('chanerr');
return;
}
dbg("Invalid or non-existant id") if isdbg('chanerr');
return;
}
@@
-117,9
+130,9
@@
sub normal
$xref->{'-timet'} = $t;
return if DXDupe::check("xml,$o,$t,$id", $dupeage);
$xref->{'-timet'} = $t;
return if DXDupe::check("xml,$o,$t,$id", $dupeage);
-
$xref
= bless $xref, $pkg;
- $
xref
->{'-xml'} = $line;
- $
xref
->handle_input($dxchan);
+
my $r
= bless $xref, $pkg;
+ $
r
->{'-xml'} = $line;
+ $
r
->handle_input($dxchan);
}
#
}
#
@@
-148,7
+161,6
@@
sub process
DXXml::Ping::add($main::me, $dxchan->call);
$dxchan->{nopings} -= 1;
$dxchan->{lastping} = $t;
DXXml::Ping::add($main::me, $dxchan->call);
$dxchan->{nopings} -= 1;
$dxchan->{lastping} = $t;
- $dxchan->{lastping} += $dxchan->{pingint} / 2 unless @{$dxchan->{pingtime}};
}
}
}
}
}
}
@@
-190,7
+202,7
@@
sub toxml
unless (exists $self->{'-xml'}) {
$self->{o} ||= $main::mycall;
unless (exists $self->{'-xml'}) {
$self->{o} ||= $main::mycall;
- $self->{t} ||= IsoTime::
day
minsec();
+ $self->{t} ||= IsoTime::
hour
minsec();
$self->{id} ||= nextid();
my ($name) = (ref $self) =~ /::(\w+)$/;
$self->{id} ||= nextid();
my ($name) = (ref $self) =~ /::(\w+)$/;
@@
-204,19
+216,25
@@
sub route
my $self = shift;
my $fromdxchan = shift;
my $to = shift;
my $self = shift;
my $fromdxchan = shift;
my $to = shift;
- my $via = $to || $self->{'-via'} || $self->{to};
+ my $via = $to;
+ my $dxchan;
+
+ if (my $u = $self->{u} && $self->{to} eq $main::mycall) {
+ $via ||= $u if ($dxchan = DXChannel::get($u));
+ }
+ $via ||= $self->{'-via'} || $self->{to};
unless ($via) {
unless ($via) {
- dbg("XML: no route specified (" .
$self->toxml
. ")") if isdbg('chanerr');
+ dbg("XML: no route specified (" .
dd($self)
. ")") if isdbg('chanerr');
return;
}
if (ref $fromdxchan && $via && $fromdxchan->call eq $via) {
return;
}
if (ref $fromdxchan && $via && $fromdxchan->call eq $via) {
- dbg("XML: Trying to route back to source (" .
$self->toxml
. ")") if isdbg('chanerr');
+ dbg("XML: Trying to route back to source (" .
dd($self)
. ")") if isdbg('chanerr');
return;
}
# always send it down the local interface if available
return;
}
# always send it down the local interface if available
-
my $dxchan
= DXChannel::get($via);
+
$dxchan ||
= DXChannel::get($via);
if ($dxchan) {
dbg("route: $via -> $dxchan->{call} direct" ) if isdbg('route');
} else {
if ($dxchan) {
dbg("route: $via -> $dxchan->{call} direct" ) if isdbg('route');
} else {
@@
-240,22
+258,27
@@
sub route
}
if ($fromdxchan->call eq $via) {
}
if ($fromdxchan->call eq $via) {
- dbg("XML: Trying to route back to source (" .
$self->toxml
. ")") if isdbg('chanerr');
+ dbg("XML: Trying to route back to source (" .
dd($self)
. ")") if isdbg('chanerr');
return;
}
if ($dxchan == $main::me) {
return;
}
if ($dxchan == $main::me) {
- dbg("XML: Trying to route to me (" .
$self->toxml
. ")") if isdbg('chanerr');
+ dbg("XML: Trying to route to me (" .
dd($self)
. ")") if isdbg('chanerr');
return;
}
return;
}
+ $self->{o} ||= $main::mycall;
+ $self->{id} ||= nextid();
+ $self->{'-timet'} ||= $main::systime;
+
if ($dxchan->handle_xml) {
$dxchan->send($self->toxml);
if ($dxchan->handle_xml) {
$dxchan->send($self->toxml);
+ } elsif ($dxchan->is_node) {
+ my $ref = $self->topcxx($dxchan);
+ $dxchan->send($ref);
} else {
} else {
- $self->{o} ||= $main::mycall;
- $self->{id} ||= nextid();
- $self->{'-timet'} ||= $main::systime;
- $dxchan->send($self->topcxx);
+ my $ref = $self->tocmd($dxchan);
+ $dxchan->send($ref);
}
}
}
}