Changeset 4989
- Timestamp:
- Mar 3, 2015 7:52:36 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c
r4876 r4989 89 89 pjsip_expires_hdr *expires_hdr; 90 90 pj_uint32_t expires; 91 pj_uint32_t expires_requested; 91 92 pj_uint32_t delay_before_refresh; 92 93 pjsip_route_hdr route_set; … … 214 215 else if (regc->auto_reg == 0) 215 216 info->next_reg = 0; 216 else if (regc->expires < 0)217 else if (regc->expires == PJSIP_REGC_EXPIRATION_NOT_SPECIFIED) 217 218 info->next_reg = regc->expires; 218 219 else { … … 551 552 552 553 pj_lock_acquire(regc->lock); 554 555 regc->expires_requested = 1; 553 556 554 557 status = create_request(regc, &tdata); … … 621 624 regc->timer.id = 0; 622 625 } 626 627 regc->expires_requested = 0; 623 628 624 629 status = create_request(regc, &tdata); … … 743 748 cbparam->rdata = rdata; 744 749 cbparam->contact_cnt = contact_cnt; 745 cbparam->expiration = expiration; 750 cbparam->expiration = (expiration >= 0? expiration: 751 regc->expires_requested); 746 752 if (contact_cnt) { 747 753 pj_memcpy( cbparam->contact, contact, … … 1393 1399 else 1394 1400 regc->current_op = REGC_REGISTERING; 1401 1402 if (expires_hdr && expires_hdr->ivalue) 1403 regc->expires_requested = expires_hdr->ivalue; 1395 1404 1396 1405 /* Prevent deletion of tdata, e.g: when something wrong in sending,
Note: See TracChangeset
for help on using the changeset viewer.