]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip.c: Rework endpt_send_request() req_wrapper code."
authorJoshua Colp <jcolp@digium.com>
Mon, 14 Nov 2016 19:21:21 +0000 (13:21 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 14 Nov 2016 19:21:22 +0000 (13:21 -0600)
1  2 
res/res_pjsip.c

diff --cc res/res_pjsip.c
index 655cd95866895be9196ffb59ebcd471675eb0f43,6257cf1066bce1eac6011bb191f9641fc5f443f1..98530cb7bcf628d0b1d8b404ce14e394047b0d39
@@@ -3557,13 -3568,8 +3568,9 @@@ static pj_status_t endpt_send_request(s
                                pj_strbuf(&tdata->msg->line.req.method.name),
                                endpoint ? ast_sorcery_object_get_id(endpoint) : "<unknown>");
                        ao2_t_ref(req_wrapper, -2, "Drop timer and routine ref");
 +                      pjsip_tx_data_dec_ref(tdata);
                        return ret_val;
                }
-               req_wrapper->timeout_timer->id = TIMEOUT_TIMER2;
-       } else {
-               req_wrapper->timeout_timer = NULL;
        }
  
        /* We need to insure that the wrapper and tdata are available when the