[sr-dev] git:master:09b8fbd0: Merge pull request #1135 from snen/presence_dialog

Module: kamailio Branch: master Commit: 09b8fbd0864c908f221f86dca83fe64061461d62 URL: https://github.com/kamailio/kamailio/commit/09b8fbd0864c908f221f86dca83fe64… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: GitHub &lt;noreply(a)github.com&gt; Date: 2017-05-23T02:47:06+02:00 Merge pull request #1135 from snen/presence_dialog pua dialoginfo --- Modified: src/modules/pua_dialoginfo/README Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/09b8fbd0864c908f221f86dca83fe64… Patch: https://github.com/kamailio/kamailio/commit/09b8fbd0864c908f221f86dca83fe64… --- diff --git a/src/modules/pua_dialoginfo/README b/src/modules/pua_dialoginfo/README index 4544ed8dde..edb4c29f00 100644 --- a/src/modules/pua_dialoginfo/README +++ b/src/modules/pua_dialoginfo/README @@ -54,7 +54,7 @@ Phil Lavin 5.10. pubruri_caller_avp (int) 5.11. pubruri_callee_avp (int) 5.12. pubruri_caller_dlg_var (str) - 5.13. pubruri_callee_dlg_var (int) + 5.13. pubruri_callee_dlg_var (str) 5.14. callee_trying (int) 6. Functions @@ -102,7 +102,7 @@ Chapter 1. Admin Guide 5.10. pubruri_caller_avp (int) 5.11. pubruri_callee_avp (int) 5.12. pubruri_caller_dlg_var (str) - 5.13. pubruri_callee_dlg_var (int) + 5.13. pubruri_callee_dlg_var (str) 5.14. callee_trying (int) 6. Functions @@ -165,7 +165,9 @@ Chapter 1. Admin Guide example: <?xml version="1.0" encoding="UTF-8"?> <dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" - version="1" state="full"> + version="1" + state="full" + entity="sip:alice@example.com"> <dialog id="as7d900as8" call-id="a84b4c76e66710" local-tag="1928301774" @@ -284,7 +286,7 @@ Chapter 1. Admin Guide 5.10. pubruri_caller_avp (int) 5.11. pubruri_callee_avp (int) 5.12. pubruri_caller_dlg_var (str) - 5.13. pubruri_callee_dlg_var (int) + 5.13. pubruri_callee_dlg_var (str) 5.14. callee_trying (int) 5.1. include_callid (int) @@ -456,7 +458,7 @@ modparam("pua_dialoginfo", "pubruri_callee_avp", "$avp(s:puburis_callee)") modparam("pua_dialoginfo", "pubruri_caller_dlg_var", "pubruri_caller") ... -5.13. pubruri_callee_dlg_var (int) +5.13. pubruri_callee_dlg_var (str) Must be set to the name of dialog variable where to store the URI for callee, used to send the notifications. This is needed to restored the diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index ed1f107f28..6141e3bdec 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -238,10 +238,6 @@ __dialog_cbtest(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) LM_ERR("dialog callback type 'DLGCB_RESPONSE_WITHIN' received, from=%.*s\n", dlg->from_uri.len, dlg->from_uri.s); break; - case DLGCB_MI_CONTEXT: - LM_ERR("dialog callback type 'DLGCB_MI_CONTEXT' received, from=%.*s\n", - dlg->from_uri.len, dlg->from_uri.s); - break; case DLGCB_DESTROY: LM_ERR("dialog callback type 'DLGCB_DESTROY' received, from=%.*s\n", dlg->from_uri.len, dlg->from_uri.s); @@ -605,7 +601,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type) DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_CONFIRMED | DLGCB_REQ_WITHIN | DLGCB_TERMINATED | DLGCB_EXPIRED | DLGCB_EARLY | DLGCB_RESPONSE_FWDED | DLGCB_RESPONSE_WITHIN - | DLGCB_MI_CONTEXT | DLGCB_DESTROY, + | DLGCB_DESTROY, __dialog_cbtest, NULL, NULL) != 0) { LM_ERR("cannot register callback for all dialog types\n"); free_dlginfo_cell(dlginfo);