use XML::Parser (it should be adequate for the little things we are doing).

[spider.git] / perl / DXXml.pm

diff --git a/perl/DXXml.pm b/perl/DXXml.pm
index e3c5f270276db1f041d4164e811009fce0633bbf..c29620bbb2cf9a239b1fdb7d86e1a3ce3091f676 100644 (file)
--- a/perl/DXXml.pm
+++ b/perl/DXXml.pm
@@ -41,11 +41,16 @@ sub init
 {
        return unless $main::do_xml;
        
-       eval { require XML::Simple; };
-       unless ($@) {
+       eval { require XML::Simple };
+       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;
+       } else {
+               $XML::Simple::PREFERRED_PARSER = 'XML::Parser';
                import XML::Simple;
                $DXProt::handle_xml = 1;
-               $xs = new XML::Simple();
+               $xs = new XML::Simple(Cache=>[]);
        }
        undef $@;
 }
@@ -90,8 +95,44 @@ sub normal
 #
 # note that this a function not a method
 #
+
+my $last10;
+my $last_hour;
+
 sub process
 {
+       my $t = time;
+       my @dxchan = DXChannel::get_all();
+       my $dxchan;
+
+       foreach $dxchan (@dxchan) {
+               next unless $dxchan->is_node;
+               next unless $dxchan->handle_xml;
+               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 {
+                               DXXml::Ping::add($main::me, $dxchan->call);
+                               $dxchan->{nopings} -= 1;
+                               $dxchan->{lastping} = $t;
+                               $dxchan->{lastping} += $dxchan->{pingint} / 2 unless @{$dxchan->{pingtime}};
+                       }
+               }
+       }
+
+
+       # every ten seconds
+       if (!$last10 || $t - $last10 >= 10) {   
+               $last10 = $t;
+       }
+
+       # every hour
+       if (!$last_hour || $main::systime - 3600 > $last_hour) {
+               $last_hour = $main::systime;
+       }
 
 }
 
@@ -117,13 +158,75 @@ sub toxml
 {
        my $self = shift;
 
-       $self->{o} ||= $main::mycall;
-       $self->{t} ||= IsoTime::dayms();
-       $self->{id} ||= nextid();
+       unless (exists $self->{'-xml'}) {
+               $self->{o} ||= $main::mycall;
+               $self->{t} ||= IsoTime::dayminsec();
+               $self->{id} ||= nextid();
+               
+               my ($name) = (ref $self) =~ /::(\w+)$/;
+               $self->{'-xml'} = $xs->XMLout($self, RootName =>lc $name, NumericEscape=>1);
+       }
+       return $self->{'-xml'};
+}
+
+sub route
+{
+       my $self = shift;
+       my $fromdxchan = shift;
+       my $to = shift;
+       my $via = $to || $self->{'-via'} || $self->{to};
 
-       my ($name) = ref $self =~ /::(\w+)$/;
-       my $s = $xs->XMLout($self, RootName =>lc $name, NumericEscape=>1);
-       return $self->{'-xml'} = $s;
+       unless ($via) {
+               dbg("XML: no route specified (" . $self->toxml . ")") if isdbg('chanerr');
+               return;
+       }
+       if (ref $fromdxchan && $via && $fromdxchan->call eq $via) {
+               dbg("XML: Trying to route back to source (" . $self->toxml . ")") if isdbg('chanerr');
+               return;
+       }
+
+       # always send it down the local interface if available
+       my $dxchan = DXChannel::get($via);
+       if ($dxchan) {
+               dbg("route: $via -> $dxchan->{call} direct" ) if isdbg('route');
+       } else {
+               my $cl = Route::get($via);
+               $dxchan = $cl->dxchan if $cl;
+               dbg("route: $via -> $dxchan->{call} using normal route" ) if isdbg('route');
+       }
+
+       # try the backstop method
+       unless ($dxchan) {
+               my $rcall = RouteDB::get($via);
+               if ($rcall) {
+                       $dxchan = DXChannel::get($rcall);
+                       dbg("route: $via -> $rcall using RouteDB" ) if isdbg('route') && $dxchan;
+               }
+       }
+       
+       unless ($dxchan) {
+               dbg("XML: no route available to $via") if isdbg('chanerr');
+               return;
+       }
+
+       if ($fromdxchan->call eq $via) {
+               dbg("XML: Trying to route back to source (" . $self->toxml . ")") if isdbg('chanerr');
+               return;
+       }
+
+       if ($dxchan == $main::me) {
+               dbg("XML: Trying to route to me (" . $self->toxml . ")") if isdbg('chanerr');
+               return;
+       }
+
+       if ($dxchan->handle_xml) {
+               $dxchan->send($self->toxml);
+       } else {
+               $self->{o} ||= $main::mycall;
+               $self->{id} ||= nextid();
+               $self->{'-timet'} ||= $main::systime;
+               $dxchan->send($self->topcxx);
+       }
 }
 
 sub has_xml