add in last config time

[spider.git] / perl / Aranea.pm

diff --git a/perl/Aranea.pm b/perl/Aranea.pm
index f4d9a1ec1a33af09c959304c67e8e2ff0b2007d8..787fc5389986f01c869d75b1bc91222c6a0da8e3 100644 (file)
--- a/perl/Aranea.pm
+++ b/perl/Aranea.pm
@@ -25,7 +25,12 @@ use Script;
 use Verify;
 use DXDupe;
 use Thingy;
+use Thingy::Rt;
+use Thingy::Hello;
+use Thingy::Bye;
 use RouteDB;
+use DXProt;
+use DXCommandmode;
 
 use vars qw($VERSION $BRANCH);
 
@@ -54,7 +59,6 @@ sub new
        # add this node to the table, the values get filled in later
        my $pkg = shift;
        my $call = shift;
-       $main::routeroot->add($call, '5251', Route::here(1)) if $call ne $main::mycall;
        $self->{'sort'} = 'W';
        return $self;
 }
@@ -68,7 +72,7 @@ sub start
        # log it
        my $host = $self->{conn}->{peerhost} || "unknown";
        Log('Aranea', "$call connected from $host");
-       
+
        # remember type of connection
        $self->{consort} = $line;
        $self->{outbound} = $sort eq 'O';
@@ -116,6 +120,13 @@ sub start
        # send info to all logged in thingies
        $self->tell_login('loginn');
 
+       # broadcast our configuration to the world
+       unless ($self->{outbound}) {
+               my $thing = Thingy::Rt->new_cf;
+               $thing->broadcast;
+               $self->lastcf($main::systime);
+       }
+       
        # run a script send the output to the debug file
        my $script = new Script(lc $call) || new Script('node_default');
        $script->run($self) if $script;
@@ -152,9 +163,12 @@ sub disconnect
        my $call = $self->call;
 
        return if $self->{disconnecting}++;
-       
+
+       my $thing = Thingy::Bye->new(origin=>$main::mycall, user=>$call);
+       $thing->broadcast($self);
+
        # get rid of any PC16/17/19
-#      eph_del_regex("^PC1[679]*$call");
+       DXProt::eph_del_regex("^PC1[679]*$call");
 
        # do routing stuff, remove me from routing table
        my $node = Route::Node::get($call);
@@ -165,7 +179,7 @@ sub disconnect
                # and all my ephemera as well
                for (@rout) {
                        my $c = $_->call;
-#                      eph_del_regex("^PC1[679].*$c");
+                       DXProt::eph_del_regex("^PC1[679].*$c");
                }
        }
 
@@ -176,7 +190,7 @@ sub disconnect
        $mref->stop_msg($call) if $mref;
        
        # broadcast to all other nodes that all the nodes connected to via me are gone
-#      $self->route_pc21($main::mycall, undef, @rout) if @rout;
+       DXProt::route_pc21($self, $main::mycall, undef, @rout) if @rout;
 
        # remove outstanding pings
 #      delete $pings{$call};
@@ -270,16 +284,20 @@ sub tdecode
 sub genmsg
 {
        my $thing = shift;
-       my $name = shift;
+       my $list = ref $_[0] ? shift : \@_;
+       my ($name) = uc ref $thing;
+       $name =~ /::(\w+)$/;
+       $name = $1;
        my $head = genheader($thing->{origin}, 
                                                 ($thing->{group} || $thing->{touser} || $thing->{tonode}),
                                                 ($thing->{user} || $thing->{fromuser} || $thing->{fromnode})
                                                );
-       my $data = "$name,";
-       while (@_) {
-               my $k = lc shift;
-               my $v = tencode(shift);
-               $data .= "$k=$v,";
+        
+       my $data = uc $name . ',';
+       while (@$list) {
+               my $k = lc shift @$list;
+               my $v = $thing->{$k};
+               $data .= "$k=" . tencode($v) . ',' if defined $v;
        }
        chop $data;
        return "$head|$data";
@@ -309,7 +327,8 @@ sub input
        $err .= "missing cmd or data," unless $cmd && $data;
        $err .= "invalid command ($cmd)," unless $cmd =~ /^[A-Z][A-Z0-9]*$/;
        my ($gp, $tus) = split /:/, $group, 2 if $group;
-               
+
+       $err .= "from me," if $origin eq $main::mycall;
        $err .= "invalid group ($gp)," if $gp && $gp !~ /^[A-Z0-9]{2,}$/;
        $err .= "invalid tocall ($tus)," if $tus && !is_callsign($tus);
        $err .= "invalid fromcall ($user)," if $user && !is_callsign($user);