From e313da37e61e031413d9269806cb4eecf6b8da4d Mon Sep 17 00:00:00 2001 From: smos Date: Wed, 23 May 2012 18:00:51 +0200 Subject: [PATCH] Be a bit smarter about the stats interface for the huawei cards. Some of the K series have the stats on 0.2, the E series on 0.3 Some of the older E series only have 0.2 too. The new K3770 I got today is too new. --- etc/inc/interfaces.inc | 4 +++- etc/inc/pfsense-utils.inc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index e94b7f4061..01d29a712f 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1729,7 +1729,9 @@ EOD; foreach($ports as $port) { mwexec("/bin/ps auxww|grep \"{$interface}\" |grep \"[3]gstats\" | awk '{print $2}' |xargs kill"); - $mondev = substr(basename($port), 0, -1). "3"; + $mondev = substr(basename($port), 0, -1); + $devlist = glob("/dev/{$mondev}?"); + $mondev = basename(end($devlist)); log_error("Starting 3gstats.php on device '{$mondev}' for interface '{$interface}'"); mwexec_bg("/usr/local/bin/3gstats.php {$mondev} {$interface}"); } diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index a71d13a041..7ac1f4b46b 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -2469,7 +2469,7 @@ function huawei_mode_to_string($mode, $submode) { $submodes[4] = "WCDMA"; $submodes[5] = "HSDPA"; $submodes[6] = "HSUPA"; - $submodes[7] = "HDSPA+HSUPA"; + $submodes[7] = "HSDPA+HSUPA"; $submodes[8] = "TD-SCDMA"; $submodes[9] = "HSPA+"; $string = "{$modes[$mode]}, {$submodes[$submode]} Mode";