removed DX and RT from groups

diff --git a/perl/AMsg.pm b/perl/AMsg.pm
index 0a26bde217a87e46e23b13da6922dc195efcc3db..0b94c15d4bfc48a2d810b030919255dc6b208b56 100644 (file)
--- a/perl/AMsg.pm
+++ b/perl/AMsg.pm
@@ -71,7 +71,7 @@ sub dequeue
                                # this is the first stage that we have a callsign
                                # do we have a hello?
                                $msg =~ s/[\r\n]+$//;
                                # this is the first stage that we have a callsign
                                # do we have a hello?
                                $msg =~ s/[\r\n]+$//;

-                               if ($msg =~ m{RT,[0-9A-F,]+|HELLO}) {
+                               if ($msg =~ m{|HELLO,}) {

                                        # a possibly valid HELLO line, process it
                                        $conn->new_channel($msg);
                                }
                                        # a possibly valid HELLO line, process it
                                        $conn->new_channel($msg);
                                }

diff --git a/perl/Aranea.pm b/perl/Aranea.pm
index e90a2a4505e8f6e163df3b4248bc45034fb6702d..7973e6256ccb9b9cb29eee0d71f16dd877676a6d 100644 (file)
--- a/perl/Aranea.pm
+++ b/perl/Aranea.pm
@@ -313,7 +313,8 @@ sub input
                $thing = $class->new();
 
                # reconstitute the header but wth hop increased by one
                $thing = $class->new();
 
                # reconstitute the header but wth hop increased by one

-               $head = join(',', $origin, $group, $dts, ++$hop);
+               $head = join(',', $origin, $dts, ++$hop);
+               $head .= ",$group" if $group;

                $head .= ",$user" if $user;
                $thing->{Aranea} = "$head|$data";
 
                $head .= ",$user" if $user;
                $thing->{Aranea} = "$head|$data";
 

diff --git a/perl/Thingy/Hello.pm b/perl/Thingy/Hello.pm
index 63b352b4f06dcc3bd0474859fbbfeffa6344f3ad..9c1e30804fedac8caee24e48a27b03d9fb854e57 100644 (file)
--- a/perl/Thingy/Hello.pm
+++ b/perl/Thingy/Hello.pm
@@ -78,7 +78,7 @@ sub handle
 sub new
 {
        my $pkg = shift;
 sub new
 {
        my $pkg = shift;

-       my $thing = $pkg->SUPER::new(origin=>$main::mycall, group=>'RT');
+       my $thing = $pkg->SUPER::new(origin=>$main::mycall);

        return $thing;
 }
 1;
        return $thing;
 }
 1;