Autres/RaspAP
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-07-08 18:47:40 +02:00
Code Issues Releases Wiki Activity

Update getConnectionType() regexes to match MAC-derived names

Browse Source
This commit is contained in:
billz 2025-03-23 10:52:46 -07:00
parent a6295aef6e
commit f46be0139e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/RaspAP/UI/Dashboard.php
View File

@ -231,11 +231,11 @@ class Dashboard {
* parsing the output of ip route; the interface listed
* as the default gateway is used for internet connectivity.
*
* The following interface classifications are assumed:
* - ethernet (eth0, en*)
* - wireless (wlan0, wlan1, wlp*)
* - tethered USB (usb*, eth1)
* - cellular (ppp0, wwan0, wwp*)
* The following interface classifications are matched:
* - ethernet (eth0, enp*, ens*, enx*)
* - wireless (wlan*, wlp*, wlx*)
* - tethered USB (usb*, eth1-9)
* - cellular (ppp*, wwan*, wwp*)
* - fallback
* @return string
*/
@ -248,13 +248,13 @@ class Dashboard {
return 'unknown';
}
// classify interface type
if (preg_match('/^eth\d+|enp\d+s\d+/', $interface)) {
if (preg_match('/^eth0|enp\d+s\d+|ens\d+s\d+|enx[0-9a-f]*/', $interface)) {
return 'ethernet';
}
if (preg_match('/^wlan\d+|wlp\d+s\d+/', $interface)) {
if (preg_match('/^wlan\d+|wlp\d+s\d+|wlx[0-9a-f]*/', $interface)) {
return 'wireless';
}
if (preg_match('/^usb\d+|eth1$/', $interface)) {
if (preg_match('/^usb\d+|^eth[1-9]\d*/', $interface)) {
return 'tethering';
}
if (preg_match('/^ppp\d+|wwan\d+|wwp\d+s\d+/', $interface)) {