add chat/wx/announce handling to PC93

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 010620a0f67725a5c8323d322a4b699a70787735..9a0b2121ff17fc9e0d5f3cc6b11e3c25a8fdc97f 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -221,8 +221,7 @@ sub init
        $main::me->{registered} = 1;
        $main::me->{version} = $main::version;
        $main::me->{build} = $main::build;
-       $main::me->{do_pc92} = 1;
-       $main::me->{via_pc92} = 1;
+       $main::me->{do_pc9x} = 1;
 }
 
 #
@@ -241,7 +240,7 @@ sub new
        # old style connections, because we are about to get the real deal
        if (my $ref = Route::Node::get($call)) {
                dbg("ROUTE: $call is already in the routing table, deleting") if isdbg('route');
-               my @rout = $ref->del_nodes;
+               my @rout = $ref->delete;
                $self->route_pc21($main::mycall, undef, @rout) if @rout;
        }
        $main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
@@ -371,12 +370,14 @@ sub normal
        }
 
        # modify the hop count here
-       if (my ($hops, $trail) = $line =~ /\^H(\d+)(\^?\~?)?$/) {
-               $trail ||= '';
-               $hops--;
-               return if $hops < 0;
-               $line =~ s/\^H(\d+)(\^?\~?)?$/sprintf('^H%d%s', $hops, $trail)/e;
-               $field[-1] = "H$hops";
+       if ($self != $main::me) {
+               if (my ($hops, $trail) = $line =~ /\^H(\d+)(\^?\~?)?$/) {
+                       $trail ||= '';
+                       $hops--;
+                       return if $hops < 0;
+                       $line =~ s/\^H(\d+)(\^?\~?)?$/sprintf('^H%d%s', $hops, $trail)/e;
+                       $field[-1] = "H$hops";
+               }
        }
 
        # send it out for processing
@@ -584,10 +585,11 @@ sub wcy
 sub send_announce
 {
        my $self = shift;
+       my $from_pc9x = shift;
        my $line = shift;
        my @dxchan = DXChannel::get_all();
        my $dxchan;
-       my $target;
+       my $target = $_[6];
        my $to = 'To ';
        my $text = unpad($_[2]);
                                
@@ -596,7 +598,7 @@ sub send_announce
        } elsif ($_[3] gt ' ') { # speciality list handling
                my ($name) = split /\./, $_[3]; 
                $target = "$name"; # put the rest in later (if bothered) 
-       } 
+       }  
        
        if ($_[5] eq '1') {
                $target = "WX"; 
@@ -631,6 +633,8 @@ sub send_announce
        foreach $dxchan (@dxchan) {
                next if $dxchan == $main::me;
                next if $dxchan == $self && $self->is_node;
+               next if $from_pc9x && $dxchan->{do_pc9x};
+               next if $target eq 'LOCAL' && $dxchan->is_node;
                $dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call},
                                                  @a[0..2], @b[0..2]);
        }
@@ -649,6 +653,7 @@ sub nextchatmsgid
 sub send_chat
 {
        my $self = shift;
+       my $from_pc9x = shift;
        my $line = shift;
        my @dxchan = DXChannel::get_all();
        my $dxchan;
@@ -691,10 +696,11 @@ sub send_chat
                if ($dxchan->is_node) {
                        next if $dxchan == $main::me;
                        next if $dxchan == $self;
+                       next if $from_pc9x && $dxchan->{do_pc9x};
                        next unless $dxchan->is_spider || $is_ak1a;
                        next if $target eq 'LOCAL';
                        if (!$ak1a_line && $is_ak1a) {
-                               $ak1a_line = DXProt::pc12($_[0], $text, $_[1], "$target.LST");
+                               $ak1a_line = pc12($_[0], $text, $_[1], "$target.LST");
                        }
                }
                
@@ -733,7 +739,7 @@ sub send_local_config
        dbg('DXProt::send_local_config') if isdbg('trace');
 
        # send our nodes
-       if ($self->{do_pc92}) { 
+       if ($self->{do_pc9x}) { 
                $self->send_pc92_config;
        } else {
                my $node;
@@ -813,7 +819,7 @@ sub gen_pc92_update
        if ($with_pc92_nodes) {
                # send out the configuration of all the directly connected PC92 nodes with current configuration
                # but with the dates that the last config came in with.
-               @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{do_pc92} } DXChannel::get_all_nodes();
+               @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{do_pc9x} } DXChannel::get_all_nodes();
                dbg("ROUTE: pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
                @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
                dbg("ROUTE: pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
@@ -827,7 +833,7 @@ sub gen_pc92_update
        
        # send the configuration of all the directly connected 'external' nodes that don't handle PC92
        # out with the 'external' marker on the first node.
-       @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && !$_->{do_pc92} } DXChannel::get_all_nodes();
+       @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && !$_->{do_pc9x} } DXChannel::get_all_nodes();
        dbg("ROUTE: non pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
        @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
        dbg("ROUTE: non pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
@@ -868,7 +874,7 @@ sub send_pc92_update
 
 sub time_out_pc92_routes
 {
-       my @nodes = grep {$_->call ne $main::mycall && ($_->do_pc92 || $_->via_pc92)} Route::Node::get_all();
+       my @nodes = grep {$_->call ne $main::mycall && ($_->do_pc9x || $_->via_pc92)} Route::Node::get_all();
        my @rdel;
        foreach my $n (@nodes) {
                my $o = $n->dec_obs;
@@ -1157,8 +1163,11 @@ sub talk
 {
        my ($self, $from, $to, $via, $line, $origin) = @_;
        
-       $line =~ s/\^/\\5E/g;                   # remove any ^ characters
-       $self->send(DXProt::pc10($from, $to, $via, $line, $origin));
+       if ($self->{do_pc9x}) {
+               $self->send(pc93($to, $from, $via, $line));
+       } else {
+               $self->send(pc10($from, $to, $via, $line, $origin));
+       }
        Log('talk', $to, $from, $via?$via:$self->call, $line) unless $origin && $origin ne $main::mycall;
 }
 
@@ -1227,7 +1236,7 @@ sub broadcast_route
                        next if $dxchan == $self;
                        next if $dxchan == $main::me;
                        next unless $dxchan->isa('DXProt');
-                       next if $dxchan->{do_pc92};
+                       next if $dxchan->{do_pc9x};
                        next if ($generate == \&pc16 || $generate==\&pc17) && !$dxchan->user->wantsendpc16;
  
                        $dxchan->send_route($origin, $generate, @_);
@@ -1240,7 +1249,7 @@ sub send_route_pc92
 {
        my $self = shift;
 
-       return unless $self->{do_pc92};
+       return unless $self->{do_pc9x};
        
        my $origin = shift;
        my $generate = shift;
@@ -1270,7 +1279,7 @@ sub broadcast_route_pc9x
                foreach $dxchan (@dxchan) {
                        next if $dxchan == $self || $dxchan == $main::me;
                        next if $origin eq $dxchan->{call};     # don't route some from this call back again.
-                       next unless $dxchan->{do_pc92};
+                       next unless $dxchan->{do_pc9x};
                        next unless $dxchan->isa('DXProt');
 
                        $dxchan->send($line);