send only to commandmode users that are addressed

[spider.git] / perl / Thingy.pm

diff --git a/perl/Thingy.pm b/perl/Thingy.pm
index 6ab36080596b931c8c4a671c41318537f15225ac..5d7909cca930df91cf19e3a45710a0caee0bd9a7 100644 (file)
--- a/perl/Thingy.pm
+++ b/perl/Thingy.pm
@@ -36,16 +36,19 @@ my $lastmin = time;
 
 use DXChannel;
 use DXDebug;
+use DXUtil;
+
 
 # we expect all thingies to be subclassed
 sub new
 {
        my $class = shift;
+       my $pkg = ref $class || $class;
        my $thing = {@_};
 
        $thing->{origin} ||= $main::mycall;
        
-       bless $thing, $class;
+       bless $thing, $pkg;
        return $thing;
 }
 
@@ -75,7 +78,7 @@ sub send
        # function must return true to make the send happen
        $sub = "before_send_$class";
        if ($thing->can($sub)) {
-               return $thing->$sub($dxchan);
+               return unless $thing->$sub($dxchan);
        }
        
        # generate the protocol line which may (or not) be cached
@@ -95,13 +98,34 @@ sub send
        }
 }
 
-# broadcast to all except @_
+# 
+# This is the main routing engine for the new protocol. Broadcast is a slight
+# misnomer, because if it thinks it can route it down one or interfaces, it will.
+# 
+# It handles anything it recognises as a callsign, sees if it can find it in a 
+# routing table, and if it does, then routes the message.
+#
+# If it can't then it will broadcast it.
+#
 sub broadcast
 {
        my $thing = shift;
        dbg("Thingy::broadcast: " . $thing->ascii) if isdbg('thing'); 
 
-       foreach my $dxchan (DXChannel::get_all()) {
+       my @dxchan;
+       my $to ||= $thing->{route}; 
+       $to     ||= $thing->{touser};
+       $to ||= $thing->{group};
+       if ($to && is_callsign($to) && (my $ref = Route::get($to))) {
+               dbg("Thingy::broadcast: routing for $to") if isdbg('thing');
+               @dxchan = $ref->alldxchan;
+       } else {
+               @dxchan = DXChannel::get_all();
+       }
+
+       dbg("Thingy::broadcast: offered " . join(',', map {$_->call} @dxchan)) if isdbg('thing');
+       
+       foreach my $dxchan (@dxchan) {
                next if $dxchan == $main::me;
                next if grep $dxchan == $_, @_;
                next if $dxchan->{call} eq $thing->{origin};
@@ -219,10 +243,12 @@ sub new_reply
        if ($thing->{group} eq $main::mycall) {
                $out = $thing->new;
                $out->{touser} = $thing->{user} if $thing->{user};
+               $out->{group} = $thing->{origin};
        } elsif (DXChannel::get($thing->{group})) {
                $out = $thing->new(user => $thing->{group});
                $out->{touser} = $thing->{user} if $thing->{user};
-       } elsif ($thing->{touser} && DXChannel->{$thing->{touser}}) {
+               $out->{group} = $thing->{origin};
+       } elsif ($thing->{touser} && DXChannel::get($thing->{touser})) {
                $out = $thing->new(user => $thing->{touser});
                $out->{group} = $thing->{group};
        }