X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXXml.pm;h=f05f3d1c582d0b1fd9bb56eeb80908100c3490ee;hb=refs%2Fheads%2Fip_address;hp=c877436b7ba0b96941708accfcdb3ccc25299ee1;hpb=fd20f44c57b732d5362a5ee9b9edb25c958cf71c;p=spider.git

diff --git a/perl/DXXml.pm b/perl/DXXml.pm
index c877436b..f05f3d1c 100644
--- a/perl/DXXml.pm
+++ b/perl/DXXml.pm
@@ -1,7 +1,7 @@
 #
 # XML handler
 #
-# $Id$
+#
 #
 # Copyright (c) Dirk Koopman, G1TLH
 #
@@ -18,24 +18,29 @@ use DXUtil;
 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);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
+use vars qw($xs $id $max_old_age $max_future_age $dupeage);
 $xs = undef;					# the XML::Simple parser instance
 $id = 0;						# the next ID to be used
 $max_old_age = 3600;			# how old a sentence we will accept
 $max_future_age = 900;			# how far into the future we will accept
+$dupeage = 12*60*60;			# duplicates stored half a day 
+
 
 # generate a new XML sentence structure 
 sub new
 {
 	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; 
 }
 
 #
@@ -49,16 +54,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(Cache=>[]);
+		$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
 #
@@ -67,7 +77,7 @@ sub normal
 	my $dxchan = shift;
 	my $line = shift;
 
-	unless ($main::do_xml) {
+	unless (available()) {
 		dbg("xml not enabled, IGNORED") if isdbg('chanerr');
 		return;
 	}
@@ -97,11 +107,11 @@ sub normal
 		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;
 	}
-	unless (exists $xref->{id} && ($id = $xref->{id}) >= 0 && $id <= 9999) {
+	unless (exists $xref->{id} && ($id = $xref->{id}) >= 0 && $id <= 999) {
 		dbg("Invalid or non-existant id") if isdbg('chanerr');
 		return;
 	}
@@ -113,11 +123,11 @@ sub normal
 	# now check that we have not seen this before 
 	# this is based on the tuple (o (origin), t (time, normalised to time_t), id)
 	$xref->{'-timet'} = $t;
-	return if DXDupe::check("xml,$o,$t,$id");
+	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);
 }
 
 #
@@ -146,7 +156,6 @@ sub process
 				DXXml::Ping::add($main::me, $dxchan->call);
 				$dxchan->{nopings} -= 1;
 				$dxchan->{lastping} = $t;
-				$dxchan->{lastping} += $dxchan->{pingint} / 2 unless @{$dxchan->{pingtime}};
 			}
 		}
 	}
@@ -188,7 +197,7 @@ sub toxml
 
 	unless (exists $self->{'-xml'}) {
 		$self->{o} ||= $main::mycall;
-		$self->{t} ||= IsoTime::dayminsec();
+		$self->{t} ||= IsoTime::hourminsec();
 		$self->{id} ||= nextid();
 		
 		my ($name) = (ref $self) =~ /::(\w+)$/;
@@ -202,19 +211,25 @@ sub route
 	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) {
-		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;
 	}
 
 	# 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 {
@@ -223,37 +238,33 @@ sub route
 		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');
+		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;
 	}
 
+	$self->{o} ||= $main::mycall;
+	$self->{id} ||= nextid();
+	$self->{'-timet'} ||= $main::systime;
+
 	if ($dxchan->handle_xml) {
 		$dxchan->send($self->toxml);
+	} elsif ($dxchan->is_node) {
+		my $ref = $self->topcxx($dxchan);
+		$dxchan->send($ref);
 	} else {
-		$self->{o} ||= $main::mycall;
-		$self->{id} ||= nextid();
-		$self->{'-timet'} ||= $main::systime;
-		$dxchan->send($self->topcxx);
+		my $ref = $self->tocmd($dxchan);
+		$dxchan->send($ref);
 	}
 }