add pc93 talk messages

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 4ea652afefefaef6a0c01c0e03e814894a88c5db..4e32c22e77940e1eea3db025e85a55b08c0039ca 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -236,6 +236,14 @@ sub new
        # add this node to the table, the values get filled in later
        my $pkg = shift;
        my $call = shift;
+
+       # if we have an entry already, then send a PC21 to all connect
+       # 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->delete;
+               $self->route_pc21($main::mycall, undef, @rout) if @rout;
+       }
        $main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
 
        return $self;
@@ -363,12 +371,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
@@ -772,30 +782,43 @@ sub send_local_config
        }
 }
 
+sub gen_my_pc92_config
+{
+       my $node = shift;
+       
+       if ($node->{call} eq $main::mycall) {
+               my @dxchan = grep { $_->call ne $main::mycall && !$_->{isolate} } DXChannel::get_all();
+               dbg("ROUTE: all dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
+               my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
+               dbg("ROUTE: localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
+               return pc92c($main::routeroot, @localnodes);
+       } else {
+               my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
+               return pc92c($node, @rout);
+       }
+}
+
 sub gen_pc92_update
 {
        my $self = shift;
        my $with_pc92_nodes = shift;
        my $node;
        my @lines;
-       
-       dbg('ROUTE: DXProt::gen_pc92_update start') if isdbg('route');
-
-       # send 'my' configuration for all users and pc92 capable nodes
-       my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all();
-       dbg("ROUTE: all dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('route');
-       my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
-       dbg("ROUTE: localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('route');
-       push @lines, pc92c($main::routeroot, @localnodes);
+       my @dxchan;
+       my @localnodes;
 
+       dbg('ROUTE: DXProt::gen_pc92_update start') if isdbg('routelow');
 
+       # send 'my' configuration for all channels
+       push @lines, gen_my_pc92_config($main::routeroot);
+       
        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();
-               dbg("ROUTE: pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('route');
+               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('route');
+               dbg("ROUTE: pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
                foreach $node (@localnodes) {
                        if ($node && $node->lastid->{92}) {
                                my @rout = map {my $r = Route::get($_); $r ? ($r) : ()} $node->nodes, $node->users;
@@ -807,17 +830,16 @@ 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();
-       dbg("ROUTE: non pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('route');
+       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('route');
+       dbg("ROUTE: non pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
        foreach $node (@localnodes) {
                if ($node) {
-                       my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
-                       push @lines, pc92c($node, @rout);
+                       push @lines, gen_my_pc92_config($node);
                } 
        }
 
-       dbg('ROUTE: DXProt::gen_pc92_update end with ' . scalar @lines . ' lines') if isdbg('route');
+       dbg('ROUTE: DXProt::gen_pc92_update end with ' . scalar @lines . ' lines') if isdbg('routelow');
        return @lines;
 }
 
@@ -1137,8 +1159,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_pc93}) {
+               $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;
 }