From f5f527455ad6db659409bb5c3d51e6bc5350d84b Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 23 Apr 2021 23:06:34 +1000 Subject: [PATCH] Removed some hub configuration from filter.pl. Dependancies are installed in /usr/local/bin --- tools/filter.pl | 47 ++++------------------------------------------- 1 file changed, 4 insertions(+), 43 deletions(-) diff --git a/tools/filter.pl b/tools/filter.pl index 90deb25..d571d74 100755 --- a/tools/filter.pl +++ b/tools/filter.pl @@ -104,8 +104,7 @@ $FILTER_FROM = 'Hub Robot'; $SEMAFORE_DIR = '/fido/semafore'; @MY_POINTS = ( - '618:510/1.1', - '10:999/1.1' + '10:1/1.1' ); sub bounce @@ -166,33 +165,11 @@ sub testmsg_config if ($pktfrom =~ /^10:/) { $myaddr = '10:1/1'; # Robot address $testarea{'PVT_TEST'} = 1; # Echobase is exists - $testarea{'DOVE-OPS'} = 1; # Echobase is exists if ($DEBUG_MODE) { w_log('1',"filter.pl: testmail_config: PRIVATE NET source using [$myaddr]"); } - } elsif ($pktfrom =~ /^21:/) { - $myaddr = '21:3/100'; - $testarea{'FSX_TST'} = 1; - - } elsif ($pktfrom =~ /^24:/) { - $myaddr = '24:24/1'; - $testarea{'SN_CHAT'} = 1; - - } elsif ($pktfrom =~ /^516:/) { - $myaddr = '516:516/0'; - $testarea{'VTX_TEST'} = 1; - - } elsif ($pktfrom =~ /^618:/) { - $myaddr = '618:510/1'; - $testarea{'MIN_R15TEST'} = 1; - $testarea{'MIN_TEST'} = 1; - - } elsif ($pktfrom =~ /^1337:/) { - $myaddr = '1337:2/100'; - $testarea{'TQW_TEST'} = 1; - } else { w_log('1',"filter.pl: testmail_config: DEFAULT packet source ($pktfrom) using default [$config{addr}[0]]"); @@ -210,22 +187,6 @@ sub route_config $check_exists = 1; $myaddr = '10:1/1'; - } elsif ($toaddr =~ /^21:3\//) { - $check_exists = 1; - $myaddr = '21:3/100'; - - } elsif ($toaddr =~ /^24:/) { - $check_exists = 1; - $myaddr = '24:24/1'; - - } elsif ($toaddr =~ /^618:510\//) { - $check_exists = 1; - $myaddr = '618:510/1'; - - } elsif ($toaddr =~ /^1337:2\//) { - $check_exists = 1; - $myaddr = '1337:2/100'; - } else { w_log('1',"filter.pl: route_config: DEFAULT packet toddr ($toaddr) using default [$config{addr}[0]]"); $check_exists = 0; @@ -245,9 +206,9 @@ sub add_tz } BEGIN{ - require "/usr/local/tools/filters/filter-testmsg.pl"; - require "/usr/local/tools/filters/filter-hub.pl"; - require "/usr/local/tools/filters/filter-route.pl"; + require "/usr/local/bin/filter-testmsg.pl"; + require "/usr/local/bin/filter-hub.pl"; + require "/usr/local/bin/filter-route.pl"; } sub filter