diff options
| -rw-r--r-- | channels/chan_sip.c | 1 | ||||
| -rw-r--r-- | include/asterisk/sched.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 994a4c964..48dc39e4a 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2033,6 +2033,7 @@ static enum sip_result __sip_reliable_xmit(struct sip_pvt *p, int seqno, int res ast_set_flag(pkt, FLAG_RESPONSE); pkt->data[len] = '\0'; pkt->timer_t1 = p->timer_t1; /* Set SIP timer T1 */ + pkt->retransid = -1; if (fatal) ast_set_flag(pkt, FLAG_FATAL); if (pkt->timer_t1) diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h index 84a65a07a..5476dadf7 100644 --- a/include/asterisk/sched.h +++ b/include/asterisk/sched.h @@ -38,7 +38,7 @@ extern "C" { #define AST_SCHED_DEL(sched, id) \ do { \ int _count = 0; \ - while (id > -1 && ast_sched_del(sched, id) && _count++ < 10) \ + while (id > -1 && ast_sched_del(sched, id) && ++_count < 10) \ usleep(1); \ if (_count == 10) \ ast_log(LOG_WARNING, "Unable to cancel schedule ID %d. This is probably a bug (%s: %s, line %d).\n", id, __FILE__, __PRETTY_FUNCTION__, __LINE__); \ |