From 2f30694eadc62ac1fadfed96103b87d538e808e4 Mon Sep 17 00:00:00 2001
From: Antonio Fernandez <tfernandez.sc2@gmail.com>
Date: Tue, 22 Oct 2024 21:01:50 -0400
Subject: [PATCH] Fix Avaya BLF issue on reSUBSCRIBE (#7164)

* Fix Avaya BLF issue on reSUBSCRIBE

* fix an accidental modification
---
 app/avaya/app_config.php                            | 8 ++++++++
 resources/templates/provision/avaya/J139/{$mac}.cfg | 5 +++++
 resources/templates/provision/avaya/J169/{$mac}.cfg | 5 +++++
 resources/templates/provision/avaya/J179/{$mac}.cfg | 5 +++++
 resources/templates/provision/avaya/J189/{$mac}.cfg | 5 +++++
 5 files changed, 28 insertions(+)

diff --git a/app/avaya/app_config.php b/app/avaya/app_config.php
index 08c5ca914d..303909daee 100644
--- a/app/avaya/app_config.php
+++ b/app/avaya/app_config.php
@@ -192,5 +192,13 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4f4641c3-7398-421e-a0b3-5d7960813728";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "avaya_blf_subscription_expiry";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "60";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "The expiry that Avaya phones will populate in their SUBSCRIBE messages. This should be set to equal or less than the nonce-ttl value that is set in your SIP profile.";
+		$y++;
 
 ?>
diff --git a/resources/templates/provision/avaya/J139/{$mac}.cfg b/resources/templates/provision/avaya/J139/{$mac}.cfg
index aa001d4729..57888657dd 100644
--- a/resources/templates/provision/avaya/J139/{$mac}.cfg
+++ b/resources/templates/provision/avaya/J139/{$mac}.cfg
@@ -11,6 +11,11 @@ SET ENABLE_OOD_RESET_NOTIFY 1
 ## Do not require TLS to accept Out-Of-Dialog REFER messages
 SET ENABLE_OOD_MSG_TLS_ONLY 0
 
+# Set the default SUBSCRIBE expiry time
+# This needs to be set to a value equal to or lower than the 'nonce-ttl' that is in your SIP Profile
+# The defaule for 'nonce-ttl' is 60
+SET OUTBOUND_SUBSCRIPTION_REQUEST_DURATION {if isset($avaya_blf_subscription_expiry)}{$avaya_blf_subscription_expiry}{else}60{/if}
+
 ## Trust public certs rather than the phone downloading a trusted cert from the server
 SET ENABLE_PUBLIC_CA_CERTS 1
 
diff --git a/resources/templates/provision/avaya/J169/{$mac}.cfg b/resources/templates/provision/avaya/J169/{$mac}.cfg
index 2d33a60e97..d16774afad 100644
--- a/resources/templates/provision/avaya/J169/{$mac}.cfg
+++ b/resources/templates/provision/avaya/J169/{$mac}.cfg
@@ -11,6 +11,11 @@ SET ENABLE_OOD_RESET_NOTIFY 1
 ## Do not require TLS to accept Out-Of-Dialog REFER messages
 SET ENABLE_OOD_MSG_TLS_ONLY 0
 
+# Set the default SUBSCRIBE expiry time
+# This needs to be set to a value equal to or lower than the 'nonce-ttl' that is in your SIP Profile
+# The defaule for 'nonce-ttl' is 60
+SET OUTBOUND_SUBSCRIPTION_REQUEST_DURATION {if isset($avaya_blf_subscription_expiry)}{$avaya_blf_subscription_expiry}{else}60{/if}
+
 ## Trust public certs rather than the phone downloading a trusted cert from the server
 SET ENABLE_PUBLIC_CA_CERTS 1
 
diff --git a/resources/templates/provision/avaya/J179/{$mac}.cfg b/resources/templates/provision/avaya/J179/{$mac}.cfg
index bcd73af710..0b8f13cc9f 100644
--- a/resources/templates/provision/avaya/J179/{$mac}.cfg
+++ b/resources/templates/provision/avaya/J179/{$mac}.cfg
@@ -11,6 +11,11 @@ SET ENABLE_OOD_RESET_NOTIFY 1
 ## Do not require TLS to accept Out-Of-Dialog REFER messages
 SET ENABLE_OOD_MSG_TLS_ONLY 0
 
+# Set the default SUBSCRIBE expiry time
+# This needs to be set to a value equal to or lower than the 'nonce-ttl' that is in your SIP Profile
+# The defaule for 'nonce-ttl' is 60
+SET OUTBOUND_SUBSCRIPTION_REQUEST_DURATION {if isset($avaya_blf_subscription_expiry)}{$avaya_blf_subscription_expiry}{else}60{/if}
+
 ## Trust public certs rather than the phone downloading a trusted cert from the server
 SET ENABLE_PUBLIC_CA_CERTS 1
 
diff --git a/resources/templates/provision/avaya/J189/{$mac}.cfg b/resources/templates/provision/avaya/J189/{$mac}.cfg
index 1f10ce5533..30c01bb74c 100644
--- a/resources/templates/provision/avaya/J189/{$mac}.cfg
+++ b/resources/templates/provision/avaya/J189/{$mac}.cfg
@@ -11,6 +11,11 @@ SET ENABLE_OOD_RESET_NOTIFY 1
 ## Do not require TLS to accept Out-Of-Dialog REFER messages
 SET ENABLE_OOD_MSG_TLS_ONLY 0
 
+# Set the default SUBSCRIBE expiry time
+# This needs to be set to a value equal to or lower than the 'nonce-ttl' that is in your SIP Profile
+# The defaule for 'nonce-ttl' is 60
+SET OUTBOUND_SUBSCRIPTION_REQUEST_DURATION {if isset($avaya_blf_subscription_expiry)}{$avaya_blf_subscription_expiry}{else}60{/if}
+
 ## Trust public certs rather than the phone downloading a trusted cert from the server
 SET ENABLE_PUBLIC_CA_CERTS 1