tried to sort out last in

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 5bda044a045644a3a8687c2ff4e36828c9958bec..ce9b13a4b077c61cd0c8568784f768061f992081 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -116,8 +116,9 @@ sub start
        $self->{wwvfilter} = Filter::read_in('wwv', $call);
        $self->{annfilter} = Filter::read_in('ann', $call);
        
-       # set unbuffered
+       # set unbuffered and no echo
        $self->send_now('B',"0");
+       $self->send_now('E',"0");
        
        # send initialisation string
        if (!$self->{outbound}) {
@@ -325,7 +326,7 @@ sub normal
                                $user = DXUser->new($call) if !$user;
                                $user->homenode($node->call) if !$user->homenode;
                                $user->node($node->call);
-                               $user->lastin($main::systime);
+                               $user->lastin($main::systime) unless DXChannel->get($call);
                                $user->put;
                        }
                        
@@ -378,7 +379,7 @@ sub normal
                                        $user->homenode($call);
                                        $user->node($call);
                                }
-                               $user->lastin($main::systime);
+                               $user->lastin($main::systime) unless DXChannel->get($call);
                                $user->put;
                        }
                        
@@ -735,10 +736,14 @@ sub send_dx_spot
                                $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
                                
                        }
-               } elsif ($dxchan->is_user) {
+               } elsif ($dxchan->is_user && $dxchan->{dx}) {
                        my $buf = Spot::formatb($_[0], $_[1], $_[2], $_[3], $_[4]);
-                       $buf .= "\a\a" if $dxchan->beep;
-                       $dxchan->send($buf) if !$hops || ($hops && $filter);
+                       $buf .= "\a\a" if $dxchan->{beep};
+                       if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+                               $dxchan->send($buf) if !$hops || ($hops && $filter);
+                       } else {
+                               $dxchan->delay($buf) if !$hops || ($hops && $filter);
+                       }
                }                                       
        }
 }