aboutsummaryrefslogtreecommitdiffstats
path: root/main
AgeCommit message (Collapse)AuthorFilesLines
2010-01-22Add Dialed Number Identifier (DNID) field to cdr.alecdavis1-0/+1
Branch support, retains ABI, if backend CDR collector is adaptive then database requires 'dnid' field to be added, otherwise no functional changes. Reported by: alecdavis Tested by: alecdavis Patch cdr_dnid.diff2.txt uploaded by alecdavis (license 585) Review: https://reviewboard.asterisk.org/r/455/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@242139 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-20Merged revisions 241714 via svnmerge from dvossel1-18/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r241714 | dvossel | 2010-01-20 15:14:47 -0600 (Wed, 20 Jan 2010) | 10 lines rtp timestamp to timeval calculation fix The rtp timestamp to timeval calculation was only accurate for 8kHz audio. This patch corrects this. Review: https://reviewboard.asterisk.org/r/468/ SWP-648 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@241721 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-20Update CDR variables as pbx startsalecdavis1-0/+4
Allows CDR variables added in cdr.c:set_one_cid to become visable during the call, by executing ast_cdr_update() early in __ast_pbx_run. Based on cdr_update.diff3.txt (issue #16638) Reported by: alecdavis Patches: cdr_update.diff3.txt uploaded by alecdavis (license 585) Tested by: alecdavis git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@241455 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-19Merged revisions 241366 via svnmerge from jpeeler1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r241366 | jpeeler | 2010-01-19 16:59:53 -0600 (Tue, 19 Jan 2010) | 13 lines Initialize data on the stack so that Park doesn't interpret random arguments. passdata was only being set in pbx_substitue_variables when arguments were passed. (closes issue #16406) (closes issue #16586) Reported by: DLNoah Patches: bug16586v2.patch uploaded by jpeeler (license 325) Tested by: DLNoah ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@241369 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-18Merged revisions 241016 via svnmerge from seanbright1-22/+18
https://origsvn.digium.com/svn/asterisk/trunk ................ r241016 | seanbright | 2010-01-18 14:57:52 -0500 (Mon, 18 Jan 2010) | 19 lines Merged revisions 241015 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r241015 | seanbright | 2010-01-18 14:54:19 -0500 (Mon, 18 Jan 2010) | 12 lines Plug a memory leak when reading configs with their comments. While reading through configuration files with the intent of returning their full contents (comments specifically) we allocated some memory and then forgot to free it. This doesn't fix 16554 but clears up a leak I had in the lab. (issue #16554) Reported by: mav3rick Patches: issue16554_20100118.patch uploaded by seanbright (license 71) Tested by: seanbright ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@241019 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-17Merged revisions 240717 via svnmerge from seanbright1-1/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r240717 | seanbright | 2010-01-17 14:45:48 -0500 (Sun, 17 Jan 2010) | 5 lines Avoid a crash on Solaris when running 'core show functions.' (closes issue #16309) Reported by: asgaroth ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@240720 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-15Merged revisions 240499-240500 via svnmerge from tilghman1-16/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r240499 | tilghman | 2010-01-15 15:40:14 -0600 (Fri, 15 Jan 2010) | 9 lines The previous attempt at using a pipe to guarantee astcanary shutdown did not work. We're revisiting the previous patch, albeit with a method that overcomes the prior criticism that it was not POSIX-compliant. (closes issue #16602) Reported by: frawd Patches: 20100114__issue16602.diff.txt uploaded by tilghman (license 14) Tested by: frawd ........ r240500 | tilghman | 2010-01-15 15:42:36 -0600 (Fri, 15 Jan 2010) | 2 lines Oops, missed an include ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@240503 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-15Merged revisions 240411 via svnmerge from russell1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r240411 | russell | 2010-01-15 14:41:11 -0600 (Fri, 15 Jan 2010) | 7 lines Ensure payload type is properly checked when comparing against cached events. (closes issue #16607) Reported by: ddv2005 Patches: event.patch uploaded by ddv2005 (license 769) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@240413 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-14Merged revisions 240175 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r240175 | tilghman | 2010-01-14 11:34:53 -0600 (Thu, 14 Jan 2010) | 2 lines Similarly, ensure that matchcid is duplicated correctly when merging contexts. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@240178 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-14Merged revisions 240129 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r240129 | tilghman | 2010-01-14 10:52:22 -0600 (Thu, 14 Jan 2010) | 4 lines Ensure that the callerid is NULL when the parent is effectively NULL. This applies only to pattern-match hints, which create exact-match hints on the fly. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@240132 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-14Merged revisions 240078 via svnmerge from mnicholson1-3/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r240078 | mnicholson | 2010-01-14 10:14:35 -0600 (Thu, 14 Jan 2010) | 2 lines This change fixes a few bugs in the way the far max IFP was calculated that were introduced in r231692. (closes issue #16497) Reported by: globalnetinc Patches: udptl-max-ifp-fix1.diff uploaded by mnicholson (license 96) Tested by: globalnetinc ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@240079 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-13Merged revisions 239839 via svnmerge from jpeeler1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r239839 | jpeeler | 2010-01-13 13:48:16 -0600 (Wed, 13 Jan 2010) | 18 lines Merged revisions 239838 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r239838 | jpeeler | 2010-01-13 13:43:33 -0600 (Wed, 13 Jan 2010) | 11 lines Fix regression for timed out parked call returning to caller This issue seems to have been exposed by the fix in 160390 whereby using a masquerade prevented a crash. The new channel used in the masquerade was not copying the macro information from the old channel. (closes issue #15459) Reported by: djrodman Patches: patch_15459.txt uploaded by mnick (license ) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@239840 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-13Merged revisions 239712 via svnmerge from dvossel1-7/+25
https://origsvn.digium.com/svn/asterisk/trunk ........ r239712 | dvossel | 2010-01-13 10:31:14 -0600 (Wed, 13 Jan 2010) | 24 lines add silence gen to wait apps asterisk.conf's 'transmit_silence' option existed before this patch, but was limited to only generating silence while recording and sending DTMF. Now enabling the transmit_silence option generates silence during wait times as well. To achieve this, ast_safe_sleep has been modified to generate silence anytime no other generators are present and transmit_silence is enabled. Wait apps not using ast_safe_sleep now generate silence when transmit_silence is enabled as well. (closes issue #16524) Reported by: kobaz (closes issue #16523) Reported by: kobaz Tested by: dvossel Review: https://reviewboard.asterisk.org/r/456/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@239713 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-13Merged revisions 239665 via svnmerge from oej1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r239665 | oej | 2010-01-13 11:45:19 +0100 (Ons, 13 Jan 2010) | 2 lines MAX() moved to utils.h ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@239666 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-12Merged revisions 239571 via svnmerge from tilghman1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r239571 | tilghman | 2010-01-12 13:58:00 -0600 (Tue, 12 Jan 2010) | 5 lines Blank callerid and NULL callerid should not compare equal. The second is the default state for matching CID in the dialplan (no matching) while the first matches one particular CallerID. This is a regression. (fixes AST-314, SWP-611) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@239575 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-09Merged revisions 238916 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r238916 | tilghman | 2010-01-08 19:08:04 -0600 (Fri, 08 Jan 2010) | 13 lines Merged revisions 238915 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r238915 | tilghman | 2010-01-08 18:57:58 -0600 (Fri, 08 Jan 2010) | 6 lines -1 is interpreted as an error, intead of the maximum mask. (closes issue #16241) Reported by: vnovy Patches: manager.c.patch uploaded by vnovy (license 922) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238985 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-08Merged revisions 238835 via svnmerge from jpeeler1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r238835 | jpeeler | 2010-01-08 17:30:55 -0600 (Fri, 08 Jan 2010) | 11 lines Merged revisions 238834 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r238834 | jpeeler | 2010-01-08 17:28:37 -0600 (Fri, 08 Jan 2010) | 4 lines Stop a crash when no peer is passed to masq_park_call. (distantly related to issue #16406) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238838 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-08Merged revisions 238635 via svnmerge from dvossel1-1/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r238635 | dvossel | 2010-01-08 13:39:30 -0600 (Fri, 08 Jan 2010) | 22 lines fixes AUDIOHOOK_INHERIT regression During the process of removing an audiohook from one channel and attaching it to another the audiohook's status is updated to DONE and then back to whatever it was previously. Typically updating the status after setting it to DONE is not a good idea because DONE can trigger unrecoverable audiohook destruction events... because of this a conditional check was added to audiohook_update_status to explicitly prevent the audiohook from ever changing after being set to DONE. It was this check that prevented audiohook inherit from work properly though. Now ast_audiohook_move_by_source is treated as a special exception, as the audiohook must be returned to its previous status after attaching it to the new channel. This is only a safe operation because the audiohook's lock is held the entire time, otherwise this could cause trouble. (closes issue #16522) Reported by: corruptor ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238637 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-08Merged revisions 238630 via svnmerge from mnicholson1-4/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r238630 | mnicholson | 2010-01-08 13:32:11 -0600 (Fri, 08 Jan 2010) | 12 lines Merged revisions 238629 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r238629 | mnicholson | 2010-01-08 13:20:44 -0600 (Fri, 08 Jan 2010) | 5 lines Properly calculate the remaining space in the output string when reducing format strings. (closes issue #16560) Reported by: goldwein ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238632 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-08Merged revisions 238583 via svnmerge from jpeeler1-3/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r238583 | jpeeler | 2010-01-08 11:18:41 -0600 (Fri, 08 Jan 2010) | 5 lines Stop trying to find a parking space after traversing the parkinglot one time. (closes issue #16428) Reported by: Yasuhiro Konishi ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238586 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-07Merged revisions 209400 via svnmerge from tilghman1-8/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r209400 | kpfleming | 2009-07-28 08:49:46 -0500 (Tue, 28 Jul 2009) | 3 lines Define side-effect-safe MIN and MAX macros and remove duplicate definitions from various files. (closes issue #16251) Reported by: asgaroth ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238499 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-06Merged revisions 238134 via svnmerge from jpeeler1-3/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r238134 | jpeeler | 2010-01-06 13:05:06 -0600 (Wed, 06 Jan 2010) | 10 lines Fix channel name comparison for bridge application. The channel name comparison was not comparing the whole string and therefore if one channel name was a substring of the other, the bridge would fail. (closes issue #16528) Reported by: telecos82 Patches: res_features_r236843.diff uploaded by telecos82 (license 687) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238137 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-05Merged revisions 237839 via svnmerge from dvossel1-3/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r237839 | dvossel | 2010-01-05 13:29:47 -0600 (Tue, 05 Jan 2010) | 19 lines fixes subscriptions being lost after 'module reload' During a module reload if multiple extension configs are present, such as both extensions.conf and extensions.ael, watchers for one config's hints will be lost during the merging of the other config. This happens because hint watchers are only preserved for the current config being merged. The old context list is destroyed after the merging takes place, meaning any watchers that were not perserved will be removed. Now all hints are preserved during merging regardless of what config file is being merged. These hints are only restored if they are present within the new context list. (closes issue #16093) Reported by: jlaroff ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237840 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-05Merged revisions 237699 via svnmerge from russell1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r237699 | russell | 2010-01-05 11:16:01 -0600 (Tue, 05 Jan 2010) | 14 lines Merged revisions 237697 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r237697 | russell | 2010-01-05 11:13:28 -0600 (Tue, 05 Jan 2010) | 7 lines Change a NOTICE log message to DEBUG where it belongs. (closes issue #16479) Reported by: alexrecarey (closes SWP-577) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237743 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-04Merged revisions 237574 via svnmerge from tilghman1-26/+26
https://origsvn.digium.com/svn/asterisk/trunk ................ r237574 | tilghman | 2010-01-04 15:48:20 -0600 (Mon, 04 Jan 2010) | 13 lines Merged revisions 237573 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r237573 | tilghman | 2010-01-04 15:45:46 -0600 (Mon, 04 Jan 2010) | 6 lines Bounds checking for input string (closes issue #16407) Reported by: qwell Patches: 20100104__issue16407.diff.txt uploaded by tilghman (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237577 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-04Merged revisions 237494 via svnmerge from tilghman1-22/+20
https://origsvn.digium.com/svn/asterisk/trunk ................ r237494 | tilghman | 2010-01-04 14:59:01 -0600 (Mon, 04 Jan 2010) | 15 lines Merged revisions 237493 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r237493 | tilghman | 2010-01-04 14:57:35 -0600 (Mon, 04 Jan 2010) | 8 lines Regression in issue #15421 - Pattern matching (closes issue #16482) Reported by: wdoekes Patches: astsvn-16482-betterfix.diff uploaded by wdoekes (license 717) 20091223__issue16482.diff.txt uploaded by tilghman (license 14) Tested by: wdoekes, tilghman ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237497 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-04Merged revisions 237414 via svnmerge from tilghman1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r237414 | tilghman | 2010-01-04 13:03:20 -0600 (Mon, 04 Jan 2010) | 2 lines Oops, didn't compile (thanks, kpfleming) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237417 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-04Merged revisions 237410 via svnmerge from tilghman1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r237410 | tilghman | 2010-01-04 12:42:10 -0600 (Mon, 04 Jan 2010) | 7 lines Further reduce the encoded blank values back to blank in the realtime API. (closes issue #16533) Reported by: sergee Patches: 200100104__issue16533.diff.txt uploaded by tilghman (license 14) Tested by: sergee ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237413 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-04Merged revisions 237406 via svnmerge from tilghman1-1/+6
https://origsvn.digium.com/svn/asterisk/trunk ................ r237406 | tilghman | 2010-01-04 12:28:28 -0600 (Mon, 04 Jan 2010) | 23 lines Merged revisions 237405 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r237405 | tilghman | 2010-01-04 12:19:00 -0600 (Mon, 04 Jan 2010) | 16 lines Add a flag to disable the Background behavior, for AGI users. This is in a section of code that relates to two other issues, namely issue #14011 and issue #14940), one of which was the behavior of Background when called with a context argument that matched the current context. This fix broke FreePBX, however, in a post-Dial situation. Needless to say, this is an extremely difficult collision of several different issues. While the use of an exception flag is ugly, fixing all of the issues linked is rather difficult (although if someone would like to propose a better solution, we're happy to entertain that suggestion). (closes issue #16434) Reported by: rickead2000 Patches: 20091217__issue16434.diff.txt uploaded by tilghman (license 14) 20091222__issue16434__1.6.1.diff.txt uploaded by tilghman (license 14) Tested by: rickead2000 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237409 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-30Merged revisions 236893 via svnmerge from jpeeler1-0/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r236893 | jpeeler | 2009-12-30 14:34:41 -0600 (Wed, 30 Dec 2009) | 11 lines Fix compiling with LOW_MEMORY. Modified handle_verbose to be LOW_MEMORY aware. (closes issue #16381) Reported by: michael_iedema Patches: ast_complete_source_filename.patch uploaded by michael iedema (license 942) modified by me ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@236899 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-28Merged revisions 236713 via svnmerge from qwell2-8/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r236713 | qwell | 2009-12-28 16:09:40 -0600 (Mon, 28 Dec 2009) | 8 lines Allow "REMAINDER" to function properly in expressions. (closes issue #16427) Reported by: wdoekes Patches: ast16-reminder-remainder.patch uploaded by wdoekes (license 717) Tested by: wdoekes ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@236716 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-21Merged revisions 235822 via svnmerge from tilghman1-7/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r235822 | tilghman | 2009-12-21 11:00:46 -0600 (Mon, 21 Dec 2009) | 15 lines Merged revisions 235821 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r235821 | tilghman | 2009-12-21 10:45:03 -0600 (Mon, 21 Dec 2009) | 8 lines Send parking lot announcement to the channel which parked the call, not the park-ee. (closes issue #16234) Reported by: yeshuawatso Patches: 20091210__issue16234.diff.txt uploaded by tilghman (license 14) 20091221__issue16234__1.4.diff.txt uploaded by tilghman (license 14) Tested by: yeshuawatso ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@235826 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-20restarts busydetector (if enabled) when DTMF is received after call is bridged.alecdavis1-7/+11
(closes issue #16389) Reported by: alecdavis Tested by: alecdavis Patch dtmf_busydetector.diff2.txt uploaded by alecdavis (license 585) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@235775 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-18Merged revisions 235660 via svnmerge from jpeeler1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r235660 | jpeeler | 2009-12-18 16:51:37 -0600 (Fri, 18 Dec 2009) | 55 lines Merged revisions 235635 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r235635 | jpeeler | 2009-12-18 16:29:51 -0600 (Fri, 18 Dec 2009) | 48 lines Correct CDR dispositions for BUSY/FAILED This patch is simple in that it reorders the disposition defines so that the fix for issue 12946 works properly (the default CDR disposition was changed to AST_CDR_NOANSWER). Also, the AST_CDR_FLAG_ORIGINATED flag was set in ast_call to ensure all CDR records are written. The side effects of CDR changes are scary, so I'm documenting the test cases performed to attempt to catch any regressions. The following tests were all performed using 1.4 rev 195881 vs head (235571) + patch: A calls B C calls B (busy) Hangup C Hangup A (Both SIP and features) A calls B A blind transfers to C Hangup C (Both SIP and features) A calls B A attended transfers to C Hangup C A calls B A attended transfers to C (SIP) C blind transfers to A (features) Hangup A All of the test scenario CDRs matched. The following tests were performed just with the patch to ensure proper operation (with unanswered=yes): exten =>s,1,Answer exten =>s,n,ResetCDR(w) exten =>s,n,ResetCDR(w) exten =>s,1,ResetCDR(w) exten =>s,n,ResetCDR(w) (closes issue #16180) Reported by: aatef Patches: bug16180.patch uploaded by jpeeler (license 325) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@235665 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-17Merged revisions 235422 via svnmerge from tilghman1-3/+13
https://origsvn.digium.com/svn/asterisk/trunk ................ r235422 | tilghman | 2009-12-17 11:19:08 -0600 (Thu, 17 Dec 2009) | 15 lines Merged revisions 235421 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r235421 | tilghman | 2009-12-17 11:17:51 -0600 (Thu, 17 Dec 2009) | 8 lines Use context from which Macro is executed, not macro context, if applicable. Also, ensure that the extension COULD match, not just that it won't match more. (closes issue #16113) Reported by: OrNix Patches: 20091216__issue16113.diff.txt uploaded by tilghman (license 14) Tested by: OrNix ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@235425 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-15Whitespace.alecdavis1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@234939 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-15restarts busydetector (if enabled) when DTMF is received.alecdavis1-0/+6
(closes issue #16389) Reported by: alecdavis Tested by: alecdavis Patch dtmf_busydetector.diff.txt uploaded by alecdavis (license 585) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@234898 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-14Merged revisions 234572 via svnmerge from seanbright1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r234572 | seanbright | 2009-12-14 11:08:09 -0500 (Mon, 14 Dec 2009) | 2 lines The default rate for 'timing test' is actually 50/sec, not 100/sec as advertised. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@234575 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-07Merged revisions 233611 via svnmerge from dvossel1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r233611 | dvossel | 2009-12-07 17:28:51 -0600 (Mon, 07 Dec 2009) | 4 lines fixes incorrect logic in ast_uri_encode issue #16299 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@233612 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-04Merged revisions 233100 via svnmerge from russell1-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r233100 | russell | 2009-12-04 11:18:22 -0600 (Fri, 04 Dec 2009) | 14 lines Merged revisions 233092 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r233092 | russell | 2009-12-04 11:12:47 -0600 (Fri, 04 Dec 2009) | 7 lines Only do frame payload check for HOLD frames. This code was added for helping to debug the source of invalid HOLD frames. However, a side effect of this is that it will incorrectly report errors for frames that have an integer payload. Make the check for this block specific to the HOLD frame case. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@233130 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-04Merged revisions 233046 via svnmerge from mnick1-1/+6
https://origsvn.digium.com/svn/asterisk/trunk ................ r233046 | mnick | 2009-12-04 09:38:33 -0600 (Fri, 04 Dec 2009) | 17 lines Merged revisions 233014 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r233014 | mnick | 2009-12-04 09:17:03 -0600 (Fri, 04 Dec 2009) | 11 lines Warning message gets displayed only once Added additional field 'int display_inband_dtmf_warning', which when set to '1' displays the warning ('Inband DTMF is not supported on codec %s. Use RFC2833'), and when set to '0' doesn't display the warning. Otherwise you would get hundreds of warnings every second. (closes issue #15769) Reported by: falves11 Patches: patch_15769_14.txt uploaded by mnick (license 874) Tested by: mnick, falves11 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@233049 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-02Merged revisions 232582 via svnmerge from jpeeler1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r232582 | jpeeler | 2009-12-02 16:02:43 -0600 (Wed, 02 Dec 2009) | 14 lines Merged revisions 232581 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r232581 | jpeeler | 2009-12-02 15:57:42 -0600 (Wed, 02 Dec 2009) | 7 lines Send ack (response/message) after receiving manager action userevent (closes issue #16264) Reported by: dimas Patches: event-ack.patch uploaded by dimas (license 88) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@232585 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-02Merged revisions 232576 via svnmerge from jpeeler1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r232576 | jpeeler | 2009-12-02 15:32:50 -0600 (Wed, 02 Dec 2009) | 8 lines Make manager response to "Action: events" finish with empty line (closes issue #16275) Reported by: vnovy Patches: manager.c.diff uploaded by vnovy (license 922) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@232579 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-02Merged revisions 232351 via svnmerge from dvossel1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r232351 | dvossel | 2009-12-02 11:00:15 -0600 (Wed, 02 Dec 2009) | 12 lines Merged revisions 232350 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r232350 | dvossel | 2009-12-02 10:59:18 -0600 (Wed, 02 Dec 2009) | 6 lines ast_outaddrfor doesn't do htons() on port, looks odd in strace. (closes issue #16290) Reported by: wdoekes ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@232352 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-01Merged revisions 232008 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r232008 | russell | 2009-12-01 17:27:53 -0600 (Tue, 01 Dec 2009) | 9 lines Merged revisions 232007 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r232007 | russell | 2009-12-01 17:25:36 -0600 (Tue, 01 Dec 2009) | 2 lines Fix a warning pointed out by buildbot. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@232011 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-01Merged revisions 231927 via svnmerge from jpeeler1-0/+11
https://origsvn.digium.com/svn/asterisk/trunk ................ r231927 | jpeeler | 2009-12-01 15:54:21 -0600 (Tue, 01 Dec 2009) | 19 lines Merged revisions 231911 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r231911 | jpeeler | 2009-12-01 15:29:31 -0600 (Tue, 01 Dec 2009) | 12 lines Fix crash with invalid frame data The crash was happening as a result of a frame containing an invalid data pointer, but was set with data length of zero. The few times the issue was reproduced it _seemed_ that the frame was queued properly, that is the data pointer was set to NULL. I never could reproduce the crash so as a last resort the crash has been fixed, but a check in __ast_read has been added to give as much information about the source of problematic frames in the future. (closes issue #16058) Reported by: atis ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@231930 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-01Merged revisions 231867 via svnmerge from dvossel1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r231867 | dvossel | 2009-12-01 15:20:19 -0600 (Tue, 01 Dec 2009) | 9 lines Merged revisions 231853 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r231853 | dvossel | 2009-12-01 15:14:31 -0600 (Tue, 01 Dec 2009) | 3 lines WaitExten m option with no parameters generates frame with zero datalen but non-null data ptr ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@231870 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-01Merged revisions 231741 via svnmerge from mnicholson1-2/+15
https://origsvn.digium.com/svn/asterisk/trunk ................ r231741 | mnicholson | 2009-12-01 09:47:36 -0600 (Tue, 01 Dec 2009) | 9 lines Merged revisions 231740 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r231740 | mnicholson | 2009-12-01 09:34:57 -0600 (Tue, 01 Dec 2009) | 2 lines Ignore unknown formats in ast_format_str_reduce() and return an error if no know formats are found. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@231743 f38db490-d61c-443f-a65b-d21fe96a405b
2009-11-30Merged revisions 231692 via svnmerge from kpfleming1-134/+181
https://origsvn.digium.com/svn/asterisk/trunk ........ r231692 | kpfleming | 2009-11-30 15:47:42 -0600 (Mon, 30 Nov 2009) | 22 lines Another round of UDPTL stack fixes/improvements: 1) Allow users of UDPTL stack to associate a character-string tag with a UDPTL session, so that log/error/debug messages generated by the UDPTL stack can be 'connected' to the endpoint that caused them to be generated. 2) Improve comments (and process) of calculating the far end's maximum IFP size when redundancy mode is in use for error correction. 3) When an IFP larger than the calculated 'far max IFP' size is presented for writing, truncate it rather than putting in the buffer and allowing the buffer to overflow; this will cause the ends to retrain to a lower bit rate that produces IFPs of an appropriate size if possible, and if not possible, the FAX transfer will fail completely. In these cases, it is due to the one endpoint supplying a T38FaxMaxDatagram value that is improperly calculated and is too low to be of use; we have configuration options available to override this behavior. 4) Eliminate use of T38FaxMaxDatagram value in udptl.conf; it is no longer needed. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@231696 f38db490-d61c-443f-a65b-d21fe96a405b
2009-11-30Merged revisions 231688 via svnmerge from mnicholson2-6/+66
https://origsvn.digium.com/svn/asterisk/trunk ................ r231688 | mnicholson | 2009-11-30 15:31:55 -0600 (Mon, 30 Nov 2009) | 15 lines Merged revisions 231614 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r231614 | mnicholson | 2009-11-30 15:11:44 -0600 (Mon, 30 Nov 2009) | 8 lines Remove duplicate entries from voicemail format lists. This prevents app_voicemail from entering an infinite loop when the same format is specified twice in the format list. (closes issue #15625) Reported by: Shagg63 Tested by: mnicholson Review: https://reviewboard.asterisk.org/r/429/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@231689 f38db490-d61c-443f-a65b-d21fe96a405b