perltidy
This commit is contained in:
		| @@ -3,21 +3,21 @@ | ||||
| # | ||||
| # Copyright (c) 2008 Max Baker | ||||
| # All rights reserved. | ||||
| #  | ||||
| # Redistribution and use in source and binary forms, with or without  | ||||
| # | ||||
| # Redistribution and use in source and binary forms, with or without | ||||
| # modification, are permitted provided that the following conditions are met: | ||||
| #  | ||||
| # | ||||
| #     * Redistributions of source code must retain the above copyright notice, | ||||
| #       this list of conditions and the following disclaimer. | ||||
| #     * Redistributions in binary form must reproduce the above copyright | ||||
| #       notice, this list of conditions and the following disclaimer in the | ||||
| #       documentation and/or other materials provided with the distribution. | ||||
| #     * Neither the name of the University of California, Santa Cruz nor the  | ||||
| #       names of its contributors may be used to endorse or promote products  | ||||
| #     * Neither the name of the University of California, Santa Cruz nor the | ||||
| #       names of its contributors may be used to endorse or promote products | ||||
| #       derived from this software without specific prior written permission. | ||||
| #  | ||||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  | ||||
| # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE   | ||||
| # | ||||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||||
| # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||||
| # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||||
| # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||||
| # LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||||
| @@ -34,7 +34,7 @@ use strict; | ||||
| use Exporter; | ||||
| use SNMP::Info::Layer2; | ||||
|  | ||||
| @SNMP::Info::Layer2::ZyXEL_DSLAM::ISA = qw/SNMP::Info::Layer2 Exporter/; | ||||
| @SNMP::Info::Layer2::ZyXEL_DSLAM::ISA       = qw/SNMP::Info::Layer2 Exporter/; | ||||
| @SNMP::Info::Layer2::ZyXEL_DSLAM::EXPORT_OK = qw//; | ||||
|  | ||||
| use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; | ||||
| @@ -42,27 +42,22 @@ use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; | ||||
| $VERSION = '1.09'; | ||||
|  | ||||
| # Set for No CDP | ||||
| %GLOBALS = ( | ||||
|             %SNMP::Info::Layer2::GLOBALS | ||||
|             ); | ||||
| %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS ); | ||||
|  | ||||
| %FUNCS   = (%SNMP::Info::Layer2::FUNCS, | ||||
|             'ip_adresses' => 'ipAdEntAddr', | ||||
|             'i_name'	  => 'ifDescr', | ||||
|             'i_description' => 'adslLineConfProfile', | ||||
|            ); | ||||
| %FUNCS = ( | ||||
|     %SNMP::Info::Layer2::FUNCS, | ||||
|     'ip_adresses'   => 'ipAdEntAddr', | ||||
|     'i_name'        => 'ifDescr', | ||||
|     'i_description' => 'adslLineConfProfile', | ||||
| ); | ||||
|  | ||||
| %MIBS    = ( | ||||
|             %SNMP::Info::Layer2::MIBS, | ||||
|             'ADSL-LINE-MIB' => 'adslLineConfProfile' | ||||
|            ); | ||||
|  | ||||
| %MUNGE   = (%SNMP::Info::Layer2::MUNGE | ||||
|            ); | ||||
| %MIBS | ||||
|     = ( %SNMP::Info::Layer2::MIBS, 'ADSL-LINE-MIB' => 'adslLineConfProfile' ); | ||||
|  | ||||
| %MUNGE = ( %SNMP::Info::Layer2::MUNGE ); | ||||
|  | ||||
| sub layers { | ||||
|     my $zyxel = shift; | ||||
|     my $zyxel  = shift; | ||||
|     my $layers = $zyxel->layers(); | ||||
|     return $layers if defined $layers; | ||||
|  | ||||
| @@ -81,8 +76,8 @@ sub os { | ||||
| sub os_ver { | ||||
|     my $zyxel = shift; | ||||
|     my $descr = $zyxel->description(); | ||||
|      | ||||
|     if ($descr =~ m/version (\S+) /){ | ||||
|  | ||||
|     if ( $descr =~ m/version (\S+) / ) { | ||||
|         return $1; | ||||
|     } | ||||
|     return; | ||||
| @@ -93,21 +88,24 @@ sub model { | ||||
|  | ||||
|     my $desc = $zyxel->description(); | ||||
|  | ||||
|     if ($desc =~ /8-port ADSL Module\(Annex A\)/){ | ||||
|     if ( $desc =~ /8-port ADSL Module\(Annex A\)/ ) { | ||||
|         return "AAM1008-61"; | ||||
|     } elsif ($desc =~ /8-port ADSL Module\(Annex B\)/){ | ||||
|     } | ||||
|     elsif ( $desc =~ /8-port ADSL Module\(Annex B\)/ ) { | ||||
|         return "AAM1008-63"; | ||||
|     } | ||||
|     return; | ||||
| } | ||||
|  | ||||
| sub ip{ | ||||
|     my $zyxel = shift; | ||||
| sub ip { | ||||
|     my $zyxel   = shift; | ||||
|     my $ip_hash = $zyxel->ip_addresses(); | ||||
|     my $found_ip; | ||||
|      | ||||
|     foreach my $ip (keys %{$ip_hash}) { | ||||
|         $found_ip = $ip if (defined $ip and $ip =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/); | ||||
|  | ||||
|     foreach my $ip ( keys %{$ip_hash} ) { | ||||
|         $found_ip = $ip | ||||
|             if ( defined $ip | ||||
|             and $ip =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/ ); | ||||
|     } | ||||
|     return $found_ip; | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Eric Miller
					Eric Miller