add ip addresses to dxspots emitted as PC61

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 2fa4095fa381c0a1b9ddb94829405a7cd6fd9173..43e5670cf4d511311658ecf6cd9e6875bf17d8b0 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -171,13 +171,13 @@ sub handle_11
        # convert the date to a unix date
        my $d = cltounix($_[3], $_[4]);
        # bang out (and don't pass on) if date is invalid or the spot is too old (or too young)
-       if (!$d || ($pcno == 11 && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
+       if (!$d || (($pcno == 11 || $pcno == 61) && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
                dbg("PCPROT: Spot ignored, invalid date or out of range ($_[3] $_[4])\n") if isdbg('chanerr');
                return;
        }
 
        # is it 'baddx'
-       if ($baddx->in($_[2]) || BadWords::check($_[2]) || $_[2] =~ /COCK/) {
+       if ($baddx->in($_[2]) || BadWords::check($_[2])) {
                dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
                return;
        }
@@ -197,7 +197,7 @@ sub handle_11
                }
        }
 
-       my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $nossid, $_[7]);
+       my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $nossid, $_[7], $_[8]);
        # global spot filtering on INPUT
        if ($self->{inspotsfilter}) {
                my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
@@ -1353,7 +1353,10 @@ sub _decode_pc92_call
        my $is_node = $flag & 4;
        my $is_extnode = $flag & 2;
        my $here = $flag & 1;
-       return ($call, $is_node, $is_extnode, $here, $part[1], $part[2]);
+       my $ip  = $part[3];
+       $ip ||= $part[1] if $part[1] && ($part[1] =~ /^(?:\d+\.)+/ || $part[1] =~ /^(?:(?:[abcdef\d]+)?,)+/);
+       $ip =~ s/,/:/g if $ip;
+       return ($call, $is_node, $is_extnode, $here, $part[1], $part[2], $ip);
 }
 
 # decode a pc92 call: flag call : version : build
@@ -1364,7 +1367,7 @@ sub _encode_pc92_call
        # plain call or value
        return $ref unless ref $ref;
 
-       my $ext = shift;
+       my $ext = shift || 0;
        my $flag = 0;
        my $call = $ref->call;
        my $extra = '';
@@ -1373,14 +1376,17 @@ sub _encode_pc92_call
                $flag |= 4;
                my $dxchan = DXChannel::get($call);
                $flag |= 2 if $call ne $main::mycall && $dxchan && !$dxchan->{do_pc9x};
-               if ($ext) {
-                       if ($ref->version) {
-                               my $version = $ref->version || 1.0;
-                               $version =  $version * 100 + 5300 if $version < 50;
-                               $extra .= ":" . $version;
-                       }
+               if (($ext & 1) && $ref->version) {
+                       my $version = $ref->version || 1.0;
+                       $version =  $version * 100 + 5300 if $version < 50;
+                       $extra .= ":" . $version;
                }
        }
+       if (($ext & 2) && $ref->ip) {
+               my $ip = $ref->ip;
+               $ip =~ s/:/,/g;
+               $extra .= ':' . $ip;
+       }
        return "$flag$call$extra";
 }
 
@@ -1394,18 +1400,29 @@ sub _add_thingy
        my $dxchan = shift;
        my $hops = shift;
 
-       my ($call, $is_node, $is_extnode, $here, $version, $build) = @$s;
+       my ($call, $is_node, $is_extnode, $here, $version, $build, $ip) = @$s;
        my @rout;
 
        if ($call) {
+               my $ncall = $parent->call;
                if ($is_node) {
-                       dbg("ROUTE: added node $call to " . $parent->call) if isdbg('routelow');
-                       @rout = $parent->add($call, $version, Route::here($here));
+                       dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
+                       @rout = $parent->add($call, $version, Route::here($here), $ip);
                        my $r = Route::Node::get($call);
                        $r->PC92C_dxchan($dxchan->call, $hops) if $r;
+                       if ($ip) {
+                               $r->ip($ip);
+                               Log('DXProt', "PC92A $call -> $ip on $ncall");
+                       }
                } else {
-                       dbg("ROUTE: added user $call to " . $parent->call) if isdbg('routelow');
-                       @rout = $parent->add_user($call, Route::here($here));
+                       dbg("ROUTE: added user $call to $ncall") if isdbg('routelow');
+                       @rout = $parent->add_user($call, Route::here($here), $ip);
+                       $dxchan->tell_buddies('loginb', $call, $ncall) if $dxchan;
+                       my $r = Route::User::get($call);
+                       if ($ip) {
+                               $r->ip($ip);
+                               Log('DXProt', "PC92A $call -> $ip on $ncall");
+                       }
                }
                if ($pc92_slug_changes && $parent == $main::routeroot) {
                        $things_add{$call} = Route::get($call);
@@ -1419,6 +1436,7 @@ sub _del_thingy
 {
        my $parent = shift;
        my $s = shift;
+       my $dxchan = shift;
        my ($call, $is_node, $is_extnode, $here, $version, $build) = @$s;
        my @rout;
        if ($call) {
@@ -1428,9 +1446,12 @@ sub _del_thingy
                        dbg("ROUTE: deleting node $call from " . $parent->call) if isdbg('routelow');
                        @rout = $ref->del($parent) if $ref;
                } else {
-                       $ref = Route::User::get($call);
                        dbg("ROUTE: deleting user $call from " . $parent->call) if isdbg('routelow');
-                       @rout = $parent->del_user($ref) if $ref;
+                       $ref = Route::User::get($call);
+                       if ($ref) {
+                               $dxchan->tell_buddies('logoutb', $call, $parent->call) if $dxchan;
+                               @rout = $parent->del_user($ref);
+                       }
                }
                if ($pc92_slug_changes && $parent == $main::routeroot) {
                        $things_del{$call} = $ref unless exists $things_add{$call};
@@ -1773,7 +1794,7 @@ sub handle_92
                        }
                } elsif ($sort eq 'D') {
                        for (@nent) {
-                               push @rdel, _del_thingy($parent, $_);
+                               push @rdel, _del_thingy($parent, $_, $self);
                        }
                } elsif ($sort eq 'C') {
                        my (@nodes, @users);
@@ -1807,10 +1828,10 @@ sub handle_92
                        }
                        # del users here
                        foreach my $r (@$dnodes) {
-                               push @rdel,_del_thingy($parent, [$r, 1]);
+                               push @rdel,_del_thingy($parent, [$r, 1], $self);
                        }
                        foreach my $r (@$dusers) {
-                               push @rdel,_del_thingy($parent, [$r, 0]);
+                               push @rdel,_del_thingy($parent, [$r, 0], $self);
                        }
 
                        # remember this last PC92C for rebroadcast on demand
@@ -1855,7 +1876,7 @@ sub find_pc9x_routes
        if ($ref->isa('Route::User')) {
                my $dxchan = DXChannel::get($to);
                push @parent, $to if $dxchan;
-               push @parent, @{$ref->parent};
+               push @parent, $ref->parents;
        } else {
                @parent = $to;
        }