Changeset 5456

Timestamp:

Oct 7, 2016 8:41:55 AM (8 years ago)

Author:

ming

Message:

Fixed #1967: Add function pjsip_tdata_get_dlg

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_dialog.h (modified) (1 diff)
• src/pjsip/sip_dialog.c (modified) (3 diffs)
• src/pjsip/sip_ua_layer.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip/sip_dialog.h

@@ -558 +558 @@
 
 /**
+ * Get the dialog instance for the outgoing tdata. Returns NULL if the message
+ * wasn't sent from a dialog.
+ *
+ * @param tdata             Outgoing message buffer.
+ *
+ * @return                  The dialog instance that "owns" the message.
+ */
+PJ_DECL(pjsip_dialog*) pjsip_tdata_get_dlg( pjsip_tx_data *tdata );
+
+/**
  * Get the associated dialog for the specified transaction, if any.
  *

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -1125 +1125 @@
         return status;
 
+    /* Put this dialog in tdata's mod_data */
+    tdata->mod_data[dlg->ua->id] = dlg;
+
     /* Just copy dialog route-set to Route header.
      * The transaction will do the processing as specified in Section 12.2.1
@@ -1224 +1227 @@
     /* Lock and increment session */
     pjsip_dlg_inc_lock(dlg);
+
+    /* Put this dialog in tdata's mod_data */
+    tdata->mod_data[dlg->ua->id] = dlg;
 
     /* If via_addr is set, use this address for the Via header. */
@@ -1406 +1412 @@
     /* Lock the dialog. */
     pjsip_dlg_inc_lock(dlg);
+
+    /* Put this dialog in tdata's mod_data */
+    tdata->mod_data[dlg->ua->id] = dlg;
 
     dlg_beautify_response(dlg, PJ_FALSE, st_code, tdata);

pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c

@@ -413 +413 @@
 }
 
+PJ_DEF(pjsip_dialog*) pjsip_tdata_get_dlg( pjsip_tx_data *tdata )
+{
+    return (pjsip_dialog*) tdata->mod_data[mod_ua.mod.id];
+}
+
 PJ_DEF(pjsip_dialog*) pjsip_tsx_get_dlg( pjsip_transaction *tsx )
 {