Changeset 139 for pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

Timestamp:

Feb 7, 2006 12:34:11 PM (18 years ago)

Author:

bennylp

Message:

Initial implementation of invite session abstraction, and updated pjsua for the new framework

File:

• pjproject/trunk/pjsip/src/pjsip/sip_dialog.c (modified) (19 diffs)

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

@@ -38 +38 @@
 #define THIS_FILE       "sip_dialog.c"
 
+long pjsip_dlg_lock_tls_id;
 
 PJ_DEF(pj_bool_t) pjsip_method_creates_dialog(const pjsip_method *m)
@@ -73 +74 @@
     pj_sprintf(dlg->obj_name, "dlg%p", dlg);
     dlg->ua = ua;
+    dlg->endpt = endpt;
 
     status = pj_mutex_create_recursive(pool, "dlg%p", &dlg->mutex);
@@ -93 +95 @@
     if (dlg->mutex)
         pj_mutex_destroy(dlg->mutex);
-    pjsip_endpt_release_pool(pjsip_ua_get_endpt(dlg->ua), dlg->pool);
+    pjsip_endpt_release_pool(dlg->endpt, dlg->pool);
 }
 
@@ -145 +147 @@
     /* Randomize local CSeq. */
     dlg->local.first_cseq = pj_rand() % 0x7FFFFFFFL;
-    dlg->local.cseq = dlg->local.cseq;
+    dlg->local.cseq = dlg->local.first_cseq;
 
     /* Init local contact. */
@@ -184 +186 @@
 
     /* Init client authentication session. */
-    status = pjsip_auth_clt_init(&dlg->auth_sess, pjsip_ua_get_endpt(ua), 
+    status = pjsip_auth_clt_init(&dlg->auth_sess, dlg->endpt, 
                                  dlg->pool, 0);
     if (status != PJ_SUCCESS)
@@ -343 +345 @@
 
     /* Init client authentication session. */
-    status = pjsip_auth_clt_init(&dlg->auth_sess, pjsip_ua_get_endpt(ua),
+    status = pjsip_auth_clt_init(&dlg->auth_sess, dlg->endpt,
                                  dlg->pool, 0);
     if (status != PJ_SUCCESS)
@@ -507 +509 @@
     }
 
+    /* Log */
+    PJ_LOG(5,(dlg->obj_name, "Dialog destroyed"));
+
     /* Destroy this dialog. */
     pj_mutex_destroy(dlg->mutex);
-    pjsip_endpt_release_pool(pjsip_ua_get_endpt(dlg->ua), dlg->pool);
+    pjsip_endpt_release_pool(dlg->endpt, dlg->pool);
 
     return PJ_SUCCESS;
@@ -630 +635 @@
     dlg->mod_data[mod->id] = mod_data;
 
+    /* Increment count. */
+    ++dlg->usage_cnt;
+
     pj_mutex_unlock(dlg->mutex);
 
@@ -664 +672 @@
      * dialog.
      */
-    status = pjsip_endpt_create_request_from_hdr(pjsip_ua_get_endpt(dlg->ua),
+    status = pjsip_endpt_create_request_from_hdr(dlg->endpt,
                                                  method,
                                                  dlg->target,
@@ -810 +818 @@
         }
 
-        *p_tsx = tsx;
+        if (p_tsx)
+            *p_tsx = tsx;
 
     } else {
-        status = pjsip_endpt_send_request_stateless(
-                    pjsip_ua_get_endpt(dlg->ua), tdata, NULL, NULL);
+        status = pjsip_endpt_send_request_stateless(dlg->endpt, tdata, 
+                                                    NULL, NULL);
         if (status != PJ_SUCCESS)
             goto on_error;
 
-        *p_tsx = NULL;
+        if (p_tsx)
+            *p_tsx = NULL;
     }
 
@@ -833 +843 @@
     pjsip_tx_data_dec_ref( tdata );
 
-    *p_tsx = NULL;
+    if (p_tsx)
+        *p_tsx = NULL;
     return status;
 }
@@ -853 +864 @@
 
     /* Create generic response. */
-    status = pjsip_endpt_create_response(pjsip_ua_get_endpt(dlg->ua),
+    status = pjsip_endpt_create_response(dlg->endpt,
                                          rdata, st_code, st_text, &tdata);
     if (status != PJ_SUCCESS)
@@ -915 +926 @@
         if (st_class==2 || st_code==405) {
             const pjsip_hdr *c_hdr;
-            c_hdr = pjsip_endpt_get_capability(pjsip_ua_get_endpt(dlg->ua),
+            c_hdr = pjsip_endpt_get_capability(dlg->endpt,
                                                PJSIP_H_ALLOW, NULL);
             if (c_hdr) {
@@ -926 +937 @@
         if (st_class==2) {
             const pjsip_hdr *c_hdr;
-            c_hdr = pjsip_endpt_get_capability(pjsip_ua_get_endpt(dlg->ua),
+            c_hdr = pjsip_endpt_get_capability(dlg->endpt,
                                                PJSIP_H_SUPPORTED, NULL);
             if (c_hdr) {
@@ -1057 +1068 @@
          */
         pj_mutex_unlock(dlg->mutex);
-        pjsip_endpt_respond_stateless(pjsip_ua_get_endpt(dlg->ua),
+        pjsip_endpt_respond_stateless(dlg->endpt,
                                       rdata, 500, NULL, NULL, NULL);
         return;
@@ -1095 +1106 @@
                   "Dialog will response with 500 (Internal Server Error)",
                   pjsip_rx_data_get_info(rdata)));
-        status = pjsip_endpt_create_response(pjsip_ua_get_endpt(dlg->ua), 
+        status = pjsip_endpt_create_response(dlg->endpt, 
                                              rdata, 
                                              PJSIP_SC_INTERNAL_SERVER_ERROR, 
@@ -1126 +1137 @@
     pj_mutex_lock(dlg->mutex);
 
+    /* Check that rdata already has dialog in mod_data. */
+    pj_assert(pjsip_rdata_get_dlg(rdata) == dlg);
+
     /* Update the remote tag, if none is specified yet. */
     if (dlg->remote.info->tag.slen == 0 && rdata->msg_info.to->tag.slen != 0) {
@@ -1134 +1148 @@
     }
 
-    /* Check that rdata already has dialog in mod_data. */
-    pj_assert(pjsip_rdata_get_dlg(rdata) == dlg);
+    /* Update remote target when receiving certain response messages. */
+    if (pjsip_method_creates_dialog(&rdata->msg_info.cseq->method) &&
+        rdata->msg_info.msg->line.status.code/100 == 2)
+    {
+        pjsip_contact_hdr *contact;
+
+        contact = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
+                                     NULL);
+        if (contact) {
+            dlg->remote.contact = pjsip_hdr_clone(dlg->pool, contact);
+            dlg->target = dlg->remote.contact->uri;
+        }
+    }
 
     /* Pass to dialog usages. */
@@ -1186 +1211 @@
         dlg->sess_count == 0) 
     {
+        /* Unregister this dialog from the transaction. */
+        tsx->mod_data[dlg->ua->id] = NULL;
+
         /* Time to destroy dialog. */
         unregister_and_destroy_dialog(dlg);