summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2011-04-25 11:47:45 +0000
committerBenny Prijono <bennylp@teluu.com>2011-04-25 11:47:45 +0000
commitd8dc4b6a36d794d9589630be96b9eb7e9b142f1a (patch)
tree2eae9bc2043eceddefd57cd179a6f555e9bd66b6
parent9e6212e63f89c990f9dcce45a5b1bc40aca9a6df (diff)
Fixed #1245: Assertion may be raised if iPhone app woken up to perform registration and the server is down (thanks Alejandro Orellana for the report)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3542 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjsip/src/pjsip-ua/sip_reg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pjsip/src/pjsip-ua/sip_reg.c b/pjsip/src/pjsip-ua/sip_reg.c
index d96e3c88..aa5c753e 100644
--- a/pjsip/src/pjsip-ua/sip_reg.c
+++ b/pjsip/src/pjsip-ua/sip_reg.c
@@ -1154,6 +1154,9 @@ handle_err:
unsigned contact_cnt = 0;
pjsip_contact_hdr *contact[PJSIP_REGC_MAX_CONTACT];
+ /* Mark operation as complete */
+ regc->current_op = REGC_IDLE;
+
if (tsx->status_code/100 == 2) {
rdata = event->body.tsx_state.src.rdata;
@@ -1164,9 +1167,6 @@ handle_err:
PJSIP_REGC_MAX_CONTACT,
contact);
- /* Mark operation as complete */
- regc->current_op = REGC_IDLE;
-
/* Schedule next registration */
schedule_registration(regc, expiration);