[sr-dev] git:master:897e775a: pua_dialoginfo: support for sending "Trying" state for callee

Module: kamailio Branch: master Commit: 897e775a6353ab1e4738ad3b0c3d1c1e53980277 URL: https://github.com/kamailio/kamailio/commit/897e775a6353ab1e4738ad3b0c3d1c1… Author: Phil Lavin &lt;phil.lavin(a)synety.com&gt; Committer: Phil Lavin &lt;phil.lavin(a)synety.com&gt; Date: 2016-02-19T12:07:35Z pua_dialoginfo: support for sending "Trying" state for callee - Implement callee_trying parameter in pua_dialoginfo which causes a "Trying" state to be sent for both the caller and callee when a new dialog is created. --- Modified: modules/pua_dialoginfo/doc/pua_dialoginfo.xml Modified: modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml Modified: modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/897e775a6353ab1e4738ad3b0c3d1c1… Patch: https://github.com/kamailio/kamailio/commit/897e775a6353ab1e4738ad3b0c3d1c1… --- diff --git a/modules/pua_dialoginfo/doc/pua_dialoginfo.xml b/modules/pua_dialoginfo/doc/pua_dialoginfo.xml index f4d7a0d..b3001de 100644 --- a/modules/pua_dialoginfo/doc/pua_dialoginfo.xml +++ b/modules/pua_dialoginfo/doc/pua_dialoginfo.xml @@ -38,6 +38,13 @@ <surname>Darilion</surname> <affiliation><orgname>IPCom</orgname></affiliation> </editor> + <editor> + <firstname>Phil</firstname> + <surname>Lavin</surname> + <address> + &lt;email&gt;phil.lavin(a)synety.com&lt;/email&gt; + </address> + </editor> </authorgroup> <copyright> <year>2006</year> diff --git a/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index e08402d..505378c 100644 --- a/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -461,6 +461,24 @@ modparam("pua_dialoginfo", "pubruri_callee_dlg_var", "pubruri_callee") </example> </section> + <section> + <title><varname>callee_trying</varname> (int)</title> + <para> + If this parameter is set, a "Trying" state will be sent for both the + caller and callee, rather than just the caller. + </para> + <para> + <emphasis>Default value is <quote>0</quote>.</emphasis> + </para> + <example> + <title>Set <varname>callee_trying</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_dialoginfo", "callee_trying", 1) +... +</programlisting> + </example> + </section> </section> <section> diff --git a/modules/pua_dialoginfo/pua_dialoginfo.c b/modules/pua_dialoginfo/pua_dialoginfo.c index 446d980..2e050d3 100644 --- a/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/modules/pua_dialoginfo/pua_dialoginfo.c @@ -63,6 +63,7 @@ MODULE_VERSION #define DEF_USE_PUBRURI_AVPS 0 #define DEF_PUBRURI_CALLER_AVP 0 #define DEF_PUBRURI_CALLEE_AVP 0 +#define DEF_CALLEE_TRYING 0 /* define PUA_DIALOGINFO_DEBUG to activate more verbose @@ -91,6 +92,7 @@ int caller_confirmed = DEF_CALLER_ALWAYS_CONFIRMED; int include_req_uri = DEF_INCLUDE_REQ_URI; int send_publish_flag = DEF_SEND_PUBLISH_FLAG; int use_pubruri_avps = DEF_USE_PUBRURI_AVPS; +int callee_trying = DEF_CALLEE_TRYING; char * pubruri_caller_avp = DEF_PUBRURI_CALLER_AVP; char * pubruri_callee_avp = DEF_PUBRURI_CALLEE_AVP; @@ -119,6 +121,7 @@ static param_export_t params[]={ {"pubruri_callee_avp", PARAM_STRING, &pubruri_callee_avp }, {"pubruri_caller_dlg_var", PARAM_STR, &caller_dlg_var }, {"pubruri_callee_dlg_var", PARAM_STR, &callee_dlg_var }, + {"callee_trying", INT_PARAM, &callee_trying }, {0, 0, 0 } }; @@ -599,6 +602,14 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) &(dlg->callid), 1, dlginfo->lifetime, 0, 0, 0, 0, (send_publish_flag==-1)?1:0); + if (callee_trying) + { + dialog_publish_multi("Trying", dlginfo->pubruris_callee, + (include_req_uri)?&(dlg->req_uri):&(dlg->to_uri), + &(dlg->from_uri), + &(dlg->callid), 0, dlginfo->lifetime, + 0, 0, 0, 0, (send_publish_flag==-1)?1:0); + } } static void