X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXXml.pm;h=6bf1fa5967a5bbb4bc248312355899a2b9407e59;hb=0791dd94e297b6c14167f4252b91f06e84fbcf6f;hp=2d83e16bb61e0d6f4a16c1f86b785b48c9be59cb;hpb=aff34665f8f175d135270f9e49c110bcce90e7b8;p=spider.git

diff --git a/perl/DXXml.pm b/perl/DXXml.pm
index 2d83e16b..6bf1fa59 100644
--- a/perl/DXXml.pm
+++ b/perl/DXXml.pm
@@ -39,7 +39,7 @@ sub new
 {
 	my $pkg = shift;
 	my $class = ref $pkg || $pkg;
-	my $self = bless{@_}, $class;
+	my $self = bless{}, $class;
 	while (@_) {
 		my $key = shift;
 		my $val = shift;
@@ -59,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 ($@)");
-		$main::do_xml = 0;
+		$main::do_xml = $xs = 0;
 	} else {
 		$XML::Simple::PREFERRED_PARSER = 'XML::Parser';
 		import XML::Simple;
-		$DXProt::handle_xml = 1;
 		$xs = new XML::Simple(ContentKey=>'content', ForceArray=>1);
 	}
 	undef $@;
 }
 
+# is XML avaiable and active
+sub available
+{
+	return $main::do_xml && $xs;
+}
+
 #
 # note that this a function not a method
 #
@@ -77,7 +82,7 @@ sub normal
 	my $dxchan = shift;
 	my $line = shift;
 
-	unless ($main::do_xml) {
+	unless (available()) {
 		dbg("xml not enabled, IGNORED") if isdbg('chanerr');
 		return;
 	}
@@ -156,7 +161,6 @@ sub process
 				DXXml::Ping::add($main::me, $dxchan->call);
 				$dxchan->{nopings} -= 1;
 				$dxchan->{lastping} = $t;
-				$dxchan->{lastping} += $dxchan->{pingint} / 2 unless @{$dxchan->{pingtime}};
 			}
 		}
 	}
@@ -215,17 +219,17 @@ sub route
 	my $via = $to;
 	my $dxchan;
 	
-	if (my $u = $self->{u}) {
+	if (my $u = $self->{u} && $self->{to} eq $main::mycall) {
 		$via ||= $u if ($dxchan = DXChannel::get($u));
 	}
 	$via ||= $self->{'-via'} || $self->{to};
 
 	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) {
-		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;
 	}
 
@@ -254,12 +258,12 @@ sub route
 	}
 
 	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) {
-		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;
 	}
 
@@ -271,22 +275,10 @@ sub route
 		$dxchan->send($self->toxml);
 	} elsif ($dxchan->is_node) {
 		my $ref = $self->topcxx($dxchan);
-		if (ref $ref) {
-			for (@$ref) {
-				$dxchan->send($_);
-			}
-		} else {
-			$dxchan->send($ref);
-		}
+		$dxchan->send($ref);
 	} else {
 		my $ref = $self->tocmd($dxchan);
-		if (ref $ref) {
-			for (@$ref) {
-				$dxchan->send($_);
-			}
-		} else {
-			$dxchan->send($ref);
-		}
+		$dxchan->send($ref);
 	}
 }