X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXXml.pm;h=9d0a59698170c153a5db6ec4ab77ac124012c878;hb=a253a7d3820e9fb58bca0c2633ba958778ad4c52;hp=968b6148cf04f48d60e3564bd1292891eec19e37;hpb=af378e74088394d9c70a9a01d67a311cf4774d96;p=spider.git

diff --git a/perl/DXXml.pm b/perl/DXXml.pm
index 968b6148..9d0a5969 100644
--- a/perl/DXXml.pm
+++ b/perl/DXXml.pm
@@ -14,10 +14,12 @@ use IsoTime;
 use DXProt;
 use DXDebug;
 use DXLog;
+use DXUtil;
 use DXXml::Ping;
 use DXXml::Dx;
+use DXXml::IM;
 
-use vars qw($VERSION $BRANCH $xs $id);
+use vars qw($VERSION $BRANCH $xs $id $max_old_age $max_future_age $dupeage);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
 $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
@@ -25,6 +27,10 @@ $main::branch += $BRANCH;
 
 $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
@@ -41,11 +47,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 $@;
 }
@@ -77,11 +88,35 @@ sub normal
 		undef $@;
 		return;
 	}
-	
+
+	# do some basic checks
+	my ($o, $t, $id);
+	unless (exists $xref->{o} && is_callsign($o = $xref->{o})) {
+		dbg("Invalid origin, not a callsign") if isdbg('chanerr');
+		return;
+	}
+	unless (exists $xref->{t} && ($t = IsoTime::unixtime($xref->{t}))) {
+		dbg("Invalid, non-existant or zero time") if isdbg('chanerr');
+		return;
+	}
+	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 <= 999) {
+		dbg("Invalid or non-existant id") if isdbg('chanerr');
+		return;
+	}
+
 	# mark the handle as accepting xml (but only if they 
 	# have at least one right)
 	$dxchan->handle_xml(1);
 
+	# 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", $dupeage);
+		
 	$xref = bless $xref, $pkg;
 	$xref->{'-xml'} = $line; 
 	$xref->handle_input($dxchan);
@@ -90,8 +125,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,12 +188,90 @@ 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::hourminsec();
+		$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};
+
+	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;
+	}
 
-	my ($name) = ref $self =~ /::(\w+)$/;
-	my $s = $xs->XMLout($self, RootName =>$name, NumericEscape=>1);
-	return $self->{'-xml'} = $s;
+	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
+{
+	return exists $_[0]->{'-xml'};
 }
+
+sub has_pcxx
+{
+	return exists $_[0]->{'-pcxx'};
+}
+
+sub has_cmd
+{
+	return exists $_[0]->{'-cmd'};
+}
+
 1;