Changeset 4989 for pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

Timestamp:

Mar 3, 2015 7:52:36 AM (10 years ago)

Author:

ming

Message:

Fixed #1819: Use expiration field to indicate registration/unregistration in registration callback

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c (modified) (6 diffs)

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

@@ -89 +89 @@
     pjsip_expires_hdr           *expires_hdr;
     pj_uint32_t                  expires;
+    pj_uint32_t                  expires_requested;
     pj_uint32_t                  delay_before_refresh;
     pjsip_route_hdr              route_set;
@@ -214 +215 @@
     else if (regc->auto_reg == 0)
         info->next_reg = 0;
-    else if (regc->expires < 0)
+    else if (regc->expires == PJSIP_REGC_EXPIRATION_NOT_SPECIFIED)
         info->next_reg = regc->expires;
     else {
@@ -551 +552 @@
 
     pj_lock_acquire(regc->lock);
+    
+    regc->expires_requested = 1;
 
     status = create_request(regc, &tdata);
@@ -621 +624 @@
         regc->timer.id = 0;
     }
+
+    regc->expires_requested = 0;
 
     status = create_request(regc, &tdata);
@@ -743 +748 @@
     cbparam->rdata = rdata;
     cbparam->contact_cnt = contact_cnt;
-    cbparam->expiration = expiration;
+    cbparam->expiration = (expiration >= 0? expiration:
+                           regc->expires_requested);
     if (contact_cnt) {
         pj_memcpy( cbparam->contact, contact, 
@@ -1393 +1399 @@
     else
         regc->current_op = REGC_REGISTERING;
+    
+    if (expires_hdr && expires_hdr->ivalue)
+        regc->expires_requested = expires_hdr->ivalue;
 
     /* Prevent deletion of tdata, e.g: when something wrong in sending,