Joshua Colp b5003a1943 Merged revisions 107637 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r107637 | file | 2008-03-11 15:47:33 -0300 (Tue, 11 Mar 2008) | 4 lines

Add an additional check for setting conference parameter when using the marked user options. It was possible for it to return to a no listen/no talk state if a masquerade happened.
(closes issue #12136)
Reported by: aragon

........


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

2008-03-11 18:48:59 +00:00

..

app_adsiprog.c

whitespace fixes only

2008-02-07 21:08:46 +00:00

app_alarmreceiver.c

There she goes! First commit from me to trunk \o/

2008-02-07 20:42:59 +00:00

app_amd.c

Create a centralized configuration option for silencethreshold

2008-03-05 16:23:44 +00:00

app_authenticate.c

len already contains the position we want to examine, if we move one left again we'll actually probably be looking at a digit.

2008-02-19 19:27:50 +00:00

app_cdr.c

whitespace fixes only.

2008-02-09 11:27:10 +00:00

app_chanisavail.c

whitespace fixes only.

2008-02-09 11:27:10 +00:00

app_channelredirect.c

Add CHANNELREDIRECT_STATUS variable to ChannelRedirect() dialplan application. This will either be set to NOCHANNEL if the given channel was not found or SUCCESS if it worked.

2008-02-19 18:40:22 +00:00

app_chanspy.c

Merged revisions 106552 via svnmerge from

2008-03-07 06:54:47 +00:00

app_controlplayback.c

whitespace fixes only.

2008-02-09 11:27:10 +00:00

app_db.c

whitespace fixes only.

2008-02-09 11:27:10 +00:00

app_dial.c

Remove some redundant logic from wait_for_answer. This also let's us get rid of one of

2008-03-11 15:59:32 +00:00

app_dictate.c

whitespace fixes only.

2008-02-09 11:27:10 +00:00

app_directed_pickup.c

whitespace fixes only.

2008-02-09 11:27:10 +00:00

app_directory.c

whitespace fixes only.

2008-02-09 11:27:10 +00:00

app_disa.c

whitespace fixes only.

2008-02-09 11:27:10 +00:00

app_dumpchan.c

whitespace fixes only.

2008-02-09 11:27:10 +00:00

app_echo.c

whitespace fixes only.

2008-02-09 11:27:10 +00:00

app_exec.c

whitespace fixes only.

2008-02-09 11:27:10 +00:00

app_externalivr.c

a few syntax changes and safer code

2008-02-14 19:47:39 +00:00

app_festival.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_flash.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_followme.c

Merged revisions 106235 via svnmerge from

2008-03-05 22:43:22 +00:00

app_forkcdr.c

include "logger.h" and errno.h from asterisk.h - usage shows that they

2007-11-19 18:52:04 +00:00

app_getcpeid.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_ices.c

Compatibility fix for OpenBSD

2008-01-03 01:59:27 +00:00

app_image.c

remove redundant headers

2007-11-22 01:39:06 +00:00

app_ivrdemo.c

include "logger.h" and errno.h from asterisk.h - usage shows that they

2007-11-19 18:52:04 +00:00

app_jack.c

Add another small option for the JACK app and JACK_HOOK function. The 'n'

2008-01-14 04:53:08 +00:00

app_macro.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_meetme.c

Merged revisions 107637 via svnmerge from

2008-03-11 18:48:59 +00:00

app_milliwatt.c

more header removal

2007-11-22 04:37:08 +00:00

app_minivm.c

Create a centralized configuration option for silencethreshold

2008-03-05 16:23:44 +00:00

app_mixmonitor.c

Convert ast_verbose to ast_verb.

2007-12-14 14:48:38 +00:00

app_morsecode.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_mp3.c

Compatibility fix for OpenBSD

2008-01-03 01:59:27 +00:00

app_nbscat.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_osplookup.c

Update osplookup documentation to use commas instead of pipes.

2008-01-02 17:38:02 +00:00

app_page.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_parkandannounce.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_pickupchan.c

- Add Copyright

2007-12-27 09:08:23 +00:00

app_playback.c

Merge changes from team/mvanbaak/cli-command-audit

2008-02-08 21:26:32 +00:00

app_privacy.c

Get rid of any remaining ast_verbose calls in the code in favor of

2008-02-05 23:00:15 +00:00

app_queue.c

app_queue has now been doxygenified thanks to snuffy! The ony thing I changed

2008-03-10 15:45:13 +00:00

app_read.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_readexten.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_readfile.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_record.c

Create a centralized configuration option for silencethreshold

2008-03-05 16:23:44 +00:00

app_rpt.c

Merged revisions 107464 via svnmerge from

2008-03-11 15:13:38 +00:00

app_sayunixtime.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_senddtmf.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_sendtext.c

more header removal

2007-11-22 04:37:08 +00:00

app_setcallerid.c

include "logger.h" and errno.h from asterisk.h - usage shows that they

2007-11-19 18:52:04 +00:00

app_skel.c

include "logger.h" and errno.h from asterisk.h - usage shows that they

2007-11-19 18:52:04 +00:00

app_sms.c

Merged revisions 107464 via svnmerge from

2008-03-11 15:13:38 +00:00

app_softhangup.c

include "logger.h" and errno.h from asterisk.h - usage shows that they

2007-11-19 18:52:04 +00:00

app_speech_utils.c

Merged revisions 106552 via svnmerge from

2008-03-07 06:54:47 +00:00

app_stack.c

Several manager changes:

2008-01-10 00:12:35 +00:00

app_system.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_talkdetect.c

Should check these values for non-NULL before scanning.

2008-03-05 17:40:42 +00:00

app_test.c

remove a number of #include <fcntl.h> which are either

2007-11-22 01:03:02 +00:00

app_transfer.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_url.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_userevent.c

remove redundant headers

2007-11-22 01:39:06 +00:00

app_verbose.c

more header removal

2007-11-22 04:37:08 +00:00

app_voicemail.c

Merged revisions 106635 via svnmerge from

2008-03-07 16:26:07 +00:00

app_waitforring.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_waitforsilence.c

Create a centralized configuration option for silencethreshold

2008-03-05 16:23:44 +00:00

app_waituntil.c

Add contributed WaitUntil app.

2007-12-19 20:06:23 +00:00

app_while.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_zapateller.c

Use defined return values in load_module in more places.

2007-12-26 20:02:27 +00:00

app_zapbarge.c

Use defined return values in load_module in more places.

2007-12-26 20:02:27 +00:00

app_zapras.c

Get rid of any remaining ast_verbose calls in the code in favor of

2008-02-05 23:00:15 +00:00

app_zapscan.c

Use defined return values in load_module in more places.

2007-12-26 20:02:27 +00:00

enter.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

leave.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

Makefile

Merged revisions 93180 via svnmerge from

2007-12-17 07:25:35 +00:00

rpt_flow.pdf

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00