Changeset 5513 for pjproject/branches/projects/uwp/pjsip/src/pjsip-ua/sip_reg.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip-ua/sip_reg.c (modified) (21 diffs)

pjproject/branches/projects/uwp/pjsip/src/pjsip-ua/sip_reg.c

@@ -190 +190 @@
         pj_lock_destroy(regc->lock);
         regc->lock = NULL;
+
+        pjsip_auth_clt_deinit(&regc->auth_sess);
         pjsip_endpt_release_pool(regc->endpt, regc->pool);
     }
@@ -514 +516 @@
         while (route != &regc->route_set) {
             pjsip_hdr *new_hdr = (pjsip_hdr*)
-                                 pjsip_hdr_shallow_clone(tdata->pool, route);
+                                 pjsip_hdr_clone(tdata->pool, route);
             pj_list_insert_after(route_pos, new_hdr);
             route_pos = new_hdr;
@@ -528 +530 @@
         while (hdr != &regc->hdr_list) {
             pjsip_hdr *new_hdr = (pjsip_hdr*)
-                                 pjsip_hdr_shallow_clone(tdata->pool, hdr);
+                                 pjsip_hdr_clone(tdata->pool, hdr);
             pjsip_msg_add_hdr(tdata->msg, new_hdr);
             hdr = hdr->next;
@@ -567 +569 @@
     while (hdr != &regc->contact_hdr_list) {
         pjsip_msg_add_hdr(msg, (pjsip_hdr*)
-                               pjsip_hdr_shallow_clone(tdata->pool, hdr));
+                               pjsip_hdr_clone(tdata->pool, hdr));
         hdr = hdr->next;
     }
@@ -582 +584 @@
     if (regc->expires_hdr)
         pjsip_msg_add_hdr(msg, (pjsip_hdr*)
-                               pjsip_hdr_shallow_clone(tdata->pool,
-                                                       regc->expires_hdr));
+                               pjsip_hdr_clone(tdata->pool,
+                                               regc->expires_hdr));
 
     if (regc->timer.id != 0) {
@@ -594 +596 @@
     if (h_allow) {
         pjsip_msg_add_hdr(msg, (pjsip_hdr*)
-                               pjsip_hdr_shallow_clone(tdata->pool, h_allow));
+                               pjsip_hdr_clone(tdata->pool, h_allow));
 
     }
@@ -639 +641 @@
     while ((void*)hdr != (void*)&regc->contact_hdr_list) {
         pjsip_msg_add_hdr(msg, (pjsip_hdr*)
-                               pjsip_hdr_shallow_clone(tdata->pool, hdr));
+                               pjsip_hdr_clone(tdata->pool, hdr));
         hdr = hdr->next;
     }
@@ -739 +741 @@
                           const pj_str_t *reason,
                           pjsip_rx_data *rdata, pj_int32_t expiration,
-                          int contact_cnt, pjsip_contact_hdr *contact[])
+                          int contact_cnt, pjsip_contact_hdr *contact[],
+                          pj_bool_t is_unreg)
 {
     cbparam->regc = regc;
@@ -750 +753 @@
     cbparam->expiration = (expiration >= 0? expiration:
                            regc->expires_requested);
+    cbparam->is_unreg = is_unreg;
     if (contact_cnt) {
         pj_memcpy( cbparam->contact, contact, 
@@ -759 +763 @@
                           const pj_str_t *reason,
                           pjsip_rx_data *rdata, pj_int32_t expiration,
-                          int contact_cnt, pjsip_contact_hdr *contact[])
+                          int contact_cnt, pjsip_contact_hdr *contact[],
+                          pj_bool_t is_unreg)
 {
     struct pjsip_regc_cbparam cbparam;
@@ -767 +772 @@
 
     cbparam_init(&cbparam, regc, status, st_code, reason, rdata, expiration,
-                 contact_cnt, contact);
+                 contact_cnt, contact, is_unreg);
     (*regc->cb)(&cbparam);
 }
@@ -794 +799 @@
         char errmsg[PJ_ERR_MSG_SIZE];
         pj_str_t reason = pj_strerror(status, errmsg, sizeof(errmsg));
-        call_callback(regc, status, 400, &reason, NULL, -1, 0, NULL);
+        call_callback(regc, status, 400, &reason, NULL, -1, 0, NULL,
+                      PJ_FALSE);
     }
 
@@ -1092 +1098 @@
                      (event->body.tsx_state.type==PJSIP_EVENT_RX_MSG) ? 
                       event->body.tsx_state.src.rdata : NULL,
-                     -1, 0, NULL);
+                     -1, 0, NULL, PJ_FALSE);
 
         /* Call regc tsx callback before handling any response */
@@ -1131 +1137 @@
         pjsip_rx_data *rdata = event->body.tsx_state.src.rdata;
         pjsip_tx_data *tdata;
+        pj_bool_t is_unreg;
 
         /* reset current op */
+        is_unreg = (regc->current_op == REGC_UNREGISTERING);
         regc->current_op = REGC_IDLE;
 
@@ -1164 +1172 @@
             while (chdr != &regc->contact_hdr_list) {
                 pj_list_insert_before(ins_hdr, (pjsip_hdr*)
-                    pjsip_hdr_shallow_clone(tsx->last_tx->pool, chdr));
+                    pjsip_hdr_clone(tsx->last_tx->pool, chdr));
                 chdr = chdr->next;
             }
@@ -1198 +1206 @@
                 call_callback(regc, status, tsx->status_code, 
                               &rdata->msg_info.msg->line.status.reason,
-                              rdata, -1, 0, NULL);
+                              rdata, -1, 0, NULL, is_unreg);
                 pj_lock_acquire(regc->lock);
             }
@@ -1287 +1295 @@
                 call_callback(regc, status, tsx->status_code,
                               &rdata->msg_info.msg->line.status.reason,
-                              rdata, -1, 0, NULL);
+                              rdata, -1, 0, NULL, PJ_FALSE);
                 pj_lock_acquire(regc->lock);
             }
@@ -1302 +1310 @@
         unsigned contact_cnt = 0;
         pjsip_contact_hdr *contact[PJSIP_REGC_MAX_CONTACT];
+        pj_bool_t is_unreg;
 
         if (tsx->status_code/100 == 2) {
@@ -1326 +1335 @@
 
         /* Mark operation as complete */
+        is_unreg = (regc->current_op == REGC_UNREGISTERING);
         regc->current_op = REGC_IDLE;
 
@@ -1337 +1347 @@
                         : &tsx->status_text),
                       rdata, expiration, 
-                      contact_cnt, contact);
+                      contact_cnt, contact, is_unreg);
         pj_lock_acquire(regc->lock);
     }
@@ -1425 +1435 @@
                                       regc, &regc_tsx_callback);
     if (status!=PJ_SUCCESS) {
+        /* On failure, regc_tsx_callback() may not be called, so we need
+         * to reset regc->has_tsx here (see also ticket #1936).
+         */
+        regc->has_tsx = PJ_FALSE;
+
         PJ_LOG(4,(THIS_FILE, "Error sending request, status=%d", status));
     }