Changeset 5356

Timestamp:

Jun 24, 2016 1:03:25 PM (8 years ago)

Author:

nanang

Message:

Fix #1938: Wrong registration renewal flag info in PJSUA registration callback when unregistration fails.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip-ua/sip_regc.h (modified) (1 diff)
• src/pjsip-ua/sip_reg.c (modified) (12 diffs)
• src/pjsua-lib/pjsua_acc.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip-ua/sip_regc.h

@@ -78 +78 @@
     int                  contact_cnt;/**<Number of contacts in response.    */
     pjsip_contact_hdr   *contact[PJSIP_REGC_MAX_CONTACT]; /**< Contacts.    */
+    pj_bool_t            is_unreg;  /**< Expire header, if any, set to zero?*/
 };
 

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -747 +747 @@
                           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;
@@ -758 +759 @@
     cbparam->expiration = (expiration >= 0? expiration:
                            regc->expires_requested);
+    cbparam->is_unreg = is_unreg;
     if (contact_cnt) {
         pj_memcpy( cbparam->contact, contact, 
@@ -767 +769 @@
                           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;
@@ -775 +778 @@
 
     cbparam_init(&cbparam, regc, status, st_code, reason, rdata, expiration,
-                 contact_cnt, contact);
+                 contact_cnt, contact, is_unreg);
     (*regc->cb)(&cbparam);
 }
@@ -802 +805 @@
         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);
     }
 
@@ -1100 +1104 @@
                      (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 */
@@ -1139 +1143 @@
         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;
 
@@ -1206 +1212 @@
                 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);
             }
@@ -1295 +1301 @@
                 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);
             }
@@ -1310 +1316 @@
         unsigned contact_cnt = 0;
         pjsip_contact_hdr *contact[PJSIP_REGC_MAX_CONTACT];
+        pj_bool_t is_unreg;
 
         if (tsx->status_code/100 == 2) {
@@ -1334 +1341 @@
 
         /* Mark operation as complete */
+        is_unreg = (regc->current_op == REGC_UNREGISTERING);
         regc->current_op = REGC_IDLE;
 
@@ -1345 +1353 @@
                         : &tsx->status_text),
                       rdata, expiration, 
-                      contact_cnt, contact);
+                      contact_cnt, contact, is_unreg);
         pj_lock_acquire(regc->lock);
     }

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -2305 +2305 @@
         reg_info.cbparam = param;
         reg_info.regc = param->regc;
-        reg_info.renew = (rinfo.interval != 0);
+        reg_info.renew = !param->is_unreg;
         (*pjsua_var.ua_cfg.cb.on_reg_state2)(acc->index, &reg_info);
     }