fix: FreeBSD variants (#4661)

Restore them to one file, improve unit tests by adding FreeBSD to the string
librenms · Sep 29, 2016 · 714d294 · 714d294
1 parent a8037d9
commit 714d294
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 19 deletions.
diff --git a/includes/discovery/os/freebsd.inc.php b/includes/discovery/os/freebsd.inc.php
@@ -1,5 +1,12 @@
 <?php
 
-if (str_contains($sysDescr, 'FreeBSD')) {
+// FreeBSD variants, check for specialized distros first
+if (str_contains($sysDescr, 'pfSense')) {
+    $os = 'pfsense';
+} elseif (str_contains($sysDescr, 'Voswall')) {
+    $os = 'voswall';
+} elseif (str_contains($sysDescr, 'm0n0wall')) {
+    $os = 'monowall';
+} elseif (str_contains($sysDescr, 'FreeBSD')) {
     $os = 'freebsd';
 }
diff --git a/includes/discovery/os/monowall.inc.php b/includes/discovery/os/monowall.inc.php
diff --git a/includes/discovery/os/pfsense.inc.php b/includes/discovery/os/pfsense.inc.php
diff --git a/includes/discovery/os/voswall.inc.php b/includes/discovery/os/voswall.inc.php
diff --git a/tests/snmpsim/monowall.snmprec b/tests/snmpsim/monowall.snmprec
@@ -1 +1 @@
-1.3.6.1.2.1.1.1.0|4|m0n0wall
+1.3.6.1.2.1.1.1.0|4|m0n0wall FreeBSD
diff --git a/tests/snmpsim/pfsense.snmprec b/tests/snmpsim/pfsense.snmprec
@@ -1 +1,2 @@
-1.3.6.1.2.1.1.1.0|4|pfSense
+1.3.6.1.2.1.1.1.0|4|pfSense 2.3.2-RELEASE pfSense FreeBSD 10.3-RELEASE-p5 amd64
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.12325.1.1.2.1.1
diff --git a/tests/snmpsim/voswall.snmprec b/tests/snmpsim/voswall.snmprec
@@ -1 +1 @@
-1.3.6.1.2.1.1.1.0|4|Voswall
+1.3.6.1.2.1.1.1.0|4|Voswall FreeBSD