diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/config.pm.dist | 11 | ||||
| -rw-r--r-- | include/nms.pm | 8 |
2 files changed, 11 insertions, 8 deletions
diff --git a/include/config.pm.dist b/include/config.pm.dist index 29e319b..cefb5a0 100755 --- a/include/config.pm.dist +++ b/include/config.pm.dist @@ -4,26 +4,27 @@ use warnings; use DBI; package nms::config; -# Make a duplicate of this file, and save as 'config.local.pm' - our $db_name = "nms"; our $db_host = "frank.tg14.gathering.org"; our $db_username = "nms"; our $db_password = "<removed>"; our $dhcp_server1 = "151.216.254.2"; -our $dhcp_server2 = "151.216.253.17"; # Cisco ISE profiling +our $dhcp_server2 = "151.216.253.19"; # Cisco ISE profiling -our $ios_user = "nms"; +our $ios_user = "dlinkng"; # used by dlink-ng +++ our $ios_pass = "<removed>"; # Tech:Net sets up at least a read-community for SNMP for use # with dlink1g, nms and sosuch. This is the one: our $snmp_community = "<removed>"; -our $dlink1g_user = 'dlinkng'; +our $dlink1g_user = 'dlinkng'; # used by nms.pm to connect to D-Link-switches our $dlink1g_passwd = '<removed>'; +# Telnet-timeout for smanagrun +our $telnet_timeout = 30; + # No longer in use as of '12 ? # our $telegw_ip = "12.34.56.78"; # our @telegw_wanlinks = ("gig1/1", "gig1/2"); diff --git a/include/nms.pm b/include/nms.pm index af7702d..e93f7d0 100644 --- a/include/nms.pm +++ b/include/nms.pm @@ -111,7 +111,9 @@ sub switch_disconnect { } sub snmp_open_session { - my ($ip, $community) = @_; + my ($ip, $community, $async) = @_; + + $async //= 0; my %options = (UseEnums => 1); if ($ip =~ /:/) { @@ -141,10 +143,10 @@ sub snmp_open_session { } my $session = SNMP::Session->new(%options); - if (defined($session) && defined($session->getnext('sysDescr'))) { + if (defined($session) && ($async || defined($session->getnext('sysDescr')))) { return $session; } else { - die 'Could not open SNMP session'; + die 'Could not open SNMP session to ' . $ip; } } |