X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=a1e552f7620097ce70eaa4e7513191b5ca47f2d2;hb=686140dd3cb3c832d8bb6c780acd82effb54834c;hp=2dd97bc051690c793deddf57bcc22355ef662431;hpb=510a9f0644b3a0e02f5951702ada39616bfcfc2f;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 2dd97bc0..a1e552f7 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -617,7 +617,8 @@ sub handle_18 } $self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/; if ($_[1] =~ /\bpc9x/) { - $self->{do_pc9x}++; + $self->{do_pc9x} = 1; + dbg("Do px9x set on $self->{call}"); } } else { $self->version(50.0); @@ -1468,8 +1469,6 @@ sub handle_92 my (@radd, @rdel); - $self->{do_pc9x} ||= 1; - my $pcall = $_[1]; unless ($pcall) { dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr'); @@ -1486,12 +1485,17 @@ sub handle_92 if ($pcall eq $self->{call} && $self->{state} eq 'init') { $self->state('init92'); + $self->{do_pc9x} = 1; + dbg("Do pc9x set on $pcall"); + } + unless ($self->{do_pc9x}) { + dbg("PCPROT: PC9x come in from non-PC9x node, ignored") if isdbg('chanerr'); + return; } my $parent = check_pc9x_t($pcall, $t, 92, 1) || return; my $oparent = $parent; - $parent->lastid->{92} = $t; $parent->do_pc9x(1); $parent->via_pc92(1); @@ -1616,7 +1620,7 @@ sub handle_93 my $line = shift; my $origin = shift; - $self->{do_pc9x} ||= 1; +# $self->{do_pc9x} ||= 1; my $pcall = $_[1]; unless (is_callsign($pcall)) {