[asterisk-commits] murf: branch murf/bug7433 r47615 - in /team/murf/bug7433: ./ channels/chan_sip.c

Tue Nov 14 09:32:34 MST 2006

Author: murf
Date: Tue Nov 14 10:32:34 2006
New Revision: 47615

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47615
Log:
Merged revisions 47490,47492,47494,47497,47507,47509,47511,47513,47523,47526-47527,47540,47542,47551,47553,47558,47564,47572-47573,47576,47581,47584,47597 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r47490 | mogorman | 2006-11-10 19:04:28 -0700 (Fri, 10 Nov 2006) | 2 lines

woohoo safe out put!

................
r47492 | russell | 2006-11-11 08:18:02 -0700 (Sat, 11 Nov 2006) | 2 lines

Tweak the formatting of this new function to better conform to coding guidelines.

................
r47494 | russell | 2006-11-11 08:31:08 -0700 (Sat, 11 Nov 2006) | 6 lines

Add the target "menuconfig" as an alias for the "menuselect" target.  This is
just a favor to users so that if you accidentally type "make menuconfig"
instead of "make menuselect", it still works.
(inspired by a comment on IRC from wangster calling me an "especially devious
asterisk developer" for having it be menuselect instead of menuconfig. :) )

................
r47497 | russell | 2006-11-11 23:23:23 -0700 (Sat, 11 Nov 2006) | 12 lines

Merged revisions 47496 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r47496 | russell | 2006-11-12 01:09:03 -0500 (Sun, 12 Nov 2006) | 4 lines

Only do the check to determine whether the channel calling this function is an
IAX2 channel when getting the IP address using the special argument, 
CURRENTCHANNEL.  (issue #8341, jcovert)

........

................
r47507 | oej | 2006-11-12 08:10:53 -0700 (Sun, 12 Nov 2006) | 4 lines

-Remove blocking of ptime: parsing in sdp
-Add some comments to t.38 code


................
r47509 | oej | 2006-11-12 08:27:00 -0700 (Sun, 12 Nov 2006) | 8 lines

- Don't destroy SIP dialog because of a failed T.38 re-invite. Wait for a bye. 
  Final response to a re-invite does not mean that the session dies, only that
  the re-invite fails.
- Keep RTP active during processing of T.38 re-invite. If the re-invite fails,
  RTP needs to remain as before the re-invite.

Issue 8338 - darren1713. Please test.

................
r47511 | oej | 2006-11-12 08:35:19 -0700 (Sun, 12 Nov 2006) | 2 lines

Part of issue 8078 - parse even if udptl is UDPTL in sdp...

................
r47513 | oej | 2006-11-12 09:12:12 -0700 (Sun, 12 Nov 2006) | 2 lines

Issue 8314 - Restore auto-framing (Thanks DEA!!!)

................
r47523 | tilghman | 2006-11-12 18:12:01 -0700 (Sun, 12 Nov 2006) | 10 lines

Merged revisions 47522 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r47522 | tilghman | 2006-11-12 18:34:44 -0600 (Sun, 12 Nov 2006) | 2 lines

Don't play dialtone if the seizing the channel fails (Bug 7754)

........

................
r47526 | tilghman | 2006-11-12 22:46:18 -0700 (Sun, 12 Nov 2006) | 10 lines

Merged revisions 47525 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r47525 | tilghman | 2006-11-12 23:45:11 -0600 (Sun, 12 Nov 2006) | 2 lines

If the execute fails a second time, make sure that we don't pass back a stale handle

........

................
r47527 | russell | 2006-11-12 22:48:18 -0700 (Sun, 12 Nov 2006) | 5 lines

AC_PROG_SED is included in autoconf 2.60, but apparently it is not included
in 2.59.  So, to maintain compatability with 2.59 since it is a small change,
copy this macro into acinclude.m4 and rename it to AST_PROG_SED.
(issue #8345)

................
r47540 | oej | 2006-11-13 09:00:57 -0700 (Mon, 13 Nov 2006) | 2 lines

Only produce error message about sip history once

................
r47542 | file | 2006-11-13 09:30:38 -0700 (Mon, 13 Nov 2006) | 2 lines

Free full command string upon unregistering of CLI command. Backported from revision 47536 from rizzo.

................
r47551 | file | 2006-11-13 10:08:07 -0700 (Mon, 13 Nov 2006) | 10 lines

Merged revisions 47549 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r47549 | file | 2006-11-13 12:05:32 -0500 (Mon, 13 Nov 2006) | 2 lines

When sending an SMS with a user data header properly set the UDH flag in the first byte. (issue #8347 reported by hoffmeis)

........

................
r47553 | murf | 2006-11-13 10:13:20 -0700 (Mon, 13 Nov 2006) | 1 line

AEL need not complain about parkedcalls not being found... just confuses users
................
r47558 | file | 2006-11-13 10:38:44 -0700 (Mon, 13 Nov 2006) | 2 lines

Clean up last commit to better conform to standards.

................
r47564 | murf | 2006-11-13 11:18:06 -0700 (Mon, 13 Nov 2006) | 1 line

Eager people beat me to fixing the messed if, but we all forgot to update the regressions. Until now.
................
r47572 | oej | 2006-11-13 12:10:39 -0700 (Mon, 13 Nov 2006) | 3 lines

- Don't reply to INVITE already replied to when we get BYE
- Declare errmsg as int. Oops.

................
r47573 | tilghman | 2006-11-13 12:11:15 -0700 (Mon, 13 Nov 2006) | 2 lines

Re-enable old deprecated commands

................
r47576 | murf | 2006-11-13 12:15:12 -0700 (Mon, 13 Nov 2006) | 1 line

This solves bug 8342, whereby a crash occurs under certain circumstances while reading a config file with comments-- a call to CB_ADD shouldn't happen if withcomments is zero
................
r47581 | tilghman | 2006-11-13 13:20:01 -0700 (Mon, 13 Nov 2006) | 10 lines

Merged revisions 47580 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r47580 | tilghman | 2006-11-13 14:18:30 -0600 (Mon, 13 Nov 2006) | 2 lines

Having more than 255 old messages caused corruption in the new/old count

........

................
r47584 | file | 2006-11-13 14:28:57 -0700 (Mon, 13 Nov 2006) | 10 lines

Merged revisions 47583 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r47583 | file | 2006-11-13 16:26:36 -0500 (Mon, 13 Nov 2006) | 2 lines

Initialize global pointers for connection and result to NULL. (issue #8356 reported by james)

........

................
r47597 | oej | 2006-11-14 04:14:01 -0700 (Tue, 14 Nov 2006) | 2 lines

Issue #8272 - Don't destroy dialog in retransmission system if it's an OPTION packet from peerpoke

................

Modified:
    team/murf/bug7433/   (props changed)
    team/murf/bug7433/channels/chan_sip.c

Propchange: team/murf/bug7433/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/murf/bug7433/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 14 10:32:34 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-47483
+/branches/1.4:1-47612

Modified: team/murf/bug7433/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug7433/channels/chan_sip.c?view=diff&rev=47615&r1=47614&r2=47615
==============================================================================
--- team/murf/bug7433/channels/chan_sip.c (original)
+++ team/murf/bug7433/channels/chan_sip.c Tue Nov 14 10:32:34 2006
@@ -1877,7 +1877,10 @@
 			ast_channel_unlock(pkt->owner->owner);
 		} else {
 			/* If no channel owner, destroy now */
-			ast_set_flag(&pkt->owner->flags[0], SIP_NEEDDESTROY);	
+
+			/* Let the peerpoke system expire packets when the timer expires for poke_noanswer */
+			if (pkt->method != SIP_OPTIONS)
+				ast_set_flag(&pkt->owner->flags[0], SIP_NEEDDESTROY);	
 		}
 	}
 	/* In any case, go ahead and remove the packet */
@@ -14844,7 +14847,7 @@
 		peer->call = NULL;
 		return 0;
 	}
-	if (peer->call > 0) {
+	if (peer->call) {
 		if (sipdebug)
 			ast_log(LOG_NOTICE, "Still have a QUALIFY dialog active, deleting\n");
 		sip_destroy(peer->call);

