aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2010-07-23Add branch-1.4-merged and branch-1.4-blocked properties to 1.6.2 branch.russell0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@279072 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-23Merged revisions 278985 via svnmerge from tilghman3-4/+36
https://origsvn.digium.com/svn/asterisk/trunk ................ r278985 | tilghman | 2010-07-23 12:05:16 -0500 (Fri, 23 Jul 2010) | 12 lines Merged revisions 278984 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r278984 | tilghman | 2010-07-23 12:04:15 -0500 (Fri, 23 Jul 2010) | 5 lines Establish a maximum version for openh323 (i.e. not opal), because chan_h323 will fail to load, even if it links. (issue #17679) Reported by: am ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@278986 f38db490-d61c-443f-a65b-d21fe96a405b
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-23Two more typos to cancell.tzafrir1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@278934 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-22DNID does not get cleard on a new call when using immediate=yes with ISDN ↵rmudgett1-4/+4
signaling. When you are using chan_dahdi ISDN signaling with immediate=yes and a call comes in without a DNID then you get the DNID of a previous call. Chan_dahdi does not touch the DNID field on a new call if it does not have a DNID. Made always copy the DNID from the new call. The patches backport the relevant changes from trunk -r210387. (closes issue #17568) Reported by: wuwu Patches: issue17568_v1.4.patch uploaded by rmudgett (license 664) issue17568_v1.6.2.patch uploaded by rmudgett (license 664) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@278703 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-21Fix invalid test for rxisoffhook in FXO channelstzafrir1-15/+17
This fixes some cases of no outgoing calls on FXO before an incoming call. Remove an unnecessary testing of an "off-hook" bit from DAHDI for FXO (KS/GS) channels.In some cases the bit would not be initialized properly before the first inbound call and thus prevent an outgoing call. If those tests are actually required by anybody, they should define DAHDI_CHECK_HOOKSTATE in channels/sig_analog.c . (closes issue #14577) Reported by: jkroon Patches: asterisk_chan_dahdi_hookstate_fix.diff uploaded by frawd (license 610) Tested by: frawd Review: https://reviewboard.asterisk.org/r/699/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@278524 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-21Merged revisions 278465 via svnmerge from russell1-8/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r278465 | russell | 2010-07-21 11:15:00 -0500 (Wed, 21 Jul 2010) | 41 lines Use poll() instead of select() in res_timing_pthread to avoid stack corruption. This code did not properly check FD_SETSIZE to ensure that it did not try to select() on fds that were too large. Switching to poll() removes the limitation on the maximum fd value. (closes issue #15915) Reported by: keiron (closes issue #17187) Reported by: Eddie Edwards (closes issue #16494) Reported by: Hubguru (closes issue #15731) Reported by: flop (closes issue #12917) Reported by: falves11 (closes issue #14920) Reported by: vrban (closes issue #17199) Reported by: aleksey2000 (closes issue #15406) Reported by: kowalma (closes issue #17438) Reported by: dcabot (closes issue #17325) Reported by: glwgoes (closes issue #17118) Reported by: erikje possibly other issues, too ... ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@278479 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-21Merged revisions 278463 via svnmerge from tilghman1-7/+52
https://origsvn.digium.com/svn/asterisk/trunk ........ r278463 | tilghman | 2010-07-21 10:56:05 -0500 (Wed, 21 Jul 2010) | 11 lines Ensure realtime conferences are treated the same as static conferences when trying to find an empty one. Also, parse the useropts properly, when retrieving from realtime, and add them to the existing flags. (closes issue #17502) Reported by: kenji Patches: 20100720__issue17502.diff.txt uploaded by tilghman (license 14) Tested by: kenji ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@278464 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-20Merged revisions 278275 via svnmerge from tilghman1-41/+49
https://origsvn.digium.com/svn/asterisk/trunk ................ r278275 | tilghman | 2010-07-20 17:40:19 -0500 (Tue, 20 Jul 2010) | 14 lines Merged revisions 278261 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r278261 | tilghman | 2010-07-20 17:23:13 -0500 (Tue, 20 Jul 2010) | 7 lines Delete IMAP messages in reverse order, to ensure reordering after each expunge does not cause deletion of the wrong message. (closes issue #16350) Reported by: noahisaac Patches: 20100623__issue16350.diff.txt uploaded by tilghman (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@278276 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-20Merged revisions 278272 via svnmerge from tilghman3-1/+40
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-17Merge issues...tilghman1-2/+14
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277777 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-17Merged revisions 277775 via svnmerge from tilghman3-6710/+25298
https://origsvn.digium.com/svn/asterisk/trunk ................ r277775 | tilghman | 2010-07-17 12:42:32 -0500 (Sat, 17 Jul 2010) | 12 lines Merged revisions 277738 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r277738 | tilghman | 2010-07-17 11:59:11 -0500 (Sat, 17 Jul 2010) | 5 lines Remove uclibc cross-compile triplet, as uclibc has a working fork()... it's only uclinux that does not. (closes issue #17616) Reported by: pprindeville ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277776 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-17Merged revisions 277773 via svnmerge from tilghman2-27/+112
https://origsvn.digium.com/svn/asterisk/trunk ................ r277773 | tilghman | 2010-07-17 12:39:28 -0500 (Sat, 17 Jul 2010) | 15 lines Merged revisions 277568 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r277568 | tilghman | 2010-07-16 16:54:29 -0500 (Fri, 16 Jul 2010) | 8 lines Since we split values at the semicolon, we should store values with a semicolon as an encoded value. (closes issue #17369) Reported by: gkservice Patches: 20100625__issue17369.diff.txt uploaded by tilghman (license 14) Tested by: tilghman ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277774 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 277530 via svnmerge from mnicholson1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r277530 | mnicholson | 2010-07-16 16:24:45 -0500 (Fri, 16 Jul 2010) | 11 lines Merged revisions 277497 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r277497 | mnicholson | 2010-07-16 16:18:38 -0500 (Fri, 16 Jul 2010) | 4 lines Default to no udptl error correction so that error correction will be disabled in the event that the remote end indicates that they do not support the error correction mode we requested. FAX-128 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277563 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-16Merged revisions 277488 via svnmerge from jpeeler1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r277488 | jpeeler | 2010-07-16 16:16:08 -0500 (Fri, 16 Jul 2010) | 10 lines Fix reporting estimated queue hold time. Just say the number of seconds (after minutes) rather than doing some incorrect calculation with respect to minutes. (closes issue #17498) Reported by: corruptor Patches: holdesecs_bug.diff uploaded by corruptor (license 253) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277489 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-16Merged revisions 277467 via svnmerge from rmudgett1-2/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r277467 | rmudgett | 2010-07-16 15:27:51 -0500 (Fri, 16 Jul 2010) | 22 lines Merged revisions 277419 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r277419 | rmudgett | 2010-07-16 15:18:54 -0500 (Fri, 16 Jul 2010) | 15 lines priexclusive in chan_dahdi.conf ignored when reloading dahdi module During a reload, the priexclusive and outsignalling parameters are not read in from the config file as intended. Unfortunately, they get set to defaults as a result. This patch makes sure that they do not get set to defaults during a reload. (closes issue #17441) Reported by: mtryfoss Patches: issue17441_v1.4.patch uploaded by rmudgett (license 664) issue17441_v1.6.2.patch uploaded by rmudgett (license 664) issue17441_trunk.patch uploaded by rmudgett (license 664) Tested by: rmudgett ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277485 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-16Merged revisions 277452 via svnmerge from tilghman2-0/+22
https://origsvn.digium.com/svn/asterisk/trunk ........ r277452 | tilghman | 2010-07-16 15:25:11 -0500 (Fri, 16 Jul 2010) | 2 lines Add documentation for MOH realtime fields ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277478 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-16Merged revisions 277366 via svnmerge from jpeeler1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r277366 | jpeeler | 2010-07-16 14:22:49 -0500 (Fri, 16 Jul 2010) | 7 lines Add missing handling for ringing state for use with queue empty options. (closes issue #17471) Reported by: jazzy Patches: app_queue.c.diff uploaded by jazzy (license 1056) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277377 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 277183 via svnmerge from pabelanger1-3/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r277183 | pabelanger | 2010-07-16 13:13:46 -0400 (Fri, 16 Jul 2010) | 15 lines Merged revisions 277182 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r277182 | pabelanger | 2010-07-16 13:10:36 -0400 (Fri, 16 Jul 2010) | 8 lines Total analysis time error with SIP and silence suppression When using app_amd with SIP providers that have silence suppression on, the iTotalTime count increases exponentially. (closes issue #17656) Reported by: juls ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277188 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 276788 via svnmerge from jpeeler1-35/+33
https://origsvn.digium.com/svn/asterisk/trunk ........ r276788 | jpeeler | 2010-07-15 15:21:03 -0500 (Thu, 15 Jul 2010) | 6 lines Correct not setting the bindport before attempting to open the socket. Related to changes from 276571, I was accidentally testing with a port set in my configuration causing me to miss this. Also moved the TCP handling as well to occur before build_peer is called. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@276809 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 276571 via svnmerge from jpeeler1-50/+49
https://origsvn.digium.com/svn/asterisk/trunk ........ r276571 | jpeeler | 2010-07-14 17:58:24 -0500 (Wed, 14 Jul 2010) | 21 lines Fix MWI notification transmission problems over SIP. MWI updates were not being sent if no messages were found in the event cache. This was corrected since a phone may need to clear its MWI status configured previously from another mailbox. Upon module or sip reload, MWI updates could not be sent due to the sipsock socket not being set early enough in reload_config. The code handling the descriptor assignment and such has simply been moved before the call to build_peer. Issuing a sip reload cleared the IP address of the peer, but skipped checking the database for registration information. The database is now checked both for sip reload and actually reloading the module. If a transmission occurs before the do_monitor thread has started, do not attempt to send a signal to it. (closes issue #17398) Reported by: ip-rob ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@276572 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-14Merged revisions 276268 via svnmerge from lmadsen1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r276268 | lmadsen | 2010-07-14 06:51:48 -0500 (Wed, 14 Jul 2010) | 9 lines Merged revisions 276267 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r276267 | lmadsen | 2010-07-14 06:49:01 -0500 (Wed, 14 Jul 2010) | 1 line Update documentation for voicemail.conf externpass option. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@276269 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 276074 via svnmerge from jpeeler1-109/+194
https://origsvn.digium.com/svn/asterisk/trunk ................ r276074 | jpeeler | 2010-07-13 12:37:40 -0500 (Tue, 13 Jul 2010) | 19 lines Merged revisions 275773 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r275773 | jpeeler | 2010-07-12 15:34:51 -0500 (Mon, 12 Jul 2010) | 12 lines Make user removals and traversals thread safe in meetme. Race conditions present in meetme involving the user list where a lack of locking has the potential for a user to be removed during a traversal or as in the case of the reporter after checking if the list is empty could cause a crash. Fixing this was done by convering the userlist to an ao2 container. (closes issue #17390) Reported by: Vince Review: https://reviewboard.asterisk.org/r/746/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@276121 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-13Merged revisions 275910 via svnmerge from tilghman6-41/+17
https://origsvn.digium.com/svn/asterisk/trunk ................ r275910 | tilghman | 2010-07-13 09:48:40 -0500 (Tue, 13 Jul 2010) | 9 lines Merged revisions 275909 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r275909 | tilghman | 2010-07-13 09:47:30 -0500 (Tue, 13 Jul 2010) | 2 lines Move SQL scripts into their own database-specific directories. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275911 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-12Merged revisions 275626 via svnmerge from lmadsen1-0/+7
https://origsvn.digium.com/svn/asterisk/trunk ........ r275626 | lmadsen | 2010-07-12 10:37:01 -0500 (Mon, 12 Jul 2010) | 11 lines cdr_pgsql does not detect when a table is found. This change adds an ERROR message to let you know when a failure exists to get the columns from the pgsql database, which typically means that the table does not exist. (closes issue #17478) Reported by: kobaz Patches: cdr_pgsql.patch uploaded by kobaz (license 834) Tested by: kobaz, russell, lmadsen ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275627 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-10Merged revisions 245192 via svnmerge from russell2-48/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r245192 | mmichelson | 2010-02-06 08:43:03 -0600 (Sat, 06 Feb 2010) | 21 lines Remove useless sip options related to hash table size. First off, these options weren't actually doing anything. By the time the options were parsed, the peer and dialog containers had already been allocated with their default values. Second, hash table size is something that doesn't really make sense to change in a config file. If a user is that interested in changing the hashtable size, he can modify the source itself. I have removed the parsing of the hash_peer, hash_user, and hash_dialog options. I have removed the hash_user_size variable altogether since it is not used at all. I also changed hash_peer_size and hash_dialog_size to be constant, and have changed the symbols to be in all caps as constants typically are. I have also removed the entire section in sip.conf.sample regarding configurable hashtable sizes. ........ (merge to 1.6.2 inspired by issue #17553) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275469 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-10unblock a revrussell0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275468 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09Merged revisions 275424 via svnmerge from russell2-24/+70
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 275249 via svnmerge from pabelanger1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r275249 | pabelanger | 2010-07-09 15:21:27 -0400 (Fri, 09 Jul 2010) | 15 lines Merged revisions 275241 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r275241 | pabelanger | 2010-07-09 15:20:00 -0400 (Fri, 09 Jul 2010) | 8 lines Fix logging message for stale nonce. (closes issue #17582) Reported by: kenner Patches: chan_sip.c.diff uploaded by kenner (license 1040) Tested by: lmadsen ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275260 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 275147 via svnmerge from russell1-10/+11
https://origsvn.digium.com/svn/asterisk/trunk ........ r275147 | russell | 2010-07-09 13:11:13 -0500 (Fri, 09 Jul 2010) | 2 lines Move parking lot sample config out from the middle of dynamic features sample config. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275148 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 275028 via svnmerge from mnicholson1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r275028 | mnicholson | 2010-07-09 11:05:58 -0500 (Fri, 09 Jul 2010) | 15 lines Merged revisions 275027 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r275027 | mnicholson | 2010-07-09 11:04:21 -0500 (Fri, 09 Jul 2010) | 8 lines Clear the AST_CDR_FLAG_DIALED flag for channels going into the pbx via the G option in app_dial (closes issue #17592) Reported by: jamicque Patches: G-flag-cdr-fix1.diff uploaded by mnicholson (license 96) Tested by: jamicque, mnicholson ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275029 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09Merged revisions 275022 via svnmerge from russell2-1/+11
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-07Merged revisions 274639 via svnmerge from rmudgett1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r274639 | rmudgett | 2010-07-07 13:32:35 -0500 (Wed, 07 Jul 2010) | 1 line Add missing conditional around chan_dahdi mfcr2_skip_category config parameter. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@274640 f38db490-d61c-443f-a65b-d21fe96a405b