From: ivan <ivan>
Date: Tue, 1 Mar 2011 18:38:57 +0000 (+0000)
Subject: get serviceids from torrus config + our torrus_srvderive table, not from srvexport
X-Git-Tag: freeside_2_3_0~537
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=4ac0d2e3a22e4e49a593aaf683754fea75fce546

get serviceids from torrus config + our torrus_srvderive table, not from srvexport
---

diff --git a/FS/FS/NetworkMonitoringSystem/Torrus_Internal.pm b/FS/FS/NetworkMonitoringSystem/Torrus_Internal.pm
index 8f00312fb..dc6cb8f93 100644
--- a/FS/FS/NetworkMonitoringSystem/Torrus_Internal.pm
+++ b/FS/FS/NetworkMonitoringSystem/Torrus_Internal.pm
@@ -83,7 +83,6 @@ sub all_router_serviceids {
   foreach my $host ( @hosts ) {
     my $param = $host->{param};
     if($param && $param->{'snmp-host'} 
-              && (!$router || $param->{'snmp-host'}->{'value'} eq $router)
               && $param->{'RFC2863_IF_MIB::external-serviceid'}) {
       my $serviceids =
         $param->{'RFC2863_IF_MIB::external-serviceid'}->{'content'};