Browse code

Merge pull request #1135 from snen/presence_dialog

pua dialoginfo

Daniel-Constantin Mierla authored on 23/05/2017 00:47:06 • GitHub committed on 23/05/2017 00:47:06
Showing 2 changed files
... ...
@@ -54,7 +54,7 @@ Phil Lavin
54 54
               5.10. pubruri_caller_avp (int)
55 55
               5.11. pubruri_callee_avp (int)
56 56
               5.12. pubruri_caller_dlg_var (str)
57
-              5.13. pubruri_callee_dlg_var (int)
57
+              5.13. pubruri_callee_dlg_var (str)
58 58
               5.14. callee_trying (int)
59 59
 
60 60
         6. Functions
... ...
@@ -102,7 +102,7 @@ Chapter 1. Admin Guide
102 102
         5.10. pubruri_caller_avp (int)
103 103
         5.11. pubruri_callee_avp (int)
104 104
         5.12. pubruri_caller_dlg_var (str)
105
-        5.13. pubruri_callee_dlg_var (int)
105
+        5.13. pubruri_callee_dlg_var (str)
106 106
         5.14. callee_trying (int)
107 107
 
108 108
    6. Functions
... ...
@@ -165,7 +165,9 @@ Chapter 1. Admin Guide
165 165
    example:
166 166
 <?xml version="1.0" encoding="UTF-8"?>
167 167
 <dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info"
168
-             version="1" state="full">
168
+             version="1"
169
+             state="full"
170
+             entity="sip:alice@example.com">
169 171
     <dialog id="as7d900as8"
170 172
             call-id="a84b4c76e66710"
171 173
             local-tag="1928301774"
... ...
@@ -284,7 +286,7 @@ Chapter 1. Admin Guide
284 286
    5.10. pubruri_caller_avp (int)
285 287
    5.11. pubruri_callee_avp (int)
286 288
    5.12. pubruri_caller_dlg_var (str)
287
-   5.13. pubruri_callee_dlg_var (int)
289
+   5.13. pubruri_callee_dlg_var (str)
288 290
    5.14. callee_trying (int)
289 291
 
290 292
 5.1. include_callid (int)
... ...
@@ -456,7 +458,7 @@ modparam("pua_dialoginfo", "pubruri_callee_avp", "$avp(s:puburis_callee)")
456 458
 modparam("pua_dialoginfo", "pubruri_caller_dlg_var", "pubruri_caller")
457 459
 ...
458 460
 
459
-5.13. pubruri_callee_dlg_var (int)
461
+5.13. pubruri_callee_dlg_var (str)
460 462
 
461 463
    Must be set to the name of dialog variable where to store the URI for
462 464
    callee, used to send the notifications. This is needed to restored the
... ...
@@ -238,10 +238,6 @@ __dialog_cbtest(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params)
238 238
 			LM_ERR("dialog callback type 'DLGCB_RESPONSE_WITHIN' received, from=%.*s\n",
239 239
 					dlg->from_uri.len, dlg->from_uri.s);
240 240
 			break;
241
-		case DLGCB_MI_CONTEXT:
242
-			LM_ERR("dialog callback type 'DLGCB_MI_CONTEXT' received, from=%.*s\n",
243
-					dlg->from_uri.len, dlg->from_uri.s);
244
-			break;
245 241
 		case DLGCB_DESTROY:
246 242
 			LM_ERR("dialog callback type 'DLGCB_DESTROY' received, from=%.*s\n",
247 243
 					dlg->from_uri.len, dlg->from_uri.s);
... ...
@@ -605,7 +601,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type)
605 601
 				DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_CONFIRMED
606 602
 				| DLGCB_REQ_WITHIN | DLGCB_TERMINATED | DLGCB_EXPIRED
607 603
 				| DLGCB_EARLY | DLGCB_RESPONSE_FWDED | DLGCB_RESPONSE_WITHIN
608
-				| DLGCB_MI_CONTEXT | DLGCB_DESTROY,
604
+				| DLGCB_DESTROY,
609 605
 				__dialog_cbtest, NULL, NULL) != 0) {
610 606
 		LM_ERR("cannot register callback for all dialog types\n");
611 607
 		free_dlginfo_cell(dlginfo);