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

diff --git a/perl/DXXml.pm b/perl/DXXml.pm
index fe4cb2b8..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
@@ -42,13 +48,12 @@ sub init
 	return unless $main::do_xml;
 	
 	eval { require XML::Simple };
-	eval { require XML::SAX } unless $@;
-	eval { require XML::SAX::Expat } unless $@;
+	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::SAX::Expat';
+		$XML::Simple::PREFERRED_PARSER = 'XML::Parser';
 		import XML::Simple;
 		$DXProt::handle_xml = 1;
 		$xs = new XML::Simple(Cache=>[]);
@@ -83,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);
@@ -161,7 +190,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+)$/;