5. fix talkmode so that it only does 'via' PC10s when it really needs to.

6. SEND now displays a message if you try to do it in not prompt mode.
7. stopped a few more things being done by rcmd (eg send, talk, ann, dx)

diff --git a/Changes b/Changes
index 441d9623f1d5a2cc614ed24bf1f3be908ebe0480..83531b0e189eca5eaac5fd5102239093cf27ee71 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,11 @@
+30Jul00=======================================================================
+1. Added talk mode so that I don't have to keep typing T <call> all the time.
+2. fiddled around with storing of Debug messages a bit more.
+3. bomb proofed the type command.
+4. started the objectifying for talk, dx and announcements.
+5. fix talkmode so that it only does 'via' PC10s when it really needs to.
+6. SEND now displays a message if you try to do it in not prompt mode.
+7. stopped a few more things being done by rcmd (eg send, talk, ann, dx)
 29Jul00=======================================================================
 1. added forward/latlong which will forward ALL the users that have a latitude
 and longitude set on them to one or more locally connected nodes - with a hop
@@ -6,9 +14,6 @@ count of 1.
 sequentially reading the data directly and only 'get'ting the ones that are
 nodes.
 3. did the same for show/isolate and show/lockout.
-4. Added talk mode so that I don't have to keep typing T <call> all the time.
-5. fiddled around with storing of Debug messages a bit more.
-6. bomb proofed the type command.
 28Jul00=======================================================================
 1. fixed watchdbg midnight rollover loop and removed the date part of the 
 date/time translation to leave just the time.

diff --git a/cmd/Commands_en.hlp b/cmd/Commands_en.hlp
index 47645f9e508cd158da5de6c6e067d28338943c0b..77025c1a9b6517524071767a105517f0964e82e4 100644 (file)
--- a/cmd/Commands_en.hlp
+++ b/cmd/Commands_en.hlp
@@ -446,9 +446,13 @@ SP is an alias for SEND PRIVATE
 === 0^SET/ANNOUNCE^Allow announce messages to come out on your terminal
 === 0^UNSET/ANNOUNCE^Stop announce messages coming out on your terminal
 
+=== 5^SET/ARCLUSTER <call> [<call>..]^Make the callsign an AR-Cluster node
+
 === 0^SET/BEEP^Add a beep to DX and other messages on your terminal
 === 0^UNSET/BEEP^Stop beeps for DX and other messages on your terminal
 
+=== 5^SET/CLX <call> [<call>..]^Make the callsign an CLX node
+
 === 9^SET/DEBUG <name>^Add a debug level to the debug set
 === 9^UNSET/DEBUG <name>^Remove a debug level from the debug set
 
@@ -463,6 +467,8 @@ of a DX announcement (there is just enough room). Some user programs
 cannot cope with this. You can use this command to reset (or set)
 this feature.
 
+=== 5^SET/DXNET <call> [<call>..]^Make the callsign an DXNet node
+
 === 0^SET/ECHO^Make the cluster echo your input
 === 0^UNSET/ECHO^Stop the cluster echoing your input
 If you are connected via a telnet session, different implimentations
@@ -514,11 +520,11 @@ then this command will set your QRA locator for you. For example:-
 Tell the system what your name is eg:-
   SET/NAME Dirk
 
-=== 9^SET/NODE <call> [<call>..]^Make the callsign an AK1A cluster
+=== 5^SET/NODE <call> [<call>..]^Make the callsign an AK1A cluster
 Tell the system that the call(s) are to be treated as AK1A cluster and
 fed PC Protocol rather normal user commands.
 
-=== 9^SET/OBSCOUNT <count> <nodecall>^Set the 'pump-up' obscelence counter 
+=== 8^SET/OBSCOUNT <count> <nodecall>^Set the 'pump-up' obscelence counter 
 From 1.35 onwards neighbouring nodes are pinged at regular intervals (see
 SET/PINGINTERVAL), usually 300 seconds or 5 minutes. There is a 'pump-up'
 counter which is decremented on every outgoing ping and then reset to
@@ -575,7 +581,7 @@ can contain any characters but any spaces are removed (you can type in
 spaces - but they won't appear in the password). You can see the
 result with STAT/USER.
 
-=== 9^SET/SPIDER <call> [<call>..]^Make the callsign an DXSpider node
+=== 5^SET/SPIDER <call> [<call>..]^Make the callsign an DXSpider node
 Tell the system that the call(s) are to be treated as DXSpider node and
 fed new style DX Protocol rather normal user commands.
 

diff --git a/cmd/announce.pl b/cmd/announce.pl
index 94b03a473009da82db0e89a8345df4a55f316c84..494cd9ddfaa3c9c5179d418ea21b5c38e9c321e9 100644 (file)
--- a/cmd/announce.pl
+++ b/cmd/announce.pl
@@ -17,7 +17,7 @@
 
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
-
+return (1, $self->msg('e5')) if $self->remotecmd;
 return (1, $self->msg('e9')) if !@f;
 
 my $sort = uc $f[0];

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 2ea40672ad044dbb8b3e7a468b0d4090f9516a5e..75ba77dc866e8a0152d918a1ce514a9c6660186a 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -15,6 +15,7 @@ my $spotted;
 my $freq;
 my @out;
 my $valid = 0;
+return (1, $self->msg('e5')) if $self->remotecmd;
 
 # do we have at least two args?
 return (1, $self->msg('dx2')) unless @f >= 2;

diff --git a/cmd/rcmd.pl b/cmd/rcmd.pl
index 396cd45b68ae80df2b6b58f9011bfa4f102db630..8afb5b4586383d0d089e71b51a4f170f73fe49eb 100644 (file)
--- a/cmd/rcmd.pl
+++ b/cmd/rcmd.pl
@@ -9,6 +9,7 @@
 my $self = shift;
 my $line = shift; 
 my ($call) = $line =~ /^\s*(\S+)/;
+return (1, $self->msg('e5')) if $self->remotecmd;
 
 # are we permitted?
 return (1, $self->msg('e5')) if $self->priv < 6;

diff --git a/cmd/send.pl b/cmd/send.pl
index f6f9e40f762550bb5b9b0ef911860e8827abebce..a0a64ffad79713eda70783b4b199c2f1b9980352 100644 (file)
--- a/cmd/send.pl
+++ b/cmd/send.pl
@@ -146,6 +146,8 @@ if ($self->state eq "prompt") {
        $self->func("DXMsg::do_send_stuff");
        $self->state('send1');
        push @out, $self->msg('m1');
+} else {
+       push @out, $self->msg('m17', $self->state);
 }
 
 return (1, @out);

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 9cdd1c58bde99deeca39e9a488dd3194e24b9345..1f6d155158dc7e3e48437bb0b553fe2cdefe32ca 100644 (file)
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -12,6 +12,7 @@ my $via;
 my $line;
 my $from = $self->call;
 my @out;
+return (1, $self->msg('e5')) if $self->remotecmd;
 
 # analyse the line there are four situations...
 # 1) talk call
@@ -39,7 +40,8 @@ return (1, $self->msg('e7', $call)) unless $dxchan;
 if ($line) {
        $dxchan->talk($self->call, $to, $via, $line) if $dxchan;
 } else {
-       my $s = "$to>" . $dxchan->call;
+       my $s = $to;
+       $s .= ">$via" if $via;
        my $ref = $self->talklist;
        if ($ref) {
                unless (grep { $_ eq $s } @$ref) {