Re: [devel] [PATCH 1/1] amf: handle saAmfCtDefClcCliTimeout correctly for non-proxied NPI component [#3355]

[Thien M. H. <thi...@de...>]

Hi Thang,

ACK with a comment.

Best Regards,
Thien

-----Original Message-----
From: Thang Duc Nguyen <tha...@de...> 
Sent: Thursday, June 27, 2024 7:27 PM
To: Thien Minh Huynh <thi...@de...>; Dat Tran Quoc Phan <dat...@de...>
Cc: ope...@li...; Thang Duc Nguyen <tha...@de...>
Subject: [PATCH 1/1] amf: handle saAmfCtDefClcCliTimeout correctly for non-proxied NPI component [#3355]

Non-proxied NPI component uses the terminate CLC CLI command when terminating. Any update to saAmfCtDefClcCliTimeout does not take effect.
The fix is to correct this issue.
---
 src/amf/amfnd/compdb.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/amf/amfnd/compdb.cc b/src/amf/amfnd/compdb.cc index ebe9d1f5b..7d6e532c5 100644
--- a/src/amf/amfnd/compdb.cc
+++ b/src/amf/amfnd/compdb.cc
@@ -1213,6 +1213,10 @@ static void init_clc_cli_attributes(AVND_COMP *comp,
       comp->term_cbk_timeout = cmd->timeout;
       comp->use_comptype_attr->set(TerminateCallbackTimeout);
       comp->use_comptype_attr->set(CompTerminateTimeout);

[Thien] m_AVND_COMP_TYPE_IS_PREINSTANTIABLE is redundant. Should be removed.
+    } else if(!m_AVND_COMP_TYPE_IS_PREINSTANTIABLE(comp) &&
+              (!m_AVND_COMP_TYPE_IS_PROXIED(comp))) {
+      cmd->timeout = comptype->saAmfCtDefClcCliTimeout;
+      comp->use_comptype_attr->set(CompTerminateTimeout);
     } else
       cmd->timeout = comptype->saAmfCtDefClcCliTimeout;
   }
--
2.25.1