135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

incorporated feedback

Browse Source
This commit is contained in:
Christian Ramseyer
2023-11-06 20:40:50 +01:00
parent 8f0434a75a
commit faea72827c
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/App/Netdisco/SSHCollector/Platform/FortiOS.pm
View File

@@ -35,9 +35,9 @@ Returns a list of hashrefs in the format C<< { mac => MACADDR, ip => IPADDR } >>
=cut =cut
our $prompt = qr/ [\$#] +$/; my $prompt = qr/ [\$#] +$/;
our $more_pattern = qr/--More--/; my $more_pattern = qr/--More--/;
our $timeout = 10; my $timeout = 10;
sub get_paginated_output { sub get_paginated_output {
my ($command, $expect) = @_; my ($command, $expect) = @_;
@@ -82,8 +82,10 @@ sub arpnip_context {
# 2.6.0.5 0 00:40:46:f9:63:0f PLAY-0400 # 2.6.0.5 0 00:40:46:f9:63:0f PLAY-0400
# 1.2.9.7 2 00:30:59:bc:f6:94 DEAD-3550 # 1.2.9.7 2 00:30:59:bc:f6:94 DEAD-3550
my $re_ipv4_arp = qr/^($RE{net}{IPv4})\s*\d+\s*($RE{net}{MAC})\s*\S+$/;
foreach (@data) { foreach (@data) {
if ($_ && /^($RE{net}{IPv4})\s*\d+\s*($RE{net}{MAC})\s*\S+$/) { #if (/^($RE{net}{IPv4})\s*\d+\s*($RE{net}{MAC})\s*\S+$/) {
if ($_ && /$re_ipv4_arp/) {
debug "\tfound IPv4: $1 => MAC: $2"; debug "\tfound IPv4: $1 => MAC: $2";
push(@$arpentries, { ip => $1, mac => $2 }); push(@$arpentries, { ip => $1, mac => $2 });
} }
@@ -102,8 +104,9 @@ sub arpnip_context {
# might fail with: Unknown action 0 - this is a permission issue of the logged in user # might fail with: Unknown action 0 - this is a permission issue of the logged in user
my $re_ipv6_arp = qr/^ifindex=\d+\s+ifname=\S+\s+($RE{net}{IPv6}{-sep => ':'}{-style => 'HeX'})\s+($RE{net}{MAC}).*$/;
foreach (@data) { foreach (@data) {
if ($_ && /^ifindex=\d+\s+ifname=\S+\s+($RE{net}{IPv6}{-sep => ':'}{-style => 'HeX'})\s+($RE{net}{MAC}).*$/) { if ($_ && /$re_ipv6_arp/) {
debug "\tfound IPv6: $1 => MAC: $2"; debug "\tfound IPv6: $1 => MAC: $2";
push(@$arpentries, { ip => $1, mac => $2 }); push(@$arpentries, { ip => $1, mac => $2 });
} }