X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXXml.pm;h=fe4cb2b8af8efc6affdc47079922e6f56f25e3c5;hb=9cc26cc7a73efb7679d3e8e819ba0019307f8607;hp=e3c5f270276db1f041d4164e811009fce0633bbf;hpb=817ce3f71cc80d27ceaca7706800ce1ac7e94b51;p=spider.git

diff --git a/perl/DXXml.pm b/perl/DXXml.pm
index e3c5f270..fe4cb2b8 100644
--- a/perl/DXXml.pm
+++ b/perl/DXXml.pm
@@ -41,11 +41,17 @@ sub init
 {
 	return unless $main::do_xml;
 	
-	eval { require XML::Simple; };
-	unless ($@) {
+	eval { require XML::Simple };
+	eval { require XML::SAX } unless $@;
+	eval { require XML::SAX::Expat } 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::SAX::Expat';
 		import XML::Simple;
 		$DXProt::handle_xml = 1;
-		$xs = new XML::Simple();
+		$xs = new XML::Simple(Cache=>[]);
 	}
 	undef $@;
 }
@@ -90,8 +96,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 +159,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