From 1f1385fe9e70e3609c2fdd6fe63a285d7a21e482 Mon Sep 17 00:00:00 2001
From: minima <minima>
Date: Fri, 18 Feb 2005 22:14:33 +0000
Subject: [PATCH] removed DX and RT from groups

---
 perl/AMsg.pm         | 2 +-
 perl/Aranea.pm       | 3 ++-
 perl/Thingy/Hello.pm | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/perl/AMsg.pm b/perl/AMsg.pm
index 0a26bde2..0b94c15d 100644
--- 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]+$//;
-				if ($msg =~ m{RT,[0-9A-F,]+|HELLO}) {
+				if ($msg =~ m{|HELLO,}) {
 					# a possibly valid HELLO line, process it
 					$conn->new_channel($msg);
 				}
diff --git a/perl/Aranea.pm b/perl/Aranea.pm
index e90a2a45..7973e625 100644
--- 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
-		$head = join(',', $origin, $group, $dts, ++$hop);
+		$head = join(',', $origin, $dts, ++$hop);
+		$head .= ",$group" if $group;
 		$head .= ",$user" if $user;
 		$thing->{Aranea} = "$head|$data";
 
diff --git a/perl/Thingy/Hello.pm b/perl/Thingy/Hello.pm
index 63b352b4..9c1e3080 100644
--- a/perl/Thingy/Hello.pm
+++ b/perl/Thingy/Hello.pm
@@ -78,7 +78,7 @@ sub handle
 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;
-- 
2.34.1