fix: Try to keep disabled vpn interface on windows

g-bougard · g-bougard · commit cbf9e3f4445a · 2024-10-11T19:07:40.000+02:00
diff --git a/Changes b/Changes
@@ -11,6 +11,8 @@ core:
 
 inventory:
 * Fix rare windows perl error during drives, ipv6 network or videos inventory
+* Always keep disabled network interface on windows if it includes "vpn" string
+  in description
 
 netdiscovery/netinventory:
 * fix #768: Added Aerohive devices support
diff --git a/lib/GLPI/Agent/Tools/Win32/NetAdapter.pm b/lib/GLPI/Agent/Tools/Win32/NetAdapter.pm
@@ -28,7 +28,7 @@ sub getInterfaces {
 
     return $self->getInterfacesWithAddresses() if $self->hasAddresses();
 
-    return unless $self->{_config}->{MACADDR};
+    return unless $self->{_config}->{MACADDR} || $self->_getDescription() =~ /vpn/i;
 
     return $self->getBaseInterface();
 }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ sub getInterfaces {`
`28`	`28`
`29`	`29`	`return $self->getInterfacesWithAddresses() if $self->hasAddresses();`
`30`	`30`
`31`		`- return unless $self->{_config}->{MACADDR};`
	`31`	`+ return unless $self->{_config}->{MACADDR} \|\| $self->_getDescription() =~ /vpn/i;`
`32`	`32`
`33`	`33`	`return $self->getBaseInterface();`
`34`	`34`	`}`