summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2011-04-26 07:39:57 +0000
committerBenny Prijono <bennylp@teluu.com>2011-04-26 07:39:57 +0000
commite68df2a248b8af0f6ce1e8b4f81463ecffe77ed7 (patch)
tree47540a8ab6c708b570f343d4cb4bf1d62212f031
parent0af1d2bb99bc9068a06d65511af68bd10f731ba2 (diff)
Re #1245: bad last commit caused everything to be treated as unregistrations!
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3544 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 aa5c753e..bb7e50b7 100644
--- a/pjsip/src/pjsip-ua/sip_reg.c
+++ b/pjsip/src/pjsip-ua/sip_reg.c
@@ -1154,9 +1154,6 @@ 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;
@@ -1179,6 +1176,9 @@ handle_err:
if (expiration==NOEXP) expiration=-1;
regc->expires = expiration;
+ /* Mark operation as complete */
+ regc->current_op = REGC_IDLE;
+
/* Call callback. */
/* Should be safe to release the lock temporarily.
* We do this to avoid deadlock.