Commit Graph

16537 Commits

Author SHA1 Message Date
Kevin P. Fleming
1036849a42 import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153710 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 23:56:13 +00:00
Russell Bryant
bdb5cf6f46 Merged revisions 153652 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r153652 | russell | 2008-11-02 14:06:03 -0600 (Sun, 02 Nov 2008) | 10 lines

Merged revisions 153651 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r153651 | russell | 2008-11-02 13:51:17 -0600 (Sun, 02 Nov 2008) | 2 lines

features.h depends on linkedlists.h, so include it

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153653 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 20:07:30 +00:00
Eliel C. Sardanons
3ceb3e739b Blocked revisions 153582 via svnmerge
........
  r153582 | eliel | 2008-11-02 04:24:53 -0200 (Sun, 02 Nov 2008) | 2 lines
  
  Add IAX2Provision() application XML documentation.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153583 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 06:26:04 +00:00
Russell Bryant
d31ff7dffe Blocked revisions 153580 via svnmerge
........
r153580 | russell | 2008-11-02 00:56:50 -0500 (Sun, 02 Nov 2008) | 2 lines

validate-docs is a PHONY target

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153581 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 05:57:04 +00:00
Russell Bryant
877cefd12c Blocked revisions 153578 via svnmerge
........
r153578 | russell | 2008-11-02 00:55:46 -0500 (Sun, 02 Nov 2008) | 3 lines

Add a handy makefile target so that you can validate the documentation against the DTD
by running "make validate-docs"

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153579 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 05:56:08 +00:00
Eliel C. Sardanons
58d7739e68 Blocked revisions 153543 via svnmerge
........
  r153543 | eliel | 2008-11-02 03:10:22 -0200 (Sun, 02 Nov 2008) | 2 lines
  
  Add Flash() application XML documentation.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153544 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 05:11:29 +00:00
Eliel C. Sardanons
a11f18474e Blocked revisions 153541 via svnmerge
........
  r153541 | eliel | 2008-11-02 02:57:02 -0200 (Sun, 02 Nov 2008) | 2 lines
  
  Fix a typo in the name of the application.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 04:58:34 +00:00
Sean Bright
4f91900e66 Blocked revisions 153507 via svnmerge
........
r153507 | seanbright | 2008-11-02 00:14:20 -0400 (Sun, 02 Nov 2008) | 5 lines

There is a troublesome assert() in the alsa/control.h header that causes
GCC 4.3.2 to complain that the passed argument will always evaluate to
true.  So to get things to compile, disable assert when building
chan_usbradio.so.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153508 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 04:16:29 +00:00
Sean Bright
802ea58e65 Blocked revisions 153472 via svnmerge
........
r153472 | seanbright | 2008-11-01 22:57:27 -0400 (Sat, 01 Nov 2008) | 1 line

Another little one.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153474 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 02:58:34 +00:00
Russell Bryant
0943a78392 Blocked revisions 153470 via svnmerge
........
r153470 | russell | 2008-11-01 21:55:25 -0500 (Sat, 01 Nov 2008) | 1 line

fix a typo (thanks sean)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 02:55:37 +00:00
Russell Bryant
8387a5b241 Blocked revisions 153468 via svnmerge
........
r153468 | russell | 2008-11-01 21:50:33 -0500 (Sat, 01 Nov 2008) | 2 lines

Fix various spelling and grammatical issues in documentation

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 02:51:11 +00:00
Russell Bryant
f3de8b1883 Blocked revisions 153437 via svnmerge
........
r153437 | russell | 2008-11-01 21:20:10 -0500 (Sat, 01 Nov 2008) | 3 lines

 - Use a for loop instead of a while loop
 - Get rid of an unnecessary variable

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153438 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 02:20:26 +00:00
Russell Bryant
b459a4d2d3 Blocked revisions 153435 via svnmerge
........
r153435 | russell | 2008-11-01 21:14:19 -0500 (Sat, 01 Nov 2008) | 3 lines

Instead of doing a couple of strlen() calls each iteration of the loop, only do it once
at the beginning of the function

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 02:14:47 +00:00
Russell Bryant
3c048137c2 Blocked revisions 153403 via svnmerge
........
r153403 | russell | 2008-11-01 18:46:12 -0500 (Sat, 01 Nov 2008) | 2 lines

Don't ignore the result of find_peer() when looking for a peer by IP in check_peer_ok().

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-01 23:47:08 +00:00
Russell Bryant
e6e79128eb Merged revisions 153362 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r153362 | russell | 2008-11-01 15:41:38 -0500 (Sat, 01 Nov 2008) | 3 lines

Ensure that the sip_pvt properly has its refcount incremented when the scheduler holds
a reference to it for session timer processing.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153363 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-01 20:47:31 +00:00
Sean Bright
78574218f0 Blocked revisions 153296 via svnmerge
........
r153296 | seanbright | 2008-10-31 21:55:04 -0400 (Fri, 31 Oct 2008) | 3 lines

The default in chan_sip for notifyringing is yes, so update the sample
conf to reflect that.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-01 01:56:09 +00:00
Terry Wilson
239f1d53bc Merged revisions 153181 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r153181 | twilson | 2008-10-31 13:55:33 -0500 (Fri, 31 Oct 2008) | 5 lines
  
  Recent CDR fixes moved execution of the 'h' exten into the bridging code, so variables that were set after ast_bridge_call was called would not show up in the 'h' exten.  Added a callback function to handle setting variables, etc. from w/in the bridging code.  Calls back into a nested function within the function calling ast_bridge_call
  
  (closes issue #13793)
  Reported by: greenfieldtech
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-31 22:11:11 +00:00
Mark Michelson
4d4e20eb54 This commit contains the bug fixes and documentation updates
which were committed to trunk in revision 153223. I blocked that
commit from 1.6.1 since it also contained a new feature.

Note to self: Separate commits so that you don't end up with
a situation where part of a commit should be merged but part
should be blocked from stable branches.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153225 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-31 20:10:40 +00:00
Mark Michelson
e15b6301dd Blocked revisions 153223 via svnmerge
........
r153223 | mmichelson | 2008-10-31 15:05:46 -0500 (Fri, 31 Oct 2008) | 8 lines

* Fixed timeout logic in the dialing API as setting timeouts
  had no effect
* Updated dialing API documentation to indicate that timeouts
  are specified in milliseconds
* Added a new timeout argument to the Page application. If time
  expires, any endpoints which have not answered will be hung up.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153224 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-31 20:07:45 +00:00
Tilghman Lesher
6280b92c46 Blocked revisions 153124 via svnmerge
........
  r153124 | tilghman | 2008-10-31 12:18:49 -0500 (Fri, 31 Oct 2008) | 7 lines
  
  Failover for func_odbc, allowing an INSERT query to be performed when the UPDATE query initially
  affects 0 rows.
  (closes issue #13083)
   Reported by: Corydon76
   Patches: 
         20081031__bug13083.diff.txt uploaded by Corydon76 (license 14)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153125 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-31 17:19:20 +00:00
Tilghman Lesher
e8e98f38f6 Merged revisions 153122 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r153122 | tilghman | 2008-10-31 11:35:21 -0500 (Fri, 31 Oct 2008) | 10 lines
  
  Merged revisions 153114 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r153114 | tilghman | 2008-10-31 11:30:32 -0500 (Fri, 31 Oct 2008) | 3 lines
    
    Turn off qualify on uncached realtime peers.
    (Closes issue #13383)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153123 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-31 16:36:20 +00:00
Russell Bryant
79fcd8806e Blocked revisions 153057 via svnmerge
........
r153057 | russell | 2008-10-31 04:31:10 -0500 (Fri, 31 Oct 2008) | 7 lines

Use the ast_str API call to reset the string instead of manually editing its internals

(closes issue #13816)
Reported by: eliel
Patches: 
      channel.c.patch uploaded by eliel (license 64)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153058 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-31 09:31:43 +00:00
Sean Bright
99d3214aa5 Merged revisions 152993 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r152993 | seanbright | 2008-10-30 16:59:17 -0400 (Thu, 30 Oct 2008) | 10 lines

Merged revisions 152992 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r152992 | seanbright | 2008-10-30 16:58:24 -0400 (Thu, 30 Oct 2008) | 2 lines

The -I argument to aclocal needs a space before the include directory name.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 21:01:26 +00:00
Russell Bryant
27ed3694cf Blocked revisions 152990 via svnmerge
........
r152990 | russell | 2008-10-30 15:46:17 -0500 (Thu, 30 Oct 2008) | 3 lines

Add a todo for a new timing API implementation that would work for Linux systems
as of kernel 2.6.25 and glibc 2.8

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152991 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 20:46:54 +00:00
Tilghman Lesher
529d140003 Merged revisions 152969 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152969 | tilghman | 2008-10-30 15:35:46 -0500 (Thu, 30 Oct 2008) | 10 lines
  
  Merged revisions 152958 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152958 | tilghman | 2008-10-30 15:33:28 -0500 (Thu, 30 Oct 2008) | 3 lines
    
    Cannot join detached threads.  See http://www.opengroup.org/onlinepubs/000095399/functions/pthread_join.html
    (Closes issue #13400)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152974 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 20:36:37 +00:00
Tilghman Lesher
1d4fe69d0a Merged revisions 152923 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152923 | tilghman | 2008-10-30 14:45:52 -0500 (Thu, 30 Oct 2008) | 13 lines
  
  Merged revisions 152922 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152922 | tilghman | 2008-10-30 14:43:38 -0500 (Thu, 30 Oct 2008) | 6 lines
    
    Unlock before returning, when extension doesn't exist.
    (closes issue #13807)
     Reported by: eliel
     Patches: 
           chan_local.c.patch uploaded by eliel (license 64)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152924 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 19:48:06 +00:00
Russell Bryant
af5c4a8011 Merged revisions 152920 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r152920 | russell | 2008-10-30 14:40:15 -0500 (Thu, 30 Oct 2008) | 3 lines

Fix the sip_peer reference count with respect to scheduler entries for
scheduling peer pokes, and scheduling peer poke expirations.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152921 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 19:41:29 +00:00
Russell Bryant
6d4c143adf Merged revisions 152915 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r152915 | russell | 2008-10-30 14:35:36 -0500 (Thu, 30 Oct 2008) | 3 lines

Fix the sip_peer reference count with respect to scheduler entries for
registration expirations.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152919 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 19:37:42 +00:00
Russell Bryant
7045e5aa91 Merged revisions 152887 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r152887 | russell | 2008-10-30 14:28:06 -0500 (Thu, 30 Oct 2008) | 7 lines

Fix a bug in AST_SCHED_REPLACE_UNREF().  The reference count of the object
_must_ be increased before creating the scheduler entry.  Otherwise, you
create a race condition where the reference count may hit zero and the
object can disappear out from under you.  This could also would have
incorrectly decreased the reference count in the case that the scheduler
add failed.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152900 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 19:31:40 +00:00
Mark Michelson
2618a6852f Blocked revisions 152879 via svnmerge
........
r152879 | mmichelson | 2008-10-30 14:23:16 -0500 (Thu, 30 Oct 2008) | 7 lines

I just noticed this construct and thought it was
silly to have a bunch of case statements with duplicated
code in each case. Instead, just use the built-in fallthrough
capability of case statements and reduce the code to
a single instance


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152880 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 19:23:51 +00:00
Russell Bryant
eef3ce4049 Merged revisions 152877 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r152877 | russell | 2008-10-30 14:21:53 -0500 (Thu, 30 Oct 2008) | 9 lines

Modify the documentation of the sip_registry struct
 - Remove a comment that says that the monitor thread is the only one that
   ever touches these objects.  This is no longer the case with TCP.  Also,
   I would eventually like to get the scheduler in its own thread, so this
   is just a poor assumption to make.
 - Note that reference counting of these objects with respect to scheduler
   entries is not complete.  There are some leaked references when deleting
   scheduler entries.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152878 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 19:23:05 +00:00
Russell Bryant
2c3021ec08 Blocked revisions 152875 via svnmerge
........
r152875 | russell | 2008-10-30 14:18:16 -0500 (Thu, 30 Oct 2008) | 4 lines

 - spaces to tabs
 - add some braces
 - remove unnecessary cast

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152876 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 19:19:03 +00:00
Kevin P. Fleming
db5d4c1619 Merged revisions 152812 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152812 | kpfleming | 2008-10-30 11:54:29 -0500 (Thu, 30 Oct 2008) | 9 lines
  
  Merged revisions 152811 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152811 | kpfleming | 2008-10-30 11:53:48 -0500 (Thu, 30 Oct 2008) | 3 lines
    
    instead of comparing the string pointer to 0, let's compare the value that was actually parsed out of the string (found by sparse)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152814 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 16:55:21 +00:00
Mark Michelson
4d7069055a Blocked revisions 152807 via svnmerge
........
r152807 | mmichelson | 2008-10-30 11:38:19 -0500 (Thu, 30 Oct 2008) | 6 lines

After seeing another problem in #asterisk stemming from
the low default value of featuredigittimeout, I decided it
was high time to change it. I have changed the default to
2000 ms based on a suggestion from Leif Madsen.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 16:38:52 +00:00
Tilghman Lesher
d7da161167 Merged revisions 152765 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r152765 | tilghman | 2008-10-29 23:26:34 -0500 (Wed, 29 Oct 2008) | 5 lines
  
  Set up an example stdexten that preserves the original context and extension in
  the CDR.
  (Related to issue #13799)
   Reported by: davidw
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 04:29:07 +00:00
Tilghman Lesher
8bae92d3a5 Blocked revisions 152727 via svnmerge
........
  r152727 | tilghman | 2008-10-29 21:08:02 -0500 (Wed, 29 Oct 2008) | 2 lines
  
  Pay attention to the searchcontexts entry in voicemail.conf (related to AST-125)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152728 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 02:09:11 +00:00
Tilghman Lesher
f34b1869bd Merged revisions 152689 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r152689 | tilghman | 2008-10-29 19:45:47 -0500 (Wed, 29 Oct 2008) | 2 lines
  
  Track down and fix annoying lock errors
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152690 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 00:54:37 +00:00
Mark Michelson
bc4cf44e6b Merged revisions 152646 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r152646 | mmichelson | 2008-10-29 15:53:53 -0500 (Wed, 29 Oct 2008) | 9 lines

If there was no named defined in a voicemail.conf mailbox
entry, then app_directory would crash when attempting to
read that entry from the file. We now check for the NULL
or empty string properly so that there will be no crash.

(closes issue #13804)
Reported by: bluecrow76


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152648 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 20:55:22 +00:00
Terry Wilson
c30b0d8d10 Small modification to putnopvut's patch to fix this issue. Thanks for all the help, putnopvut!
(closes issue #12884)
	    Reported by: bcnit
		    Patches:
			          12884v4-1.6.0-branch.patch uploaded by otherwiseguy (license 396)
	    Tested by: otherwiseguy



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152645 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 20:16:09 +00:00
Steve Murphy
039de710a7 Merged revisions 152605 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r152605 | murf | 2008-10-28 23:47:13 -0600 (Tue, 28 Oct 2008) | 22 lines

Merged revisions 152538 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r152538 | murf | 2008-10-28 23:19:04 -0600 (Tue, 28 Oct 2008) | 14 lines

A little documentation cross-ref between features and
dial and queue... I wasted some time (stupidly) trying
to get the one-touch parking stuff working, because it
didn't occur to me that I had to also have the corresponding
options in the dial command! Duh! (In all this time, I never
set this up before!)
So, to keep some poor fool from suffering the same fate,
I made the features.conf.sample file mention the corresponding
opts in dial/queue; and the docs for dial/app specifically
mention the corresponding decls in the feature.conf file.

I hope this doesn't spoil some vast, eternal plan...


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152606 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 05:52:41 +00:00
Russell Bryant
98048e871e Merged revisions 152569 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r152569 | russell | 2008-10-29 00:34:26 -0500 (Wed, 29 Oct 2008) | 15 lines

Merged revisions 152539 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r152539 | russell | 2008-10-29 00:23:51 -0500 (Wed, 29 Oct 2008) | 7 lines

Fix an incorrect usage of sizeof()

(closes issue #13795)
Reported by: andrew53
Patches:
	chan_sip_sizeof.patch uploaded by andrew53 (license 519)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 05:35:20 +00:00
Steve Murphy
f1da1c3957 Merged revisions 152536 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r152536 | murf | 2008-10-28 23:01:00 -0600 (Tue, 28 Oct 2008) | 57 lines

Merged revisions 152535 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r152535 | murf | 2008-10-28 22:36:32 -0600 (Tue, 28 Oct 2008) | 46 lines

The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the 
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
Why? because CDR's aren't generated via parking,
so nothing is needed, but if a transfer occurred,
there are critical things I need.

If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.

If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.

Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden 
(in trunk).

All the places that previously tested for 
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.

I tested this against the 4 common parking
scenarios:


1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.

2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.

3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.

4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.


No crash.

I also ran the scenarios above against valgrind, and accesses looked good.



........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 05:09:20 +00:00
Tilghman Lesher
2098685d9e Merged revisions 152467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152467 | tilghman | 2008-10-28 17:33:40 -0500 (Tue, 28 Oct 2008) | 10 lines
  
  Merged revisions 152463 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152463 | tilghman | 2008-10-28 17:32:34 -0500 (Tue, 28 Oct 2008) | 3 lines
    
    Quoting in the wrong direction
    (Fixes AST-107)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-28 22:35:01 +00:00
Tilghman Lesher
25b6cbd568 Merged revisions 152442 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r152442 | tilghman | 2008-10-28 16:38:26 -0500 (Tue, 28 Oct 2008) | 7 lines
  
  Only re-add the io port if it was closed, otherwise reload causes a memory
  leak.
  (closes issue #13785)
   Reported by: eliel
   Patches: 
         chan_mgcp.c.patch uploaded by eliel (license 64)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152444 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-28 21:40:06 +00:00
Tilghman Lesher
a7a57a4f61 Merged revisions 152369 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152369 | tilghman | 2008-10-28 12:07:39 -0500 (Tue, 28 Oct 2008) | 15 lines
  
  Merged revisions 152368 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152368 | tilghman | 2008-10-28 12:04:56 -0500 (Tue, 28 Oct 2008) | 8 lines
    
    Reset all DIAL variables back to blank, in case Dial is called multiple times
    per call (which could otherwise lead to inconsistent status reports).
    (closes issue #13216)
     Reported by: ruddy
     Patches: 
           20081014__bug13216.diff.txt uploaded by Corydon76 (license 14)
     Tested by: ruddy
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-28 17:08:47 +00:00
Jeff Peeler
09db38446a Merged revisions 152287 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r152287 | jpeeler | 2008-10-27 18:31:39 -0500 (Mon, 27 Oct 2008) | 10 lines

Merged revisions 152286 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r152286 | jpeeler | 2008-10-27 18:28:49 -0500 (Mon, 27 Oct 2008) | 2 lines

Buffer policy setting for half is not needed.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152288 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-27 23:32:40 +00:00
Tilghman Lesher
3060540103 Merged revisions 152215 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r152215 | tilghman | 2008-10-27 16:32:00 -0500 (Mon, 27 Oct 2008) | 6 lines
  
  Inherit ALL elements of CallerID across a local channel.
  (closes issue #13368)
   Reported by: Peter Schlaile
   Patches: 
         20080826__bug13368.diff.txt uploaded by Corydon76 (license 14)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-27 21:53:04 +00:00
Tilghman Lesher
4f6e8d30f4 Blocked revisions 152174 via svnmerge
........
  r152174 | tilghman | 2008-10-27 11:44:55 -0500 (Mon, 27 Oct 2008) | 2 lines
  
  Set ARGC in subroutines with the number of arguments passed.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-27 16:45:35 +00:00
Tilghman Lesher
95c0f16b9a Merged revisions 152134 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r152134 | tilghman | 2008-10-27 11:24:11 -0500 (Mon, 27 Oct 2008) | 4 lines
  
  Oops, only delete the ARG variables once upon release.  The following section
  would have removed them again (removing variables from 2 stack frames, instead
  of just one).
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-27 16:42:07 +00:00
Jason Parker
d8814693ba Merged revisions 152132 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r152132 | qwell | 2008-10-27 11:03:12 -0500 (Mon, 27 Oct 2008) | 7 lines
  
  Remove options argument parsing/syntax (it isn't used any longer)
  
  (closes issue #13789)
  Reported by: IgorG
  Patches:
        app_transfer.c.diff uploaded by IgorG (license 20)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-27 16:06:01 +00:00