diff options
author | zuul <zuul@gerrit.asterisk.org> | 2017-02-02 10:44:58 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-02-02 10:44:58 -0600 |
commit | 5504dd3cdd1001f19b83404f0f6b21e6d54f8b15 (patch) | |
tree | 0f653e577e5a8d88ed67be7bac5576d1a78227f9 /res | |
parent | 7d9b50a7b2b202b3f34236bd951f4aaef79a441c (diff) | |
parent | aeea634bc0304736f41f440768f50105844a5dda (diff) |
Merge "res_pjsip: Handle invocation of callback on outgoing request when error occurs."
Diffstat (limited to 'res')
-rw-r--r-- | res/res_pjsip.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c index a7dd09ee8..35c1eeb40 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -3404,6 +3404,8 @@ struct send_request_wrapper { void (*callback)(void *token, pjsip_event *e); /*! Non-zero when the callback is called. */ unsigned int cb_called; + /*! Non-zero if endpt_send_request_cb() was called. */ + unsigned int send_cb_called; /*! Timeout timer. */ pj_timer_entry *timeout_timer; /*! Original timeout. */ @@ -3421,6 +3423,12 @@ static void endpt_send_request_cb(void *token, pjsip_event *e) struct send_request_wrapper *req_wrapper = token; unsigned int cb_called; + /* + * Needed because we cannot otherwise tell if this callback was + * called when pjsip_endpt_send_request() returns error. + */ + req_wrapper->send_cb_called = 1; + if (e->body.tsx_state.type == PJSIP_EVENT_TIMER) { ast_debug(2, "%p: PJSIP tsx timer expired\n", req_wrapper); @@ -3604,12 +3612,10 @@ static pj_status_t endpt_send_request(struct ast_sip_endpoint *endpoint, if (ret_val != PJ_SUCCESS) { char errmsg[PJ_ERR_MSG_SIZE]; - /* - * endpt_send_request_cb is not expected to ever be called - * because the request didn't get far enough to attempt - * sending. - */ - ao2_ref(req_wrapper, -1); + if (!req_wrapper->send_cb_called) { + /* endpt_send_request_cb is not expected to ever be called now. */ + ao2_ref(req_wrapper, -1); + } /* Complain of failure to send the request. */ pj_strerror(ret_val, errmsg, sizeof(errmsg)); @@ -3646,6 +3652,13 @@ static pj_status_t endpt_send_request(struct ast_sip_endpoint *endpoint, req_wrapper->cb_called = 1; } ao2_unlock(req_wrapper); + } else if (req_wrapper->cb_called) { + /* + * We cannot report any error. The callback has + * already freed any resources associated with + * token. + */ + ret_val = PJ_SUCCESS; } } |