File mrtg-git-fafab1227ff9a4bd5e04a51d3aae8f261a220f... of Package mrtg

Overview Repositories Revisions Requests Users Attributes Meta

File mrtg-git-fafab1227ff9a4bd5e04a51d3aae8f261a220f61.patch of Package mrtg (Revision d142f9225acf2dcae41bf65c4aa1f952)

Currently displaying revision d142f9225acf2dcae41bf65c4aa1f952 , Show latest

commit fafab1227ff9a4bd5e04a51d3aae8f261a220f61
Author: Tobias Oetiker <tobi@oetiker.ch>
Date:   Mon Mar 31 20:44:10 2014 +0000

some further un-initialized checks

diff --git a/src/bin/cfgmaker b/src/bin/cfgmaker
index d9568df..902e24e 100755
--- a/src/bin/cfgmaker
+++ b/src/bin/cfgmaker
@@ -616,16 +616,16 @@ ECHO
 		    $$i{ifSpeed} = $$router_opt{'zero-speed'};
 		}
 
-                if (not $$i{ifSpeed} and $$router_dev{Vendor} eq 'foundry' and $$i{ifType} == 194) {
+                if (not $$i{ifSpeed} and $$router_dev{Vendor} eq 'foundry' and $$i{ifType} and $$i{ifType} == 194) {
                     # foundry ATM subinterfaces always report 0 speed, make it 155Mbps instead.
                     $$i{ifSpeed} =  155000000;
-                } elsif (not $$i{ifSpeed} and $$router_dev{Vendor} eq 'foundry' and $$i{ifType} == 135) {
+                } elsif (not $$i{ifSpeed} and $$router_dev{Vendor} eq 'foundry' and $$i{ifType} and $$i{ifType} == 135) {
                     # Foundry virtual Ethernet interfaces always report 0 speed, make it 1GB instead.
                     $$i{ifSpeed} = 1000000000;
-                } elsif (not $$i{ifSpeed} and $$router_dev{Vendor} eq 'cisco' and $$i{sysDescr} =~ /FWSM-Firewall / )  {
+                } elsif (not $$i{ifSpeed} and $$router_dev{Vendor} eq 'cisco' and $$i{sysDescr} and $$i{sysDescr} =~ /FWSM-Firewall / )  {
                     # Cisco PIX Firewall Switch Modules have effective backplane speed of 600 Megs
 		    $$i{ifSpeed} = 600000000;
-                } elsif (not $$i{ifSpeed} and $$router_dev{Vendor} eq '3com' and $$i{Descr} =~ /RMON VLAN (\d+)/ ) {
+                } elsif (not $$i{ifSpeed} and $$router_dev{Vendor} eq '3com' and $$i{Descr} and $$i{Descr} =~ /RMON VLAN (\d+)/ ) {
                     $$i{ifSpeed} = 100000000;
                     $if_vlan_id = $1;
                 } elsif (not $$i{ifSpeed}) {

Places

File mrtg-git-fafab1227ff9a4bd5e04a51d3aae8f261a220f61.patch of Package mrtg (Revision d142f9225acf2dcae41bf65c4aa1f952)

Places