Merged revisions 234095 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 10 Dec 2009 16:24:26 +0000 (16:24 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 10 Dec 2009 16:24:26 +0000 (16:24 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r234095 | tilghman | 2009-12-10 10:08:20 -0600 (Thu, 10 Dec 2009) | 9 lines

  When we receive no response at all to our INVITE, allow the channel to be destroyed.
  (closes issue #15627)
   Reported by: falves11
   Patches:
         20091209__issue15627__1.6.0.diff.txt uploaded by tilghman (license 14)
         20091209__issue15627__1.4.diff.txt uploaded by tilghman (license 14)
   Tested by: falves11
  Review: https://reviewboard.asterisk.org/r/446/
  (closes issue #15716)
  Reported by: dant
  (closes issue #16270)
  Reported by: corruptor
  (closes issue #15356)
  Reported by: falves11
  (issue #16382)
  Reported by: lftsy
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@234129 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index a126654..ff80cd1 100644 (file)
@@ -5677,6 +5677,9 @@ static int auto_congest(const void *arg)
                        ast_queue_control(p->owner, AST_CONTROL_CONGESTION);
                        ast_channel_unlock(p->owner);
                }
+
+               /* Give the channel a chance to act before we proceed with destruction */
+               sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
        }
        sip_pvt_unlock(p);
        dialog_unref(p, "unreffing arg passed into auto_congest callback (p->initid)");
@@ -6371,19 +6374,20 @@ static int sip_hangup(struct ast_channel *ast)
                if (needcancel) {       /* Outgoing call, not up */
                        if (ast_test_flag(&p->flags[0], SIP_OUTGOING)) {
                                /* stop retransmitting an INVITE that has not received a response */
-                               struct sip_pkt *cur;
-                               for (cur = p->packets; cur; cur = cur->next) {
-                                       __sip_semi_ack(p, cur->seqno, cur->is_resp, cur->method ? cur->method : find_sip_method(cur->data->str));
-                               }
-
                                /* if we can't send right now, mark it pending */
                                if (p->invitestate == INV_CALLING) {
                                        /* We can't send anything in CALLING state */
                                        ast_set_flag(&p->flags[0], SIP_PENDINGBYE);
-                                       /* Do we need a timer here if we don't hear from them at all? */
+                                       __sip_pretend_ack(p);
+                                       /* Do we need a timer here if we don't hear from them at all? Yes we do or else we will get hung dialogs and those are no fun. */
                                        sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
                                        append_history(p, "DELAY", "Not sending cancel, waiting for timeout");
                                } else {
+                                       struct sip_pkt *cur;
+
+                                       for (cur = p->packets; cur; cur = cur->next) {
+                                               __sip_semi_ack(p, cur->seqno, cur->is_resp, cur->method ? cur->method : find_sip_method(cur->data->str));
+                                       }
                                        p->invitestate = INV_CANCELLED;
                                        /* Send a new request: CANCEL */
                                        transmit_request(p, SIP_CANCEL, p->lastinvite, XMIT_RELIABLE, FALSE);