prevent merges to myself

diff --git a/Changes b/Changes
index 3fd33ec3a67d6e9e49a024ac6b2f7cc89b1345b5..af94cb67249f9d57f450d7a8e0782e462b9348bb 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+20Jun99=======================================================================
+1. prevented a merge to myself (causes a loop)
 18Jun99=======================================================================
 1. fixed a problem with DXLogPrint repeating log entries.
 2. altered the permissions on disconnnect so that priv 5 users can disconnect

diff --git a/cmd/merge.pl b/cmd/merge.pl
index 412ddccfe8ffd02a0eb7095a000567b7269c656f..a4370e082e5f9eecf8028a70268c7b4a6a08bd04 100644 (file)
--- a/cmd/merge.pl
+++ b/cmd/merge.pl
@@ -12,6 +12,7 @@ my @f = split /\s+/, $line;
 # check for callsign
 return (1, $self->msg('e5')) if $self->priv < 5;
 return (1, $self->msg('e12')) if !$f[0];
+return (1, $self->msg('e11')) if $call eq $main::mycall;
 
 my $call = uc $f[0];
 my $ref = DXCluster->get_exact($call);

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 4cf7db7fae76c184b2f3b38e61bac3356a048d90..4349b87c506e4fb5a058a1b6874a803e34de92c3 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -545,6 +545,10 @@ sub normal
                                route($field[1], $line);
                                return;
                        }
+                       if ($field[2] eq $main::mycall) {
+                               dbg('chan', "Trying to merge to myself, ignored");
+                               return;
+                       }
 
                        Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[1]");
                        

diff --git a/perl/Messages b/perl/Messages
index 956778bf7f7e6852204600fd742d8a6cd0ffe41f..f1e7a954f7bbb3dd31f023836d1e162ceb27ee5a 100644 (file)
--- a/perl/Messages
+++ b/perl/Messages
@@ -39,6 +39,7 @@ package DXM;
                                e8 => 'Need a callsign and some text',
                                e9 => 'Need at least some text',
                                e10 => '$_[0] not connected locally',
+                               e11 => 'Can\'t use $main:mycall as target',
                                e12 => 'Need a node callsign',
                                e13 => '$_[0] is not a node',
                                emaile1 => 'Please enter your email address, set/email <your e-mail address>',