Commit Graph

16881 Commits

Author SHA1 Message Date
Russell Bryant 15431e2948 Merged revisions 160003 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r160003 | russell | 2008-12-01 11:27:30 -0600 (Mon, 01 Dec 2008) | 6 lines

Apply some logic used in iax2_indicate() to iax2_setoption(), as well, since they
both have the potential to send control frames in the middle of call setup.  We
have to wait until we have received a message back from the remote end before
we try to send any more frames.  Otherwise, the remote end will consider it
invalid, and we'll get stuck in an INVAL/VNAK storm.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@160004 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-01 17:34:31 +00:00
Russell Bryant 719d4f5609 Merged revisions 159900 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r159900 | russell | 2008-12-01 08:52:56 -0600 (Mon, 01 Dec 2008) | 2 lines

Force a "make clean" to avoid a bizarre build issue ...

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159911 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-01 14:56:10 +00:00
Michiel van Baak 1b6a5b7524 Merged revisions 159897 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r159897 | mvanbaak | 2008-12-01 15:05:41 +0100 (Mon, 01 Dec 2008) | 4 lines
  
  make manager compile on OpenBSD.
  The last (10th) argument to ast_channel_alloc here should be a pointer
  and NULL is not really a pointer.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159898 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-01 14:09:59 +00:00
Tilghman Lesher b323c972b6 Allow the '#' sign to exist within an extension (inspired by issue #13330)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-29 18:33:18 +00:00
Kevin P. Fleming 887e28d7aa incorporates r159808 from branches/1.4:
------------------------------------------------------------------------
r159808 | kpfleming | 2008-11-29 10:58:29 -0600 (Sat, 29 Nov 2008) | 7 lines

update dev-mode compiler flags to match the ones used by default on Ubuntu Intrepid, so all developers will see the same warnings and errors

since this branch already had some printf format attributes, enable checking for them and tag functions that didn't have them

format attributes in a consistent way


------------------------------------------------------------------------

in addition:

move some format attributes from main/utils.c to the header files they belong in, and fix up references to the relevant functions based on new compiler warnings



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-29 17:57:39 +00:00
Kevin P. Fleming 9a7c28cd5a we can now build with -Wformat=2, which found a couple of real bugs
because SPRINTF() use non-literal format strings (which cannot be checked), move it into its own module so the rest of func_strings can benefit from format string checking



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-29 15:29:33 +00:00
Michiel van Baak 445c5296da Make res_config_ldap compile with the official OpenLDAP 2.3.X versions.
They removed the LDAP_DEPRECATED define from their source and since we are using a couple
of deprecated function calls we should define it with a CFLAG.

Tested by me on OpenBSD 4.4 and snuff-home on Linux to make sure everything keeps compiling.
It shouldn't break, we only define the LDAP_DEPRECATED with this which is what 
all 2.2.X and older versions of OpenLDAP did in their own tree.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-28 14:20:11 +00:00
Philippe Sultan 3d4f86f605 Removed duplicate code
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159701 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-27 20:29:21 +00:00
Russell Bryant bcde91337b Make a formatting change to test a new post-commit hook for reviewboard.
http://reviewboard.digium.com/r/65/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-26 22:11:55 +00:00
Russell Bryant bd341895b3 Make a formatting change to test a new post-commit hook for reviewboard.
http://reviewboard.digium.com/r/65/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-26 22:08:33 +00:00
Russell Bryant 40a52b50fa Make a formatting change to test a new post-commit hook for reviewboard.
http://reviewboard.digium.com/r/65/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159664 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-26 22:01:34 +00:00
Kevin P. Fleming e14dfcbedc improve handling of API calls provided by loaded modules through use of some GCC features; this makes app_stack's usage of AGI APIs even cleaner, and will allow it to work 'as expected' either with or without res_agi being loaded
reviewed at http://reviewboard.digium.com/r/62



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159631 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-26 21:20:50 +00:00
Kevin P. Fleming aa0e888629 add support for event suppression for AMI-over-HTTP
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159629 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-26 21:09:58 +00:00
Kevin P. Fleming f62ffebedf Blocked revisions 159571 via svnmerge
........
  r159571 | kpfleming | 2008-11-26 14:21:04 -0600 (Wed, 26 Nov 2008) | 2 lines
  
  rename these files so as to avoid conflicts when users update their working copies and have unversioned files already in place
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-26 20:35:14 +00:00
Mark Michelson 5cf09591b0 Add some necessary hangup commands in the case that forwarding
a call fails

1) Hang up the original destination if the local channel cannot
   be requested.
2) Hang up the local channel (in addition to the original destination)
   if ast_call fails when calling the newly created local channel.

This prevents channels from sticking around forever in the
case of a botched call forward (e.g. to an extension which does not
exist).

(closes issue #13764)
Reported by: davidw
Patches:
      13764_v2.patch uploaded by putnopvut (license 60)
Tested by: putnopvut, davidw



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-26 19:57:11 +00:00
Kevin P. Fleming 63b031c471 Merged revisions 159476 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r159476 | kpfleming | 2008-11-26 12:36:24 -0600 (Wed, 26 Nov 2008) | 7 lines
  
  simplify (and slightly bug-fix) the recent developer-oriented COMPILE_DOUBLE mode
  
  ensure that 'make clean' removes dependency files for .i files that are created in COMPILE_DOUBLE mode
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-26 19:08:56 +00:00
Tilghman Lesher 6e6e02ce1f If the config file does not exist, then the first use crashes Asterisk.
(closes issue #13848)
 Reported by: klaus3000
 Patches: 
       udptl.c.patch uploaded by eliel (license 64)
 Tested by: blitzrage


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-26 18:33:04 +00:00
Mark Michelson 5769e6ea72 Don't allow for configuration options to overwrite options
set via channel variables on a reload.

(closes issue #13921)
Reported by: davidw
Patches:
      13921.patch uploaded by putnopvut (license 60)
Tested by: davidw



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-26 14:58:17 +00:00
Jeff Peeler 1abffcee9f Always parse arguments in park_call_exec so that app_args is valid. This prevents a crash when executing Park from the dialplan with no arguments.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159402 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-26 03:18:01 +00:00
Steve Murphy c5e64b2ac4 Merged revisions 159316 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r159316 | murf | 2008-11-25 15:41:10 -0700 (Tue, 25 Nov 2008) | 15 lines

(closes issue #12694)
Reported by: yraber
Patches:
      12694.2nd.diff uploaded by murf (license 17)
Tested by: murf, laurav

Thanks to file (Joshua Colp) for his IAX fix.

the change to cdr.c allows no-answer to percolate
up into CDR's, and feels like the right place to
locate this fix; if BUSY is done here, no-answer
should be, too.



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159360 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 23:03:01 +00:00
Tilghman Lesher bb80c835e0 Add an option, waitfordialtone, for UK analog lines which do not end a call
until the originating line hangs up.
(closes issue #12382)
 Reported by: one47
 Patches: 
       zap-waitfordialtone-trunk.080901.patch uploaded by one47 (license 23)
       zap-waitfordialtone-bra-1.4.21.2.patch uploaded by fleed (license 463)
 Tested by: fleed


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 22:45:59 +00:00
Tilghman Lesher fe2c495db6 Merged revisions 159269 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r159269 | tilghman | 2008-11-25 15:56:48 -0600 (Tue, 25 Nov 2008) | 7 lines
  
  Don't try to send a response on a NULL pvt.
  (closes issue #13919)
   Reported by: barthpbx
   Patches: 
         chan_iax2.c.patch uploaded by eliel (license 64)
   Tested by: barthpbx
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159276 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 21:57:59 +00:00
Mark Michelson 2d20ab2b07 Make the options for the general and profiles more consistent
for the "pls_hold_prompt" option. This does not affect any released
version of Asterisk, so there is no need to update the CHANGES
file for this.

(closes issue #13893)
Reported by: eliel



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159250 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 21:49:42 +00:00
Tilghman Lesher f41f8858cd Merged revisions 159246 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
  r159246 | tilghman | 2008-11-25 15:40:28 -0600 (Tue, 25 Nov 2008) | 14 lines
  
  Merged revisions 159245 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.2
  
  ........
    r159245 | tilghman | 2008-11-25 15:37:06 -0600 (Tue, 25 Nov 2008) | 7 lines
    
    Regression fix for last security fix.  Set the iseqno correctly.
    (closes issue #13918)
     Reported by: ffloimair
     Patches: 
           20081119__bug13918.diff.txt uploaded by Corydon76 (license 14)
     Tested by: ffloimair
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159247 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 21:42:42 +00:00
Tilghman Lesher 1b0d3db863 Don't actually do anything with a negative priority, because we ignore it in
the result, anyway.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159189 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 18:01:02 +00:00
Tilghman Lesher f9461535d3 Don't limit the length of the hint at the final step (from ~8100 chars max
(or ~500 chars max on LOW_MEMORY) to 80 chars max).  This will allow more
channels to be used in a single hint.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159162 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 17:44:30 +00:00
Russell Bryant 2b9f3b1f60 Blocked revisions 159158 via svnmerge
........
r159158 | russell | 2008-11-25 11:34:50 -0600 (Tue, 25 Nov 2008) | 2 lines

Add ao2_trylock() to go along with ao2_lock() and ao2_unlock()

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159159 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 17:35:33 +00:00
Terry Wilson 4ea49e697e Add missing variable declaration for PPC code
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 16:18:53 +00:00
Tilghman Lesher 807566899a Copyright clarification; also, have variable set to "t" or "i" on timeout or
invalid extension, respectively.
(closes issue #13944)
 Reported by: chappell


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 05:19:53 +00:00
Tilghman Lesher ac296a4ad3 Merged revisions 159025 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r159025 | tilghman | 2008-11-24 22:50:00 -0600 (Mon, 24 Nov 2008) | 3 lines
  
  System call ioperm is non-portable, so check for its existence in autoconf.
  (Closes issue #13863)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 05:02:11 +00:00
Terry Wilson 853f21e90d Make chan_usbradio compile under dev mode
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 03:49:30 +00:00
Sean Bright fd8caa1778 This is basically a complete rollback of r155401, as it was determined that
it would be best to maintain API compatibility.  Instead, this commit introduces
ao2_callback_data() which is functionally identical to ao2_callback() except
that it allows you to pass arbitrary data to the callback.

Reviewed by Mark Michelson via ReviewBoard:
	http://reviewboard.digium.com/r/64


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158959 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 01:01:49 +00:00
Matthew Nicholson 69d85eaca9 Fix compiling in dev mode.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158925 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 00:19:55 +00:00
Matthew Nicholson 17ed84ff07 Make the Join event from app_queue use CallerIDNum insead of CallerID for
indicating the callerid number just like the rest of asterisk.

(closes issue #13883)
Reported by: davidw


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158924 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 00:05:41 +00:00
Matthew Nicholson f3d086256c Added EVENT_FLAG_AGI and used it for manager calls in res_agi.c
(closes issue #13873)
Reported by: fnordian
Patches:
      ami_agievent.patch uploaded by fnordian (license 110)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158876 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-24 21:56:22 +00:00
Tilghman Lesher 455284ebc1 Add a bit of documentation (thanks, I-MOD) on what the silence threshold
constant actually does and what values are valid for it.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158857 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-24 21:52:34 +00:00
Matthew Nicholson 926eb0940b Make ast_streamfile() check the result of ast_openstream() before doing
anything with it.

(closes issue #13955)
Reported by: chris-mac


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158851 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-24 21:27:26 +00:00
Terry Wilson 85bbf3ff33 This patch adds a new application for sending MWI to phones via Asterisk's event subsystem. Also, the minivm documentation is all converted to use xmldocs.
(closes issue #13946)
Reported by: Marquis
Patches: 
      minivmmwi_plus_xmldocs.patch uploaded by Marquis (license 32)
Tested by: otherwiseguy, Marquis


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-24 18:11:08 +00:00
Sean Bright 7bd3ce358b If you enabled 'notifycid' one of the limitations is that the calling channel
is only found if it dialed the extension that was subscribed to.  You can now
specify 'ignore-context' for the 'notifycid' option in sip.conf which will, as
it's value implies, ignore the current context of the caller when doing the
lookup.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158756 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-23 03:36:52 +00:00
Sean Bright 74c112a501 No need to use a separate structure for this since we can just pass
our sip_pvt pointer in directly.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158754 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-23 03:30:46 +00:00
Michiel van Baak 2fb4ecc87c last commit worked on OpenBSD but still generated warning on Ubuntu.
Initialise a variable so --enable-dev-mode does not complain


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158723 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-22 17:17:33 +00:00
Michiel van Baak 4a68fe383a dont send reorder tone after a device is hungup if a dialout is abandoned or failed.
Without this reorder tone will play after hangup and both wedhorn's and my wife have threatened to use an axe on our asterisk box

(closes issue #13948)
Reported by: wedhorn
Patches:
	switch.diff uploaded by wedhorn (license 30)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158694 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-22 16:57:11 +00:00
Michiel van Baak ced8427b09 Add Media Source Update to skinny's control2str
(issue #13948)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158690 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-22 16:48:09 +00:00
Michiel van Baak 58ff098571 fix a very occasional core dump in chan_skinny found by wedhorn.
(issue #13948)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-22 16:06:38 +00:00
Michiel van Baak 12071c18f0 make this compile under devmode
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158686 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-22 15:58:49 +00:00
Jeff Peeler 2f65e69240 Blocked revisions 158629 via svnmerge
........
r158629 | jpeeler | 2008-11-21 18:04:36 -0600 (Fri, 21 Nov 2008) | 5 lines

(closes issue #13786)
Reported by: tzafrir

When compiling against Zaptel dahdi_compat will now only define all the DAHDI defines if the Zaptel define is present. Also, there is no such thing as DAHDI_PRI.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158632 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-22 00:05:33 +00:00
Steve Murphy 11e22239cc Merged revisions 158603 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r158603 | murf | 2008-11-21 16:14:50 -0700 (Fri, 21 Nov 2008) | 11 lines

In reference to the fix made for 13871, I was
merging the fix into 1.6.0 and realized I missed
the code in the h-exten block, and didn't catch it
because my test case had the h-exten commented out.

So, this corrects the code I missed, as a 
preventative against another crash report.
Tested with the h-exten defined, all is well.



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158606 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-21 23:40:46 +00:00
Tilghman Lesher 35213dff98 Allow space within an extension, when the space is within a character class.
(requested by lmadsen on -dev, patch by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158605 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-21 23:33:22 +00:00
Tilghman Lesher 7bd6f1744b Merged revisions 158600 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r158600 | tilghman | 2008-11-21 17:07:46 -0600 (Fri, 21 Nov 2008) | 5 lines
  
  The passed extension may not be the same in the list as the current entry,
  because we strip spaces when copying the extension into the structure.
  Therefore, use the copied item to place the item into the list.
  (found by lmadsen on -dev, fixed by me)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158602 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-21 23:14:11 +00:00
Russell Bryant 6fb1f86054 Merged revisions 158539 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r158539 | russell | 2008-11-21 16:05:55 -0600 (Fri, 21 Nov 2008) | 2 lines

When compiling with DEBUG_THREADS, report the real file/func/line for ao2_lock/ao2_unlock

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158540 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-21 22:12:37 +00:00