aboutsummaryrefslogtreecommitdiffstats
path: root/main
AgeCommit message (Collapse)AuthorFilesLines
2010-07-23Merged revisions 278982 via svnmerge from tilghman1-6/+13
https://origsvn.digium.com/svn/asterisk/trunk ................ r278982 | tilghman | 2010-07-23 11:43:34 -0500 (Fri, 23 Jul 2010) | 15 lines Merged revisions 278981 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r278981 | tilghman | 2010-07-23 11:42:25 -0500 (Fri, 23 Jul 2010) | 8 lines Avoid race with consolethread on shutdown (on parallel processors). (closes issue #17080) Reported by: sybasesql Patches: 20100721__issue17080.diff.txt uploaded by tilghman (license 14) Tested by: sybasesql ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@278983 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-22Merged revisions 278708 via svnmerge from jpeeler1-5/+62
https://origsvn.digium.com/svn/asterisk/trunk ........ r278708 | jpeeler | 2010-07-22 14:45:30 -0500 (Thu, 22 Jul 2010) | 16 lines Add method for finding XML doc files for systems that don't support GLOB_BRACE. In particular, Solaris and perhaps others do not support the above mentioned GNU extension. In this case the paths are simply expanded without the braces and the calls to glob are made separately. Note: I could not explain memory allocation failures that were being reported from within libxml itself when making calls to glob without using GLOB_NOCHECK. This is the only reason why that flag is being used. (closes issue #15402) Reported by: snuffy Patches: bug_xmlpatt-v3.diff uploaded by snuffy (license 35), modified by me ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@278709 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-22Merged revisions 278620 via svnmerge from mmichelson1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r278620 | mmichelson | 2010-07-22 09:58:01 -0500 (Thu, 22 Jul 2010) | 19 lines Merged revisions 278618 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r278618 | mmichelson | 2010-07-22 09:55:04 -0500 (Thu, 22 Jul 2010) | 13 lines Allow PLC to function properly when channels use SLIN for audio. If a channel involved in a bridge was using SLIN audio, then translation paths were not guaranteed to be set up properly since in all likelihood the number of translation steps was only 1. This patch enforces the transcode_via_slin behavior if transcode_via_slin or generic_plc is enabled and one of the formats to make compatible is SLIN. AST-352 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@278621 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-20Merged revisions 278272 via svnmerge from tilghman2-1/+28
https://origsvn.digium.com/svn/asterisk/trunk ................ r278272 | tilghman | 2010-07-20 17:26:23 -0500 (Tue, 20 Jul 2010) | 11 lines Merged revisions 278167 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r278167 | tilghman | 2010-07-20 15:59:06 -0500 (Tue, 20 Jul 2010) | 4 lines Do not queue up DTMF frames while a call is on hold. (Fixes ABE-2110) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@278273 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-20Merged revisions 278024 via svnmerge from tilghman1-7/+8
https://origsvn.digium.com/svn/asterisk/trunk ................ r278024 | tilghman | 2010-07-20 11:50:11 -0500 (Tue, 20 Jul 2010) | 14 lines Merged revisions 278023 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r278023 | tilghman | 2010-07-20 11:37:18 -0500 (Tue, 20 Jul 2010) | 7 lines Off-by-one error (closes issue #16506) Reported by: nik600 Patches: 20100629__issue16506.diff.txt uploaded by tilghman (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@278025 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-19Merged revisions 277945 via svnmerge from jeang1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r277945 | jeang | 2010-07-19 16:07:08 -0500 (Mon, 19 Jul 2010) | 15 lines Merged revisions 277906 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r277906 | jeang | 2010-07-19 15:16:36 -0500 (Mon, 19 Jul 2010) | 7 lines Avoid trying to pickup a parked extension before the park operation is completed. A crash could occur if the extension is picked up while the parking extension is being announced. Testing pu->notquiteyet while searching for a parked extension resolves this crash. (ABE-2418) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277966 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-16Merged revisions 277657 via svnmerge from tringenbach1-0/+13
https://origsvn.digium.com/svn/asterisk/trunk ................ r277657 | tringenbach | 2010-07-16 18:23:15 -0500 (Fri, 16 Jul 2010) | 16 lines Merged revisions 277625 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r277625 | tringenbach | 2010-07-16 17:43:39 -0500 (Fri, 16 Jul 2010) | 9 lines Save and restore AST_FLAG_BRIDGE_HANGUP_DONT on attended transfer. ast_bridge_call() clears AST_FLAG_BRIDGE_HANGUP_DONT. But during an attended transfer, ast_bridge_call() is called for a second bridge on the same channel, and it clears that flag, which still needs to get set for when the original ast_bridge_call() gets control back and checks it. Review: https://reviewboard.asterisk.org/r/741 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277666 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-16Merged revisions 277331 via svnmerge from mnicholson1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r277331 | mnicholson | 2010-07-16 13:31:08 -0500 (Fri, 16 Jul 2010) | 15 lines Merged revisions 277327 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r277327 | mnicholson | 2010-07-16 13:30:22 -0500 (Fri, 16 Jul 2010) | 8 lines Interpret device state AST_DEVICE_UNKNOWN as extension state AST_EXTENSION_NOT_INUSE. (closes issue #16035) Reported by: francesco_r Patches: pbx.c.patch uploaded by viniciusfontes (license 978) Tested by: francesco_r, agx, lawbar ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277338 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-16Merged revisions 277263 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r277263 | tilghman | 2010-07-16 13:14:05 -0500 (Fri, 16 Jul 2010) | 12 lines Merged revisions 277261 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r277261 | tilghman | 2010-07-16 13:04:11 -0500 (Fri, 16 Jul 2010) | 5 lines If variable gotten is not set, will segfault on Solaris. (closes issue #17636) Reported by: bklang ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277264 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-16Merged revisions 277250 via svnmerge from mnicholson1-0/+13
https://origsvn.digium.com/svn/asterisk/trunk ................ r277250 | mnicholson | 2010-07-16 12:30:39 -0500 (Fri, 16 Jul 2010) | 11 lines Merged revisions 277247 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r277247 | mnicholson | 2010-07-16 12:29:57 -0500 (Fri, 16 Jul 2010) | 4 lines For pass through DTMF tones, measure the actual duration between the begin and end packets on the wire. If it is detected to be less than AST_MIN_DTMF_DURATION, trigger dtmf emulation. AST-362 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277256 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-16Merged revisions 277143 via svnmerge from seanbright1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r277143 | seanbright | 2010-07-16 11:20:40 -0400 (Fri, 16 Jul 2010) | 8 lines Avoid crashing when installing a duplicate translation path with a lower cost. (closes issue #17092) Reported by: moy Patches: translate.rev254273.patch uploaded by moy (license 222) Tested by: moy ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277144 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-15Merged revisions 276653 via svnmerge from jpeeler1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r276653 | jpeeler | 2010-07-15 08:51:11 -0500 (Thu, 15 Jul 2010) | 9 lines Merged revisions 276652 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r276652 | jpeeler | 2010-07-15 08:48:58 -0500 (Thu, 15 Jul 2010) | 2 lines In a perfect world, the frame source would never be NULL. In the meantime, don't crash when it is. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@276654 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-14Merged revisions 276441 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r276441 | kpfleming | 2010-07-14 15:15:48 -0500 (Wed, 14 Jul 2010) | 4 lines Don't try to call an embedded module's backup_globals() function until after confirming it exists. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@276442 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-13Merged revisions 276124 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r276124 | russell | 2010-07-13 14:09:42 -0500 (Tue, 13 Jul 2010) | 9 lines Merged revisions 276123 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r276123 | russell | 2010-07-13 14:06:53 -0500 (Tue, 13 Jul 2010) | 2 lines Use chan->cdr instead of chan_cdr (just like peer->cdr instead of peer_cdr in the last commit). ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@276125 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-13Merged revisions 275995 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r275995 | russell | 2010-07-13 11:53:44 -0500 (Tue, 13 Jul 2010) | 21 lines Merged revisions 275994 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r275994 | russell | 2010-07-13 11:51:18 -0500 (Tue, 13 Jul 2010) | 14 lines Access peer->cdr directly instead of through a saved off reference. At this point in the code, it is possible that peer_cdr may be invalid. Specifically, in the blind transfer code, CDRs are swapped between channels. So, peer_cdr is no longer == peer->cdr. The scenario that exposed a crash in this code was a blind transfer that hit the system call limit, causing the transferee channel to get destroyed after the transfer attempt failed. Even if it succeeds and this code doesn't crash, this code was still trying to reset a CDR on a channel that was now owned by a different thread, which is a BadThing(tm). (ABE-2417) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275996 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-12Merged revisions 275682 via svnmerge from jpeeler1-5/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r275682 | jpeeler | 2010-07-12 12:21:01 -0500 (Mon, 12 Jul 2010) | 18 lines Merged revisions 275665 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r275665 | jpeeler | 2010-07-12 11:58:39 -0500 (Mon, 12 Jul 2010) | 11 lines Change ast_write to not stop generator when called from ast_prod. For SIP channels configured with the progressinband option on, the ringback was being immediately stopped. This problem was due to ast_prod being moved for a deadlock fix in 259858. Prodding the channel after setting up the generator triggered the check in ast_write to stop the generator. The fix here should write the frame the same as was done before the call to ast_prod was moved. (closes issue #17372) Reported by: tech_admin ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275706 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09Merged revisions 275424 via svnmerge from russell1-19/+62
https://origsvn.digium.com/svn/asterisk/trunk ........ r275424 | russell | 2010-07-09 16:57:21 -0500 (Fri, 09 Jul 2010) | 27 lines Fix some issues related to dynamic feature groups in features.conf. The bridge handling code did not properly consider feature groups when setting parameters that would affect whether or not a native bridge would be attempted. If DYNAMIC_FEATURES only include a feature group, a native bridge would occur that may prevent features from working. Fix a bug in verbose output that would show the key mapping as empty if it was using the default mapping and not a custom mapping in the feature group. Add feature groups to the output of "features show". Adjust the feature execution logic to match that of the logic when executing a feature that was not configured through a feature group. Update features.conf.sample to show that an '=' is still required if using the default key mapping from [applicationmap]. Finally, clean up a little bit of formatting to better coform to coding guidelines while in the area. (closes issue #17589) Reported by: lmadsen Patches: issue_17589.rev4.txt uploaded by russell (license 2) Tested by: russell, lmadsen ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275425 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09Merged revisions 275310 via svnmerge from russell1-3/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r275310 | russell | 2010-07-09 14:58:06 -0500 (Fri, 09 Jul 2010) | 2 lines Add missing ao2_iterator_destroy(). ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275311 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09Merged revisions 275186 via svnmerge from mnicholson1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r275186 | mnicholson | 2010-07-09 13:24:03 -0500 (Fri, 09 Jul 2010) | 9 lines Merged revisions 275182 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r275182 | mnicholson | 2010-07-09 13:23:23 -0500 (Fri, 09 Jul 2010) | 2 lines give a better error message when attempting to unload a module that is not loaded ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275191 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09Merged revisions 275144 via svnmerge from mnicholson1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r275144 | mnicholson | 2010-07-09 12:50:45 -0500 (Fri, 09 Jul 2010) | 9 lines Merged revisions 275143 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r275143 | mnicholson | 2010-07-09 12:50:05 -0500 (Fri, 09 Jul 2010) | 2 lines don't unload modules that returned AST_MODULE_LOAD_DECLINE when they were loaded ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275145 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09Merged revisions 275022 via svnmerge from russell1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r275022 | russell | 2010-07-09 10:35:53 -0500 (Fri, 09 Jul 2010) | 11 lines Merged revisions 275021 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r275021 | russell | 2010-07-09 10:33:08 -0500 (Fri, 09 Jul 2010) | 4 lines Document that a leading and trailing slash is expected for test categories. Also, emit a warning if a test is registered without one of these. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275023 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-06Merged revisions 274164 via svnmerge from mmichelson1-2/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r274164 | mmichelson | 2010-07-06 09:31:13 -0500 (Tue, 06 Jul 2010) | 22 lines Merged revisions 274157 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r274157 | mmichelson | 2010-07-06 09:29:23 -0500 (Tue, 06 Jul 2010) | 16 lines Fix problem with RFC 2833 DTMF not being accepted. A recent check was added to ensure that we did not erroneously detect duplicate DTMF when we received packets out of order. The problem was that the check did not account for the fact that the seqno of an RTP stream will roll over back to 0 after hitting 65535. Now, we have a secondary check that will ensure that the seqno rolling over will not cause us to stop accepting DTMF. (closes issue #17571) Reported by: mdeneen Patches: rtp_seqno_rollover.patch uploaded by mmichelson (license 60) Tested by: richardf, maxochoa, JJCinAZ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@274168 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-05Merged revisions 273886 via svnmerge from pabelanger1-3/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r273886 | pabelanger | 2010-07-05 09:53:44 -0400 (Mon, 05 Jul 2010) | 15 lines Merged revisions 273884 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r273884 | pabelanger | 2010-07-05 09:51:29 -0400 (Mon, 05 Jul 2010) | 8 lines Remove extra line breaks from 'core show config mappings' (closes issue #17583) Reported by: pabelanger Patches: issue17583.patch uploaded by pabelanger (license 224) Tested by: lmadsen ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273888 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-02Merged revisions 273718 via svnmerge from tilghman1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r273718 | tilghman | 2010-07-02 12:10:59 -0500 (Fri, 02 Jul 2010) | 15 lines Merged revisions 273717 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r273717 | tilghman | 2010-07-02 12:09:47 -0500 (Fri, 02 Jul 2010) | 8 lines Autoservice loop optimization causes a busy loop, when channels are serviced while in hangup. (closes issue #17564) Reported by: ramonpeek Patches: 20100630__issue17564.diff.txt uploaded by tilghman (license 14) Tested by: ramonpeek ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273719 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-01Merged revisions 273566 via svnmerge from russell1-1/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r273566 | russell | 2010-07-01 17:16:23 -0500 (Thu, 01 Jul 2010) | 14 lines Merged revisions 273565 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r273565 | russell | 2010-07-01 17:09:19 -0500 (Thu, 01 Jul 2010) | 7 lines Don't return a partially initialized datastore. If memory allocation fails in ast_strdup(), don't return a partially initialized datastore. Bad things may happen. (related to ABE-2415) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273571 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-01Merged revisions 273352 via svnmerge from mnicholson1-10/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r273352 | mnicholson | 2010-07-01 09:37:37 -0500 (Thu, 01 Jul 2010) | 2 lines Fixed whitespace problems ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273353 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-01Merged revisions 273350 via svnmerge from mnicholson1-4/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r273350 | mnicholson | 2010-07-01 09:34:31 -0500 (Thu, 01 Jul 2010) | 2 lines Altered my comment about TCP_NODELAY ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273351 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-30Merged revisions 273270 via svnmerge from mnicholson1-0/+15
https://origsvn.digium.com/svn/asterisk/trunk ........ r273270 | mnicholson | 2010-06-30 13:48:21 -0500 (Wed, 30 Jun 2010) | 2 lines Set TCP_NODELAY on manager TCP sockets to prevent delays on outgoing packets. This regression was introduced in r48338. AST-359 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273271 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-30Merged revisions 273233 via svnmerge from pabelanger1-6/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r273233 | pabelanger | 2010-06-30 13:28:04 -0400 (Wed, 30 Jun 2010) | 11 lines Fix rt(c)p set debug ip taking wrong argument Also clean up some coding errors. (closes issue #17469) Reported by: wdoekes Patches: astsvn-rtp-set-debug-ip.patch uploaded by wdoekes (license 717) Tested by: wdoekes, pabelanger ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273234 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-30Merged revisions 273144 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r273144 | tilghman | 2010-06-29 20:07:02 -0500 (Tue, 29 Jun 2010) | 8 lines Permission checking for the system application is backwards. (closes issue #17550) Reported by: kenner Patches: manager.c.diff uploaded by kenner (license 1040) Tested by: kenner ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273145 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-30Merged revisions 273142 via svnmerge from tilghman1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r273142 | tilghman | 2010-06-29 20:01:14 -0500 (Tue, 29 Jun 2010) | 5 lines Don't attempt to proceed if our internal parser indicates an invalid file. (closes issue #17560) Reported by: Nick_Lewis ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273143 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-29Merged revisions 273058 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r273058 | tilghman | 2010-06-29 17:59:51 -0500 (Tue, 29 Jun 2010) | 11 lines Recorded merge of revisions 273057 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r273057 | tilghman | 2010-06-29 17:58:58 -0500 (Tue, 29 Jun 2010) | 4 lines _Really_ skip the channel... don't just retry for another 200 cycles. (Closes issue SWP-1652, ABE-2240) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273059 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-29Merged revisions 273054 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r273054 | tilghman | 2010-06-29 17:39:22 -0500 (Tue, 29 Jun 2010) | 11 lines Send DialPlanComplete as a response, not as a separate event. Otherwise, it goes to all manager sessions and may exclude the current session, if the Events mask excludes it. (closes issue #17504) Reported by: rrb3942 Patches: showdialplan_patch.diff uploaded by rrb3942 (license 1003) Tested by: rrb3942 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273056 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-29Merged revisions 253357 via svnmerge from russell1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r253357 | russell | 2010-03-18 13:18:43 -0500 (Thu, 18 Mar 2010) | 8 lines Increase CLI command output timeout for asterisk -rx to 60 seconds. (closes issue #17049) Reported by: russell Tested by: russell Review: https://reviewboard.asterisk.org/r/573/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272972 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-28Merged revisions 272926 via svnmerge from tilghman1-4/+8
https://origsvn.digium.com/svn/asterisk/trunk ................ r272926 | tilghman | 2010-06-28 16:50:57 -0500 (Mon, 28 Jun 2010) | 15 lines Merged revisions 272925 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r272925 | tilghman | 2010-06-28 16:50:02 -0500 (Mon, 28 Jun 2010) | 8 lines Don't change ownership/group/permissions on run directory, if it already exists. (closes issue #17076) Reported by: stuarth Patches: 20100324__issue17076.diff.txt uploaded by tilghman (license 14) Tested by: stuarth ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272927 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-28Merged revisions 272923 via svnmerge from tilghman1-15/+10
https://origsvn.digium.com/svn/asterisk/trunk ................ r272923 | tilghman | 2010-06-28 16:42:52 -0500 (Mon, 28 Jun 2010) | 19 lines Merged revisions 272921-272922 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r272921 | tilghman | 2010-06-28 16:29:27 -0500 (Mon, 28 Jun 2010) | 8 lines Change the way that we read include files, to accommodate for changes in GCC 4.4. (closes issue #17472) Reported by: seandarcy Patches: config2.patch uploaded by nivan (license 1066) Tested by: nivan ........ r272922 | tilghman | 2010-06-28 16:38:49 -0500 (Mon, 28 Jun 2010) | 2 lines Also trim trailing blanks on #includes ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272924 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-25Backport unit test API from trunk.russell3-1/+900
Also, update existing test modules that were already in this branch but had been converted to the unit test API in trunk. Review: https://reviewboard.asterisk.org/r/748/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272531 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23Merged revisions 272252 via svnmerge from pabelanger1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r272252 | pabelanger | 2010-06-23 16:35:45 -0400 (Wed, 23 Jun 2010) | 8 lines Correct manager variable 'EventList' case. (closes issue #17520) Reported by: kobaz Patches: manager.patch uploaded by kobaz (license 834) Tested by: lmadsen ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272253 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-22Merged revisions 271831 via svnmerge from dvossel1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r271831 | dvossel | 2010-06-22 10:46:22 -0500 (Tue, 22 Jun 2010) | 10 lines fixes attended transfer behavior when both transferee and transferer hung up If both the transferer and transferee of a attended transfer hangup before the new channel picks up, the new channel should be hung up as well as it has no endpoint to talk to. This mirrors the expected behavior used in 1.4. (closes issue #17444) Reported by: corruptor ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@271832 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-16Merged revisions 270974 via svnmerge from mnicholson2-9/+12
https://origsvn.digium.com/svn/asterisk/trunk ........ r270974 | mnicholson | 2010-06-16 15:34:31 -0500 (Wed, 16 Jun 2010) | 8 lines Set sin_family to AF_INET when doing lookups, also reset sin_port the first time the ip address changes. (closes issue #17496) Reported by: ManChicken (closes issue #15827) Reported by: DennisD Patches: dnsmgr_15827.patch uploaded by chappell (license 8) Tested by: DennisD, gentlec, damage, wimpy ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@270975 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-15Merged revisions 270584 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r270584 | tilghman | 2010-06-15 13:26:26 -0500 (Tue, 15 Jun 2010) | 12 lines Merged revisions 270583 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r270583 | tilghman | 2010-06-15 13:25:12 -0500 (Tue, 15 Jun 2010) | 5 lines Variables have always been case-sensitive, so we should not be removing case-insensitive matches. Bug reported via the -dev list. See http://lists.digium.com/pipermail/asterisk-dev/2010-June/044510.html ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@270585 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-11Merged revisions 269976 via svnmerge from tilghman1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r269976 | tilghman | 2010-06-11 13:31:14 -0500 (Fri, 11 Jun 2010) | 15 lines Merged revisions 269960 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r269960 | tilghman | 2010-06-11 13:23:05 -0500 (Fri, 11 Jun 2010) | 8 lines For SpeeX, 0 bits remaining is valid and does not need an emitted warning. (closes issue #15762) Reported by: nblasgen Patches: issue15672.patch uploaded by pabelanger (license 224) Tested by: nblasgen ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@269977 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-10Merged revisions 269822 via svnmerge from mmichelson1-4/+22
https://origsvn.digium.com/svn/asterisk/trunk ................ r269822 | mmichelson | 2010-06-10 14:34:03 -0500 (Thu, 10 Jun 2010) | 25 lines Merged revisions 269821 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r269821 | mmichelson | 2010-06-10 14:30:12 -0500 (Thu, 10 Jun 2010) | 19 lines Fix potential crash when writing raw SLIN audio on a PLC-enabled channel. The issue here was that the frame created when adjusting for PLC had no offset to its audio data. If this frame were translated to another format prior to being sent out an RTP socket, all went well because the translation code would put an appropriate offset into the frame. However, if the SLIN audio were not translated before being sent out the RTP socket, bad things would happen. Specifically, the ast_rtp_raw_write makes the assumption that the frame has at least enough of an offset that it can accommodate an RTP header. This was not the case. As such, data was being written prior to the allocation, likely corrupting the data the memory allocator had written. Thus when the time came to free the data, all hell broke loose. ....Well, Asterisk crashed at least. The fix was just what one would expect. Offset the data in the frame by a reasonable amount. The method I used is a bit odd since the data in the frame is 16 bit integers and not bytes. I left a big ol' comment about it. This can be improved on if someone is interested. I was more interested in getting the crash resolved. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@269823 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-10Merged revisions 269636 via svnmerge from tilghman2-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r269636 | tilghman | 2010-06-10 03:15:45 -0500 (Thu, 10 Jun 2010) | 16 lines Merged revisions 269635 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r269635 | tilghman | 2010-06-10 02:52:34 -0500 (Thu, 10 Jun 2010) | 9 lines Ensure restartable system calls can restart (BSD signal semantics) This eliminates the annoying <beep> on the console. (closes issue #17477) Reported by: jvandal Patches: 20100610__issue17477.diff.txt uploaded by tilghman (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@269637 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-09Merged revisions 269417 via svnmerge from russell1-5/+14
https://origsvn.digium.com/svn/asterisk/trunk ........ r269417 | russell | 2010-06-09 16:11:43 -0500 (Wed, 09 Jun 2010) | 6 lines Resolve an invalid memory read on an event. Valgrind pointed out that attempting to get an IE value from an event that has no IEs produces an invalid memory read past the end of the event. Thanks to mmichelson for pointing the problem out to me and then testing the fix. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@269418 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-09Merged revisions 269346 via svnmerge from pabelanger1-6/+16
https://origsvn.digium.com/svn/asterisk/trunk ................ r269346 | pabelanger | 2010-06-09 13:32:52 -0400 (Wed, 09 Jun 2010) | 19 lines Merged revisions 269334 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r269334 | pabelanger | 2010-06-09 13:24:53 -0400 (Wed, 09 Jun 2010) | 12 lines Fix Debian init script to not use -c. When using the init script as-is currently, it could cause issues on Debian such as high CPU usage. This fix has worked for several people so I'm implementing the change. We now handle color displays properly. (closes issue #16784) Reported by: pabelanger Patches: 20100530__issue16784__2.diff.txt uploaded by tilghman (license 14) Tested by: pabelanger, tilghman ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@269347 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-07Merged revisions 268653,268731 via svnmerge from tilghman1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r268653 | tilghman | 2010-06-07 12:14:40 -0500 (Mon, 07 Jun 2010) | 2 lines Avoid unloading res_smdi twice. (closes issue #17237) Reported by: pabelanger ........ r268731 | tilghman | 2010-06-07 13:59:27 -0500 (Mon, 07 Jun 2010) | 4 lines Event well was going dry. (issue #17234) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@268732 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-07Merged revisions 268690 via svnmerge from pabelanger1-5/+17
https://origsvn.digium.com/svn/asterisk/trunk ........ r268690 | pabelanger | 2010-06-07 13:34:45 -0400 (Mon, 07 Jun 2010) | 11 lines Set threshold for silence detection defaults to 256 (closes issue #15685) Reported by: david_s5 Patches: dsp-silence-threshold-init.diff uploaded by dant (license 670) issue15685.patch.v5 uploaded by pabelanger (license 224) Tested by: danti Review: https://reviewboard.asterisk.org/r/670/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@268691 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-05Merged revisions 268456 via svnmerge from tilghman1-9/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r268456 | tilghman | 2010-06-05 12:55:28 -0500 (Sat, 05 Jun 2010) | 14 lines Fix crash in DTMF detection. What I did not originally see in my previous commit was that even though the next digit could be detected before the previous was considered ended, the detection of the next digit effectively ends the detection of the previous. Therefore, the length moves in lockstep with the digit, and no separate counter is needed for the length alone. (closes issue #17371) Reported by: alecdavis (closes issue #17474) Reported by: kenner ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@268457 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-05Merged revisions 268454 via svnmerge from tilghman1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r268454 | tilghman | 2010-06-05 12:27:12 -0500 (Sat, 05 Jun 2010) | 5 lines Verify event is not NULL before attempting to lower its usecount. (closes issue #17234) Reported by: mav3rick ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@268455 f38db490-d61c-443f-a65b-d21fe96a405b