aboutsummaryrefslogtreecommitdiffstats
path: root/main
AgeCommit message (Collapse)AuthorFilesLines
2010-05-12Merged revisions 262800 via svnmerge from pabelanger2-1/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r262800 | pabelanger | 2010-05-12 15:59:16 -0400 (Wed, 12 May 2010) | 8 lines Notify CLI when modules is loaded / unloaded (closes issue #17308) Reported by: pabelanger Patches: cli.modules.patch uploaded by pabelanger (license 224) Tested by: pabelanger, russell ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262802 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-06Merged revisions 261496 via svnmerge from russell1-10/+14
https://origsvn.digium.com/svn/asterisk/trunk ........ r261496 | russell | 2010-05-06 08:58:07 -0500 (Thu, 06 May 2010) | 40 lines Fix handling of removing nodes from the middle of a heap. This bug surfaced in 1.6.2 and does not affect code in any other released version of Asterisk. It manifested itself as SIP qualify not happening when it should, causing peers to go unreachable. This was debugged down to scheduler entries sometimes not getting executed when they were supposed to, which was in turn caused by an error in the heap code. The problem only sometimes occurs, and it is due to the logic for removing an entry in the heap from an arbitrary location (not just popping off the top). The scheduler performs this operation frequently when entries are removed before they run (when ast_sched_del() is used). In a normal pop off of the top of the heap, a node is taken off the bottom, placed at the top, and then bubbled down until the max heap property is restored (see max_heapify()). This same logic was used for removing an arbitrary node from the middle of the heap. Unfortunately, that logic is full of fail. This patch fixes that by fully restoring the max heap property when a node is thrown into the middle of the heap. Instead of just pushing it down as appropriate, it first pushes it up as high as it will go, and _then_ pushes it down. Lastly, fix a minor problem in ast_heap_verify(), which is only used for debugging. If a parent and child node have the same value, that is not an error. The only error is if a parent's value is less than its children. A huge thanks goes out to cappucinoking for debugging this down to the scheduler, and then producing an ast_heap test case that demonstrated the breakage. That made it very easy for me to focus on the heap logic and produce a fix. Open source projects are awesome. (closes issue #16936) Reported by: ib2 Tested by: cappucinoking, crjw (closes issue #17277) Reported by: cappucinoking Patches: heap-fix.rev2.diff uploaded by russell (license 2) Tested by: cappucinoking, russell ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@261497 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-04Merged revisions 261095 via svnmerge from tilghman1-2/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r261095 | tilghman | 2010-05-04 18:51:52 -0500 (Tue, 04 May 2010) | 18 lines Merged revisions 261093-261094 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r261093 | tilghman | 2010-05-04 18:36:53 -0500 (Tue, 04 May 2010) | 7 lines Protect against overflow, when calculating how long to wait for a frame. (closes issue #17128) Reported by: under Patches: d.diff uploaded by under (license 914) ........ r261094 | tilghman | 2010-05-04 18:47:08 -0500 (Tue, 04 May 2010) | 2 lines Add a tiny corner case to the previous commit ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@261097 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-29Merged revisions 260050 via svnmerge from dvossel1-11/+34
https://origsvn.digium.com/svn/asterisk/trunk ................ r260050 | dvossel | 2010-04-29 10:33:27 -0500 (Thu, 29 Apr 2010) | 21 lines Merged revisions 260049 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r260049 | dvossel | 2010-04-29 10:31:02 -0500 (Thu, 29 Apr 2010) | 14 lines Fixes crash in audiohook_write_list The middle_frame in the audiohook_write_list function was being freed if a audiohook manipulator returned a failure. This is incorrect logic. This patch resolves this and adds detailed descriptions of how this function should work and why manipulator failures must be ignored. (closes issue #17052) Reported by: dvossel Tested by: dvossel (closes issue #16196) Reported by: atis Review: https://reviewboard.asterisk.org/r/623/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@260052 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-28Merged revisions 259870 via svnmerge from dvossel1-5/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r259870 | dvossel | 2010-04-28 16:20:03 -0500 (Wed, 28 Apr 2010) | 39 lines Merged revisions 259858 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259858 | dvossel | 2010-04-28 16:16:03 -0500 (Wed, 28 Apr 2010) | 33 lines resolves deadlocks in chan_local Issue_1. In the local_hangup() 3 locks must be held at the same time... pvt, pvt->chan, and pvt->owner. Proper deadlock avoidance is done when the channel to hangup is the outbound chan_local channel, but when it is not the outbound channel we have an issue... We attempt to do deadlock avoidance only on the tech pvt, when both the tech pvt and the pvt->owner are locked coming into that loop. By never giving up the pvt->owner channel deadlock avoidance is not entirely possible. This patch resolves that by doing deadlock avoidance on both the pvt->owner and the pvt when trying to get the pvt->chan lock. Issue_2. ast_prod() is used in ast_activate_generator() to queue a frame on the channel and make the channel's read function get called. This function is used in ast_activate_generator() while the channel is locked, which mean's the channel will have a lock both from the generator code and the frame_queue code by the time it gets to chan_local.c's local_queue_frame code... local_queue_frame contains some of the same crazy deadlock avoidance that local_hangup requires, and this recursive lock prevents that deadlock avoidance from happening correctly. This patch removes ast_prod() from the channel lock so only one lock is held during the local_queue_frame function. (closes issue #17185) Reported by: schmoozecom Patches: issue_17185_v1.diff uploaded by dvossel (license 671) issue_17185_v2.diff uploaded by dvossel (license 671) Tested by: schmoozecom, GameGamer43 Review: https://reviewboard.asterisk.org/r/631/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259930 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-27Merged revisions 259439 via svnmerge from qwell3-54/+59
https://origsvn.digium.com/svn/asterisk/trunk ........ r259439 | qwell | 2010-04-27 16:13:01 -0500 (Tue, 27 Apr 2010) | 5 lines Add gar to the check for AR for those silly OSes (Solaris) that don't have ar. autoconf2.13 couldn't handle AC_PROG_GREP, so I removed it. This is fine, since we don't need to use anything that the configure script doesn't. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259471 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-26Merged revisions 259105 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r259105 | mmichelson | 2010-04-26 16:45:13 -0500 (Mon, 26 Apr 2010) | 9 lines Merged revisions 259104 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259104 | mmichelson | 2010-04-26 16:44:43 -0500 (Mon, 26 Apr 2010) | 3 lines Let compilation succeed warning-free when DONT_OPTIMIZE is turned off. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259108 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-26Merged revisions 259023 via svnmerge from mmichelson1-1/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r259023 | mmichelson | 2010-04-26 16:13:35 -0500 (Mon, 26 Apr 2010) | 19 lines Merged revisions 259018 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259018 | mmichelson | 2010-04-26 16:03:08 -0500 (Mon, 26 Apr 2010) | 13 lines Prevent Newchannel manager events for dummy channels. No Newchannel manager event will be fired for channels that are allocated to not match a registered technology type. Thus bogus channels allocated solely for variable substitution or CDR operations do not result in a Newchannel event. (closes issue #16957) Reported by: atis Review: https://reviewboard.asterisk.org/r/601 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259078 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-22Merged revisions 258671,258675 via svnmerge from mnicholson3-7/+19
https://origsvn.digium.com/svn/asterisk/trunk ................ r258671 | mnicholson | 2010-04-22 16:57:59 -0500 (Thu, 22 Apr 2010) | 32 lines Merged revisions 193391,258670 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r193391 | mnicholson | 2009-05-08 16:01:25 -0500 (Fri, 08 May 2009) | 8 lines Set the proper disposition on originated calls. (closes issue #14167) Reported by: jpt Patches: call-file-missing-cdr2.diff uploaded by mnicholson (license 96) Tested by: dlotina, rmartinez, mnicholson ........ r258670 | mnicholson | 2010-04-22 16:49:07 -0500 (Thu, 22 Apr 2010) | 11 lines Fix broken CDR behavior. This change allows a CDR record previously marked with disposition ANSWERED to be set as BUSY or NO ANSWER. Additionally this change partially reverts r235635 and does not set the AST_CDR_FLAG_ORIGINATED flag on CDRs generated from ast_call(). To preserve proper CDR behavior, the AST_CDR_FLAG_DIALED flag is now cleared from all brige CDRs in ast_bridge_call(). (closes issue #16797) Reported by: VarnishedOtter Tested by: mnicholson ........ (closes issue #16222) Reported by: telles Tested by: mnicholson ................ r258675 | mnicholson | 2010-04-22 17:11:23 -0500 (Thu, 22 Apr 2010) | 2 lines Fix previous commit. ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@258705 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-19Merged revisions 257810 via svnmerge from twilson1-6/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r257810 | twilson | 2010-04-19 12:57:41 -0500 (Mon, 19 Apr 2010) | 5 lines Fix incomplete CDR merge from r195881 Because res/res_features.c was removed and main/cdr.c added, these changes didn't make it to trunk and the 1.6.x branches ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@257833 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-15Merged revisions 257560 via svnmerge from tilghman1-38/+50
https://origsvn.digium.com/svn/asterisk/trunk ................ r257560 | tilghman | 2010-04-15 16:26:19 -0500 (Thu, 15 Apr 2010) | 13 lines Merged revisions 257544 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r257544 | tilghman | 2010-04-15 16:23:24 -0500 (Thu, 15 Apr 2010) | 6 lines Allow application options with arguments to contain parentheses, through a variety of escaping techniques. Fixes SWP-1194 (ABE-2143). Review: https://reviewboard.asterisk.org/r/604/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@257594 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-14Merged revisions 257262 via svnmerge from tilghman1-29/+40
https://origsvn.digium.com/svn/asterisk/trunk ........ r257262 | tilghman | 2010-04-14 17:57:35 -0500 (Wed, 14 Apr 2010) | 15 lines Yet another issue where the conversion of the application delimiter to comma caused an issue. Application arguments within the feature map could possibly contain a comma, which conflicts with the syntax of the features.conf configuration file. This patch allows the argument to be wrapped in parentheses or quoted, to allow the application arguments to be interpreted as a single configuration parameter. (closes issue #16646) Reported by: pinga-fogo Patches: 20100414__issue16646.diff.txt uploaded by tilghman (license 14) Tested by: tilghman Review: https://reviewboard.asterisk.org/r/547/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@257264 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-13Merged revisions 257146 via svnmerge from mnicholson1-1/+25
https://origsvn.digium.com/svn/asterisk/trunk ................ r257146 | mnicholson | 2010-04-13 13:10:30 -0500 (Tue, 13 Apr 2010) | 16 lines Merged revisions 257070 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r257070 | mnicholson | 2010-04-13 11:46:30 -0500 (Tue, 13 Apr 2010) | 9 lines Add an option to restore past broken behavor of the Events manager action Before r238915, certain values for the EventMask parameter of the Events action would result in no response being returned. This patch adds an option to restore that broken behavior. Also while fixing this bug I discovered that passing an empty EventMasks parameter would also result in no response being returned, this has been fixed as well while being preserved when the broken behavior is requested. (closes issue #17023) Reported by: nblasgen Review: https://reviewboard.asterisk.org/r/602/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@257214 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-02Merged revisions 256010 via svnmerge from russell1-3/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r256010 | russell | 2010-04-02 18:30:58 -0500 (Fri, 02 Apr 2010) | 9 lines Merged revisions 256009 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r256009 | russell | 2010-04-02 18:30:15 -0500 (Fri, 02 Apr 2010) | 2 lines Remove extremely verbose debug message. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@256012 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-02Merged revisions 255952 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r255952 | tilghman | 2010-04-02 15:19:01 -0500 (Fri, 02 Apr 2010) | 8 lines Pass the PID of the Asterisk process, not the PID of the canary. (closes issue #17065) Reported by: globalnetinc Patches: astcanary.patch uploaded by makoto (license 38) Tested by: frawd, globalnetinc ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@255954 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Fix DEBUG_THREADS issue with out-of-tree modules.qwell1-9/+48
Take 2, without ABI breakage this time. Review: https://reviewboard.asterisk.org/r/588/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@254717 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Merged revisions 254453 via svnmerge from twilson1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r254453 | twilson | 2010-03-25 11:03:51 -0500 (Thu, 25 Mar 2010) | 9 lines Merged revisions 254451 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r254451 | twilson | 2010-03-25 10:57:29 -0500 (Thu, 25 Mar 2010) | 2 lines Handle new SRCCHANGE control message here too ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@254486 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Recorded merge of revisions 254454 via svnmerge from mmichelson1-14/+37
https://origsvn.digium.com/svn/asterisk/trunk ................ r254454 | mmichelson | 2010-03-25 11:04:48 -0500 (Thu, 25 Mar 2010) | 50 lines Recorded merge of revisions 254452 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r254452 | mmichelson | 2010-03-25 10:59:56 -0500 (Thu, 25 Mar 2010) | 44 lines Several fixes regarding RFC2833 DTMF detection. Here is a copy and paste of the details from my request on reviewboard that dealt with these changes: Fix 1. The first change in place is to fix Mantis issue 15811, which deals with a situation where Asterisk will incorrectly interpret out of order RFC2833 frames as duplicate DTMF digits. For instance, we would receive a sequence like: seqno 1: DTMF 1 seqno 2: DTMF 1 seqno 3: DTMF 1 seqno 4: DTMF 1 seqno 6: DTMF 1 (end) seqno 5: DTMF 1 seqno 7: DTMF 1 (end) seqno 8: DTMF 1 (end) Prior to this patch when we received the frame with seqno 5, we would interpret this as a new DTMF 1. With this patch, we will check the seqno of the incoming digit and not process the frame if the seqno is lower than the last recorded seqno. Note that we do not record the seqno of the dropped DTMF frame for future processing. While the above situation is what was designed to be fixed, the patch is written in such a way that the following would also be fixed too: seqno 9: DTMF 1 seqno 10: DTMF 1 (end) seqno 11: DTMF 1 (end) seqno 13: DTMF 2 seqno 12: DTMF 1 (end) seqno 14: DTMF 2 seqno 15: DTMF 2 (end) seqno 16: DTMF 2 (end) seqno 17: DTMF 2 (end) In this second situation, the beginning of the DTMF 2 arrives before the final end frame of the DTMF 1. With the patch, seqno 12 is no processed and thus we properly interpret the DTMF. Fix 2. The second change in place is to fix an issue like the following: seqno 1: DTMF 1 seqno 2: DTMF 1 seqno 3: DTMF 1 (end) *packet lost* seqno 4: DTMF 1 (end) *packet lost* seqno 5: DTMF 1 (end) *packet lost* seqno 6: DTMF 2 When we receive seqno 6, we had code in place that was supposed to properly end the previously unended DTMF 1. The problem was that the code was essentially a no-op. The code would set up an end frame for the DTMF 1 but would immediately overwrite the frame with the begin for DTMF 2. I changed process_dtmf_rfc2833() so that instead of returning a single frame, it is given as an output parameter a list of frames. Each frame that needs to be returned is appended to this list. Fix 3. The final change is a minor one where an AST_CONTROL_SRCCHANGE frame could get lost. If we process a cisco DTMF or an RFC 3389 frame and no frame was returned, then we would return &ast_null_frame. The problem is that earlier in the function, we may have generated an AST_CONTROL_SRCCHANGE frame and put it in the list of frames we wish to return. This frame would be lost in such a case. The patch fixes this problem ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@254456 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-23Merged revisions 254050 via svnmerge from jpeeler1-2/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r254050 | jpeeler | 2010-03-23 16:17:23 -0500 (Tue, 23 Mar 2010) | 14 lines Exit native bridging early for greater timing accuracy with warnings This changes native bridging to break one millisecond early so that the more accurate timeval calculations done in the generic bridge can be performed using the bridge config. Currently the time between exiting native bridging slightly late can sometimes cause a large enough discrepancy for warnings to be missed. For the record, 1.4 does not attempt to native bridge at all when warnings are enabled. (closes issue #15815) Reported by: adomjan Review: https://reviewboard.asterisk.org/r/577/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@254065 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-22Merged revisions 253800 via svnmerge from mnicholson1-3/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r253800 | mnicholson | 2010-03-22 14:52:52 -0500 (Mon, 22 Mar 2010) | 11 lines Merged revisions 253799 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r253799 | mnicholson | 2010-03-22 14:50:00 -0500 (Mon, 22 Mar 2010) | 4 lines Unconditionally copy the caller's account code to the called party. (related to issue #16331) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@253802 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-20Merged revisions 253540 via svnmerge from russell3-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r253540 | russell | 2010-03-20 07:03:07 -0500 (Sat, 20 Mar 2010) | 2 lines Resolve more compiler warnings on FreeBSD. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@253624 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-19Merged revisions 253490 via svnmerge from alecdavis1-1/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r253490 | alecdavis | 2010-03-19 20:37:00 +1300 (Fri, 19 Mar 2010) | 19 lines prevent segfault if bad magic number is encountered. internal_ao2_ref uses INTERNAL_OBJ which mzy report 'bad magic number', but internal_ao2_ref continues on, causing segfault. Although AO2_MAGIC number is checked by INTERNAL_OBJ before internal_ao2_ref is called, A02_MAGIC is being destroyed (or a wrong pointer) by the time internal_ao2_ref uses INTERNAL_OBJ. internal_ao2_ref now returns -1 if INTERNAL_OBJ encouters a bad magic number. (issue #17037) Reported by: alecdavis Patches: bug17037.diff.txt uploaded by alecdavis (license 585) Tested by: alecdavis ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@253491 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-17Revert API change in release branchestwilson1-1/+1
This re-renames ast_rtp_update_source to ast_rtp_new_source git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@253158 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-15Merged revisions 252362 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r252362 | tilghman | 2010-03-14 20:37:04 -0500 (Sun, 14 Mar 2010) | 11 lines Merged revisions 252361 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r252361 | tilghman | 2010-03-14 20:33:50 -0500 (Sun, 14 Mar 2010) | 4 lines Launch Asterisk on Mac OS X with launchd. Reviewboard: https://reviewboard.asterisk.org/r/551/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@252364 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-13Remove unusued fieldtwilson1-1/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@252177 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-13Merged revisions 252089 via svnmerge from twilson2-14/+43
https://origsvn.digium.com/svn/asterisk/trunk ........ r252089 | twilson | 2010-03-12 16:04:51 -0600 (Fri, 12 Mar 2010) | 20 lines Only change the RTP ssrc when we see that it has changed This change basically reverts the change reviewed in https://reviewboard.asterisk.org/r/374/ and instead limits the updating of the RTP synchronization source to only those times when we detect that the other side of the conversation has changed the ssrc. The problem is that SRCUPDATE control frames are sent many times where we don't want a new ssrc, including whenever Asterisk has to send DTMF in a normal bridge. This is also not the first time that this mistake has been made. The initial implementation of the ast_rtp_new_source function also changed the ssrc--and then it was removed because of this same issue. Then, we put it back in again to fix a different issue. This patch attempts to only change the ssrc when we see that the other side of the conversation has changed the ssrc. It also renames some functions to make their purpose more clear. Review: https://reviewboard.asterisk.org/r/540/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@252135 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-10Merged revisions 251679 via svnmerge from jpeeler1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r251679 | jpeeler | 2010-03-10 14:51:23 -0600 (Wed, 10 Mar 2010) | 13 lines Fix ParkAndAnnounce not respecting parking options. The patch ensures that if a peer does not exist, parking settings are read from the channel. A unit test has been written to ensure proper operation for both standard parking and parking using masquerades. (closes issue #16592) Reported by: mwyres Patches: bug_16592.diff uploaded by snuffy (license 35) Review: https://reviewboard.asterisk.org/r/539/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@251684 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-02Merged revisions 249893 via svnmerge from dvossel1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r249893 | dvossel | 2010-03-02 13:08:38 -0600 (Tue, 02 Mar 2010) | 11 lines fixes adaptive jitterbuffer configuration When configuring the adaptive jitterbuffer, the target_extra value not only could not be set from the configuration, but was not even being set to its proper default. This value is required in order for the adaptive jitterbuffer to work correctly. To resolve this a config option has been added to expose this value to the conf files, and a default value is provided when no config specific value is present. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@249896 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-25Merged revisions 248946 via svnmerge from mmichelson1-1/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r248946 | mmichelson | 2010-02-25 16:41:48 -0600 (Thu, 25 Feb 2010) | 5 lines Fix incorrect ACL behavior when CIDR notation of "/0" is used. AST-2010-003 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@248948 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-25Merged revisions 248861 via svnmerge from tilghman1-0/+12
https://origsvn.digium.com/svn/asterisk/trunk ................ r248861 | tilghman | 2010-02-25 15:22:39 -0600 (Thu, 25 Feb 2010) | 22 lines Merged revisions 248859 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r248859 | tilghman | 2010-02-25 15:21:05 -0600 (Thu, 25 Feb 2010) | 15 lines Some platforms clear /var/run at boot, which makes connecting a remote console... difficult. Previously, we only created the default /var/run/asterisk directory at install time. While we could create it in the init script, that would not work for those who start asterisk manually from the command line. So the safest thing to do is to create it as part of the Asterisk boot process. This also changes the ownership of the directory, because the pid and ctl files are created after we setuid/setgid. (closes issue #16802) Reported by: Brian Patches: 20100224__issue16802.diff.txt uploaded by tilghman (license 14) Tested by: tzafrir ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@248863 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-24Merged revisions 248584 via svnmerge from tilghman1-3/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r248584 | tilghman | 2010-02-24 15:17:26 -0600 (Wed, 24 Feb 2010) | 14 lines Merged revisions 248582 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r248582 | tilghman | 2010-02-24 15:02:18 -0600 (Wed, 24 Feb 2010) | 7 lines Remove color code sequences from verbose messages that go to logfiles. (closes issue #16786) Reported by: dodo Patches: logger2.patch uploaded by dodo (license 989) Tested by: tilghman ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@248641 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-19Merged revisions 228798 via svnmerge from tilghman1-17/+30
https://origsvn.digium.com/svn/asterisk/trunk (closes issue #16470) Reported by: kjotte ........ r228798 | tilghman | 2009-11-09 01:37:52 -0600 (Mon, 09 Nov 2009) | 14 lines Fix various problems detected with Valgrind. * chan_console accessed pvts after deallocation. * The module loader did not check usecount on shutdown, which led to chan_iax2 reading a timer that was already unloaded. (closes issue #16062) Reported by: alexanderheinz Patches: 20091109__issue16062.diff.txt uploaded by tilghman (license 14) Tested by: tilghman ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@248009 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-18Merged revisions 247652 via svnmerge from mnicholson1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r247652 | mnicholson | 2010-02-18 13:39:37 -0600 (Thu, 18 Feb 2010) | 13 lines Merged revisions 247651 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r247651 | mnicholson | 2010-02-18 13:38:09 -0600 (Thu, 18 Feb 2010) | 6 lines Copy the calling party's account code to the called party if they don't already have one. (closes issue #16331) Reported by: bluefox Tested by: mnicholson ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@247654 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-17Merged revisions 247335 via svnmerge from mmichelson1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r247335 | mmichelson | 2010-02-17 15:22:40 -0600 (Wed, 17 Feb 2010) | 20 lines Fix two problems in ast_str functions found while writing a unit test. 1. The documentation for ast_str_set and ast_str_append state that the max_len parameter may be -1 in order to limit the size of the ast_str to its current allocated size. The problem was that the max_len parameter in all cases was a size_t, which is unsigned. Thus a -1 was interpreted as UINT_MAX instead of -1. Changing the max_len parameter to be ssize_t fixed this issue. 2. Once issue 1 was fixed, there was an off-by-one error in the case where we attempted to write a string larger than the current allotted size to a string when -1 was passed as the max_len parameter. When trying to write more than the allotted size, the ast_str's __AST_STR_USED was set to 1 higher than it should have been. Thanks to Tilghman for quickly spotting the offending line of code. Oh, and the unit test that I referenced in the top line of this commit will be added to reviewboard shortly. Sit tight... ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@247336 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-16Merged revisions 247076 via svnmerge from mmichelson1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r247076 | mmichelson | 2010-02-16 17:44:33 -0600 (Tue, 16 Feb 2010) | 12 lines Add va_end calls to __ast_str_helper. According to the man page for stdarg(3), "Each invocation of va_copy() must be matched by a corresponding invocation of va_end() in the same function." There were several cases in __ast_str_helper where va_copy was not matched with a corresponding call to va_end. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@247078 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-16Merged revisions 246980 via svnmerge from dvossel1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r246980 | dvossel | 2010-02-16 14:54:48 -0600 (Tue, 16 Feb 2010) | 8 lines warning message if openssl support is missing while attempting tls connection (closes issue #16673) Reported by: michaesc Patches: tls_error_msg.diff uploaded by dvossel (license 671) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@246983 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-16Merged revisions 246899 via svnmerge from dvossel1-8/+31
https://origsvn.digium.com/svn/asterisk/trunk ........ r246899 | dvossel | 2010-02-16 11:07:41 -0600 (Tue, 16 Feb 2010) | 16 lines fixes sample rate conversion issue with Monitor application When using ast_seekstream with the read/write streams of a monitor, the number of samples we are seeking must be of the same rate as the stream or the jump calculation will be incorrect. This patch adds logic to correctly convert the number of samples to jump to the sample rate the read/write stream is using. For example, if the call is G722 (16khz) and the read/write stream is recording a 8khz wav, seeking 320 samples of 16khz audio is not the same as seeking 320 samples of 8khz audio when performing the ast_seekstream on the stream. ABE-2044 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@246902 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-12Merged revisions 246546 via svnmerge from dvossel1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r246546 | dvossel | 2010-02-12 17:32:33 -0600 (Fri, 12 Feb 2010) | 21 lines Merged revisions 246545 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r246545 | dvossel | 2010-02-12 17:30:17 -0600 (Fri, 12 Feb 2010) | 16 lines lock channel during datastore removal On channel destruction the channel's datastores are removed and destroyed. Since there are public API calls to find and remove datastores on a channel, a lock should be held whenever datastores are removed and destroyed. This resolves a crash caused by a race condition in app_chanspy.c. (closes issue #16678) Reported by: tim_ringenbach Patches: datastore_destroy_race.diff uploaded by tim ringenbach (license 540) Tested by: dvossel ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@246548 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-12Fix some silly formatting that made my head hurt.qwell1-6/+6
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@246463 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-08Merged revisions 245624 via svnmerge from russell1-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r245624 | russell | 2010-02-08 17:43:00 -0600 (Mon, 08 Feb 2010) | 5 lines Fix return value of get_ie_str() and get_ie_str_hash() for non-existent IE. I found this bug while developing a unit test for event allocation. Testing is awesome. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@245625 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-08Merged revisions 245578 via svnmerge from tilghman1-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r245578 | tilghman | 2010-02-08 16:31:40 -0600 (Mon, 08 Feb 2010) | 12 lines Actually use _ASTLDFLAGS in the main/ and channels/ Makefiles. They were previously passed correctly, but they simply weren't used. This caused issues with various platforms whose builds needed to pass special linker flags via the configure script. (closes issue #16596) Reported by: pprindeville Patches: asterisk-1.6-astldflags.patch uploaded by pprindeville (license 347) Tested by: tilghman ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@245580 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-08Merged revisions 245497 via svnmerge from qwell2-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r245497 | qwell | 2010-02-08 14:41:05 -0600 (Mon, 08 Feb 2010) | 11 lines Merged revisions 245496 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r245496 | qwell | 2010-02-08 14:39:50 -0600 (Mon, 08 Feb 2010) | 4 lines Remove reference of documentation in source directory. People don't always build Asterisk from source (distro packages, anybody?). ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@245499 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-05Merged revisions 244927 via svnmerge from seanbright1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r244927 | seanbright | 2010-02-05 12:05:32 -0500 (Fri, 05 Feb 2010) | 9 lines Merged revisions 244926 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r244926 | seanbright | 2010-02-05 12:03:35 -0500 (Fri, 05 Feb 2010) | 1 line Update main copyright date. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@244929 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-03Merged revisions 244547 via svnmerge from mmichelson1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r244547 | mmichelson | 2010-02-03 13:26:53 -0600 (Wed, 03 Feb 2010) | 3 lines Initialize counters in ast_sched_report so that resulting data is not bogus. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@244553 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-02Merged revisions 244443 via svnmerge from dvossel1-5/+31
https://origsvn.digium.com/svn/asterisk/trunk ........ r244443 | dvossel | 2010-02-02 16:27:23 -0600 (Tue, 02 Feb 2010) | 18 lines fixes crash during T.38 negotiation caused by invalid or missing FaxMaxDatagram field AST-2010-001 (closes issue #16634) Reported by: krn (closes issue #16724) Reported by: barthpbx (closes issue #16517) Reported by: bklang (closes issue #16485) Reported by: elsto ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@244446 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-01Merged revisions 244071 via svnmerge from tilghman1-15/+15
https://origsvn.digium.com/svn/asterisk/trunk ................ r244071 | tilghman | 2010-02-01 11:53:39 -0600 (Mon, 01 Feb 2010) | 22 lines Merged revisions 244070 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r244070 | tilghman | 2010-02-01 11:46:31 -0600 (Mon, 01 Feb 2010) | 16 lines Revert previous chan_local fix (r236981) and fix instead by destroying expired frames in the queue. (closes issue #16525) Reported by: kobaz Patches: 20100126__issue16525.diff.txt uploaded by tilghman (license 14) 20100129__issue16525__1.6.0.diff.txt uploaded by tilghman (license 14) Tested by: kobaz, atis (closes issue #16581) Reported by: ZX81 (closes issue #16681) Reported by: alexr1 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@244074 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-28Ensure manager hooks are executed when there are no manager sessions.jpeeler1-20/+24
Conditional expanded to check for hooks before aborting manager event processing. The other two changes are just optimizations. (closes issue #16455) Reported by: atis Patches: manager_hooks_16.patch uploaded by atis (license 242) Tested by: atis git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@243988 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-27Merged revisions 243487 via svnmerge from mmichelson1-2/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r243487 | mmichelson | 2010-01-27 12:08:02 -0600 (Wed, 27 Jan 2010) | 9 lines Merged revisions 243486 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r243486 | mmichelson | 2010-01-27 12:06:43 -0600 (Wed, 27 Jan 2010) | 3 lines Use a safe list traversal while checking for duplicate vars in pbx_builtin_setvar_helper. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@243489 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-27Merged revisions 243391 via svnmerge from dvossel1-1/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r243391 | dvossel | 2010-01-26 17:56:57 -0600 (Tue, 26 Jan 2010) | 15 lines Merged revisions 243390 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r243390 | dvossel | 2010-01-26 17:55:49 -0600 (Tue, 26 Jan 2010) | 9 lines fixes bug with channel receiving wrong privileges after call parking (closes issue #16429) Reported by: Yasuhiro Konishi Patches: features.c.diff uploaded by Yasuhiro Konishi (license 947) Tested by: dvossel ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@243393 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-26Merged revisions 243266 via svnmerge from jpeeler1-11/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r243266 | jpeeler | 2010-01-26 12:20:55 -0600 (Tue, 26 Jan 2010) | 9 lines Merged revisions 243258 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r243258 | jpeeler | 2010-01-26 12:19:10 -0600 (Tue, 26 Jan 2010) | 2 lines Remove unnecessary code in ast_read as issue 16058 has been fully solved now. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@243292 f38db490-d61c-443f-a65b-d21fe96a405b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 01:03:58 +0000