From 803457f8c92fee4b8859410cab757c78c3ad119a Mon Sep 17 00:00:00 2001 From: demonspork Date: Wed, 25 Aug 2021 20:10:35 -0500 Subject: [PATCH] Support for Disabling Non-configured ports on GXW42XX gateways (#6001) * Support for Disabling Non-configured ports on GXW42XX gateways When patching in an ATA at facilities like residential facilities, we don't want dial tone on un-configured ports. This makes it so that the device will disable ports that have no user id configured so they don't provide dial tone. The behavior can be reversed by setting grandstream_fxs_enabled to 1 in the settings. --- app/grandstream/app_config.php | 8 + .../provision/grandstream/gxw42xx/{$mac}.xml | 192 ++++++++++++++++++ 2 files changed, 200 insertions(+) diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php index 146aa41b2a..34deec62a4 100644 --- a/app/grandstream/app_config.php +++ b/app/grandstream/app_config.php @@ -342,6 +342,14 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Attended Transfer Mode. 0 - Static, 1 - Dynamic. Default is 0"; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5d68ccaa-34c3-46f4-8ba5-d105e135a073"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_fax_enabled"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "0"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable FXS (TR-069) (0 - No, 1 - Yes, default is Yes"; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0f1062d5-d262-4444-a8cb-a48faa4ce580"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_syslog_server"; diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml index 826a49bc7d..711124ebdb 100644 --- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml @@ -3254,7 +3254,11 @@ {$account.1.password} {$account.1.display_name} 0 +{if !isset($account.1.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3269,7 +3273,11 @@ {$account.2.password} {$account.2.display_name} 0 +{if !isset($account.2.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3284,7 +3292,11 @@ {$account.3.password} {$account.3.display_name} 0 +{if !isset($account.3.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3299,7 +3311,11 @@ {$account.4.password} {$account.4.display_name} +{if !isset($account.4.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3314,7 +3330,11 @@ {$account.5.password} {$account.5.display_name} 0 +{if !isset($account.5.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3329,7 +3349,11 @@ {$account.6.password} {$account.6.display_name} 0 +{if !isset($account.6.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3344,7 +3368,11 @@ {$account.7.password} {$account.7.display_name} 0 +{if !isset($account.7.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3359,7 +3387,11 @@ {$account.8.password} {$account.8.display_name} 0 +{if !isset($account.8.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3374,7 +3406,11 @@ {$account.9.password} {$account.9.display_name} 0 +{if !isset($account.9.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3389,7 +3425,11 @@ {$account.10.password} {$account.10.display_name} 0 +{if !isset($account.10.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3404,7 +3444,11 @@ {$account.11.password} {$account.11.display_name} 0 +{if !isset($account.11.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3419,7 +3463,11 @@ {$account.12.password} {$account.12.display_name} 0 +{if !isset($account.12.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3434,7 +3482,11 @@ {$account.13.password} {$account.13.display_name} 0 +{if !isset($account.13.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3449,7 +3501,11 @@ {$account.14.password} {$account.14.display_name} 0 +{if !isset($account.14.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3464,7 +3520,11 @@ {$account.15.password} {$account.15.display_name} 0 +{if !isset($account.15.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3479,7 +3539,11 @@ {$account.16.password} {$account.16.display_name} 0 +{if !isset($account.16.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3494,7 +3558,11 @@ {$account.17.password} {$account.17.display_name} 0 +{if !isset($account.17.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3509,7 +3577,11 @@ {$account.18.password} {$account.18.display_name} 0 +{if !isset($account.18.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3524,7 +3596,11 @@ {$account.19.password} {$account.19.display_name} 0 +{if !isset($account.19.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3539,7 +3615,11 @@ {$account.20.password} {$account.20.display_name} 0 +{if !isset($account.20.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3554,7 +3634,11 @@ {$account.21.password} {$account.21.display_name} 0 +{if !isset($account.21.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3569,7 +3653,11 @@ {$account.22.password} {$account.22.display_name} 0 +{if !isset($account.22.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3584,7 +3672,11 @@ {$account.23.password} {$account.23.display_name} 0 +{if !isset($account.23.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3599,7 +3691,11 @@ {$account.24.password} {$account.24.display_name} 0 +{if !isset($account.24.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3614,7 +3710,11 @@ {$account.25.password} {$account.25.display_name} 0 +{if !isset($account.25.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3630,7 +3730,11 @@ {$account.26.password} {$account.26.display_name} 0 +{if !isset($account.26.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3645,7 +3749,11 @@ {$account.27.password} {$account.27.display_name} 0 +{if !isset($account.27.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3660,7 +3768,11 @@ {$account.28.password} {$account.28.display_name} 0 +{if !isset($account.28.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3675,7 +3787,11 @@ {$account.29.password} {$account.29.display_name} 0 +{if !isset($account.29.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3690,7 +3806,11 @@ {$account.30.password} {$account.30.display_name} 0 +{if !isset($account.30.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3705,7 +3825,11 @@ {$account.31.password} {$account.31.display_name} 0 +{if !isset($account.31.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3720,7 +3844,11 @@ {$account.32.password} {$account.32.display_name} 0 +{if !isset($account.32.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3735,7 +3863,11 @@ {$account.33.password} {$account.33.display_name} 0 +{if !isset($account.33.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3750,7 +3882,11 @@ {$account.34.password} {$account.34.display_name} 0 +{if !isset($account.34.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3765,7 +3901,11 @@ {$account.34.password} {$account.34.display_name} 0 +{if !isset($account.34.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3780,7 +3920,11 @@ {$account.36.password} {$account.36.display_name} 0 +{if !isset($account.36.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3795,7 +3939,11 @@ {$account.37.password} {$account.37.display_name} 0 +{if !isset($account.37.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3810,7 +3958,11 @@ {$account.38.password} {$account.38.display_name} 0 +{if !isset($account.38.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3825,7 +3977,11 @@ {$account.39.password} {$account.39.display_name} 0 +{if !isset($account.39.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3840,7 +3996,11 @@ {$account.40.password} {$account.40.display_name} 0 +{if !isset($account.40.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3855,7 +4015,11 @@ {$account.41.password} {$account.41.display_name} 0 +{if !isset($account.41.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3870,7 +4034,11 @@ {$account.42.password} {$account.42.display_name} 0 +{if !isset($account.42.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3885,7 +4053,11 @@ {$account.43.password} {$account.43.display_name} 0 +{if !isset($account.43.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3900,7 +4072,11 @@ {$account.44.password} {$account.44.display_name} 0 +{if !isset($account.44.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3915,7 +4091,11 @@ {$account.45.password} {$account.45.display_name} 0 +{if !isset($account.45.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3930,7 +4110,11 @@ {$account.46.password} {$account.46.display_name} 0 +{if !isset($account.46.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3945,7 +4129,11 @@ {$account.47.password} {$account.47.display_name} 0 +{if !isset($account.47.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0 @@ -3960,7 +4148,11 @@ {$account.48.password} {$account.48.display_name} 0 +{if !isset($account.48.user_id) && $grandstream_fxs_enabled == 0} +0 +{else} 1 +{/if} 0