aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_iax2.c
AgeCommit message (Collapse)AuthorFilesLines
2010-10-05Fixes uninitialized memory problem in 'iax2 set debug peer' option.dvossel1-1/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@290506 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-05Resolves dnsmgr memory corruption in chan_iax2.dvossel1-141/+190
(closes issue #17902) Reported by: afried Patches: issue_17902.rev1.txt uploaded by russell (license 2) Tested by: afried, russell, dvossel Review: https://reviewboard.asterisk.org/r/965/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@290378 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Merged revisions 288193 via svnmerge from rmudgett1-164/+170
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r288193 | rmudgett | 2010-09-21 19:03:37 -0500 (Tue, 21 Sep 2010) | 33 lines Merged revisions 288192 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r288192 | rmudgett | 2010-09-21 18:55:58 -0500 (Tue, 21 Sep 2010) | 26 lines In chan_iax2.c:schedule_delivery() calls ast_bridged_channel() on an unlocked channel. Near the beginning of schedule_delivery(), ast_bridged_channel() is called on iaxs[fr->callno]->owner. However, the channel is not locked, which can result in ast_bridged_channel() crashing should owner->tech change to a technology that doesn't implement bridged_channel. I also fixed the other calls to ast_bridged_channel() in chan_iax2.c since the owner lock was not held there either. Converted the existing channel deadlock avoidance to use iax2_lock_owner(). Using the new function simplified some awkward code. In the process of fixing the locking on ast_bridged_channel(), I also found a memory leak in socket_process() for v1.6.2 and v1.8. The local struct variable ies.vars is not freed on early/abnormal function exits. (closes issue #17919) Reported by: rain Patches: issue17919_v1.4.patch uploaded by rmudgett (license 664) issue17919_w_leak_v1.6.2.patch uploaded by rmudgett (license 664) issue17919_w_leak_v1.8.patch uploaded by rmudgett (license 664) Review: https://reviewboard.asterisk.org/r/926/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288194 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Merged revisions 288147 via svnmerge from pabelanger1-4/+4
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r288147 | pabelanger | 2010-09-21 18:22:43 -0400 (Tue, 21 Sep 2010) | 9 lines Setup timer before set_config(). (closes issue #18019) Reported by: Netview Patches: issue_0018019.patch uploaded by pabelanger (license 224) Tested by: Netview ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288157 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-15Add parking extension for non-default parking lots.jpeeler1-5/+7
This is a new feature that allows for parking to custom parking lots to be accessed directly, rather than with channel variables or by changing the default parking lot. The extension is set with the parkext option just as the default parking lot is done. Also, the manager action has been updated to optionally allow a specified parking lot. (closes issue #14882) Reported by: vmikhnevych Patches: patch_14882.txt uploaded by mnick (license 874) modified by me Review: https://reviewboard.asterisk.org/r/884/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@286931 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-10Merged revisions 286117 via svnmerge from pabelanger1-19/+22
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r286117 | pabelanger | 2010-09-10 16:55:06 -0400 (Fri, 10 Sep 2010) | 11 lines Merged revisions 286114 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r286114 | pabelanger | 2010-09-10 16:35:08 -0400 (Fri, 10 Sep 2010) | 4 lines Load iax.conf before registering any functions/applications/actions. Review: https://reviewboard.asterisk.org/r/914/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@286120 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-09Merged revisions 285710 via svnmerge from bbryant1-15/+99
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r285710 | bbryant | 2010-09-09 14:50:13 -0400 (Thu, 09 Sep 2010) | 8 lines Fixes an issue with dialplan pattern matching where the specificity for pattern ranges and pattern special characters was inconsistent. (closes issue #16903) Reported by: Nick_Lewis Patches: pbx.c-specificity.patch uploaded by Nick Lewis (license 657) Tested by: Nick_Lewis ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@285711 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-21Remove built-in AES code and use optional_api insteadtwilson1-5/+4
Review: https://reviewboard.asterisk.org/r/793/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@278538 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-21Change order so that it more closely matches the related SIP command.tilghman1-1/+1
(closes issue #17648) Reported by: GMLudo Review: https://reviewboard.asterisk.org/r/789/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@278393 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-20Add load priority order, such that preload becomes unnecessary in most casestilghman1-1/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@278132 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-19Make ACLs IPv6-capable.mmichelson1-7/+18
ACLs can now be configured to match IPv6 networks. This is only relevant for ACLs in chan_sip for now since other channel drivers do not support IPv6 addressing. However, once those channel drivers are outfitted to support IPv6 addressing, the ACLs will already be ready for IPv6 support. https://reviewboard.asterisk.org/r/791 git-svn-id: http://svn.digium.com/svn/asterisk/trunk@277814 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-14Expand the caller ANI field to an ast_party_idrmudgett1-5/+10
Expand the ani field in ast_party_caller and ast_party_connected_line to an ast_party_id. This is an extension to the ast_callerid restructuring patch in review: https://reviewboard.asterisk.org/r/702/ Review: https://reviewboard.asterisk.org/r/744/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@276393 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-14ast_callerid restructuringrmudgett1-28/+40
The purpose of this patch is to eliminate struct ast_callerid since it has turned into a miscellaneous collection of various party information. Eliminate struct ast_callerid and replace it with the following struct organization: struct ast_party_name { char *str; int char_set; int presentation; unsigned char valid; }; struct ast_party_number { char *str; int plan; int presentation; unsigned char valid; }; struct ast_party_subaddress { char *str; int type; unsigned char odd_even_indicator; unsigned char valid; }; struct ast_party_id { struct ast_party_name name; struct ast_party_number number; struct ast_party_subaddress subaddress; char *tag; }; struct ast_party_dialed { struct { char *str; int plan; } number; struct ast_party_subaddress subaddress; int transit_network_select; }; struct ast_party_caller { struct ast_party_id id; char *ani; int ani2; }; The new organization adds some new information as well. * The party name and number now have their own presentation value that can be manipulated independently. ISDN supplies the presentation value for the name and number at different times with the possibility that they could be different. * The party name and number now have a valid flag. Before this change the name or number string could be empty if the presentation were restricted. Most channel drivers assume that the name or number is then simply not available instead of indicating that the name or number was restricted. * The party name now has a character set value. SIP and Q.SIG have the ability to indicate what character set a name string is using so it could be presented properly. * The dialed party now has a numbering plan value that could be useful to have available. The various channel drivers will need to be updated to support the new core features as needed. They have simply been converted to supply current functionality at this time. The following items of note were either corrected or enhanced: * The CONNECTEDLINE() and REDIRECTING() dialplan functions were consolidated into func_callerid.c to share party id handling code. * CALLERPRES() is now deprecated because the name and number have their own presentation values. * Fixed app_alarmreceiver.c write_metadata(). The workstring[] could contain garbage. It also can only contain the caller id number so using ast_callerid_parse() on it is silly. There was also a typo in the CALLERNAME if test. * Fixed app_rpt.c using ast_callerid_parse() on the channel's caller id number string. ast_callerid_parse() alters the given buffer which in this case is the channel's caller id number string. Then using ast_shrink_phone_number() could alter it even more. * Fixed caller ID name and number memory leak in chan_usbradio.c. * Fixed uninitialized char arrays cid_num[] and cid_name[] in sig_analog.c. * Protected access to a caller channel with lock in chan_sip.c. * Clarified intent of code in app_meetme.c sla_ring_station() and dial_trunk(). Also made save all caller ID data instead of just the name and number strings. * Simplified cdr.c set_one_cid(). It hand coded the ast_callerid_merge() function. * Corrected some weirdness with app_privacy.c's use of caller presentation. Review: https://reviewboard.asterisk.org/r/702/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@276347 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09Get more information about the Bamboo test failurestilghman1-3/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@275312 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09Weird, no output and Bamboo still fails...tilghman1-0/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@275227 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09Add some diagnostic feedback to our data teststilghman1-0/+5
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@275172 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-09Kill some startup warnings and errors and make some messages more helpful in ↵tilghman1-2/+2
tracking down the source. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@275105 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-08Add IPv6 to Asterisk.mmichelson1-5/+25
This adds a generic API for accommodating IPv6 and IPv4 addresses within Asterisk. While many files have been updated to make use of the API, chan_sip and the RTP code are the files which actually support IPv6 addresses at the time of this commit. The way has been paved for easier upgrading for other files in the near future, though. Big thanks go to Simon Perrault, Marc Blanchet, and Jean-Philippe Dionne for their hard work on this. (closes issue #17565) Reported by: russell Patches: asteriskv6-test-report.pdf uploaded by russell (license 2) Review: https://reviewboard.asterisk.org/r/743 git-svn-id: http://svn.digium.com/svn/asterisk/trunk@274783 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-08Implement AstData API data providers as part of the GSOC 2010 project,eliel1-1/+328
midterm evaluation. Review: https://reviewboard.asterisk.org/r/757/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@274727 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-02Fix various typos reported by Lintiantzafrir1-2/+2
(Also fix the typos in the comments) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@273641 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23Resolve some errors produced during module unload of chan_iax2.russell1-41/+62
The external test suite stops Asterisk using the "core stop gracefully" command. The logs from the tests show that there are a number of problems with Asterisk trying to cleanly shut down. This patch addresses the following type of error that comes from chan_iax2: [Jun 22 16:58:11] ERROR[29884]: lock.c:129 __ast_pthread_mutex_destroy: chan_iax2.c line 11371 (iax2_process_thread_cleanup): Error destroying mutex &thread->lock: Device or resource busy For an example in the context of a build, see: http://bamboo.asterisk.org/browse/AST-TRUNK-739/log The primary purpose of this patch is to change the thread pool shutdown procedure to be more explicit to ensure that the thread exits from a point where it is not holding a lock. While testing that, I encountered various crashes due to the order of operations in unload_module() being problematic. I reordered some things there, as well. Review: https://reviewboard.asterisk.org/r/736/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@272370 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-16addition of G.719 pass-through supportdvossel1-0/+1
(closes issue #16293) Reported by: malcolmd Patches: g719.passthrough.patch.7 uploaded by malcolmd (license 924) format_g719.c uploaded by malcolmd (license 924) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@270940 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-16Merged revisions 270866 via svnmerge from dvossel1-6/+4
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r270866 | dvossel | 2010-06-16 12:35:29 -0500 (Wed, 16 Jun 2010) | 22 lines fixes chan_iax2 race condition There is code in chan_iax2.c that attempts to guarantee that only a single active thread will handle a call number at a time. This code works once the thread is added to an active_list of threads, but we are not currently guaranteed that a newly activated thread will enter the active_list immediately because it is left up to the thread to add itself after frames have been queued to it. This means that if two frames come in for the same call number at the same time, it is possible for them to grab two separate threads because the first thread did not add itself to the active_list fast enough. This causes some pretty complex problems. This patch resolves this race condition by immediately adding an activated thread to the active_list within the network thread and only depending on the thread to remove itself once it is done processing the frames queued to it. By doing this we are guaranteed that if another frame for the same call number comes in at the same time, that this thread will immediately be found in the active_list of threads. Review: https://reviewboard.asterisk.org/r/720/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@270867 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-08Add SRTP support for Asterisktwilson1-0/+39
After 5 years in mantis and over a year on reviewboard, SRTP support is finally being comitted. This includes generic CHANNEL dialplan functions that work for getting the status of whether a call has secure media or signaling as defined by the underlying channel technology and for setting whether or not a new channel being bridged to a calling channel should have secure signaling or media. See doc/tex/secure-calls.tex for examples. Original patch by mikma, updated for trunk and revised by me. (closes issue #5413) Reported by: mikma Tested by: twilson, notthematrix, hemanshurpatel Review: https://reviewboard.asterisk.org/r/191/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@268894 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-06Finally track down and eliminate the "FRACK! warnings from chan_iax2".tilghman1-0/+9
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@268495 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-14fix iax_frame double freedvossel1-1/+1
Very unfortunate things happen if we add an iax_frame to the frame queue and let go of the lock before scheduling the frame's transmit... There is a race condition that exists where the frame can be removed from the frame_queue and freed before the transmit is scheduled if we do not hold on to that lock. This results in a freed frame being scheduled for transmit later. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@263151 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-21IAXpeers output now matches SIPpeers format for manager (AMI).lmadsen1-14/+27
(closes issue #17100) Reported by: secesh Tested by: pabelanger Review: https://reviewboard.asterisk.org/r/594/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@258344 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-03Consolidate ast_channel.cid.cid_rdnis into ast_channel.redirecting.from.number.rmudgett1-3/+3
SWP-1229 ABE-2161 * Ensure chan_local.c:local_call() will not leak cid.cid_dnid when copying. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@256104 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-03Merged revisions 250394 via svnmerge from dvossel1-3/+8
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r250394 | dvossel | 2010-03-03 12:02:27 -0600 (Wed, 03 Mar 2010) | 16 lines fixes problem with duplicate TXREQ packets When Asterisk receives an IAX2 TXREQ packet, try_transfer() will call store_by_transfercallno() to link the chan_iax2_pvt struct into iax_transfercallno_pvts. If a duplicate TXREQ packet is received for the same call, the pvt struct will be linked into iax_transfercallno_pvts multiple times. This patch fixes this. Thanks rain for debugging this and providing a patch! (closes issue #16904) Reported by: rain Patches: iax2-double-txreq-fix.diff uploaded by rain (license 327) Tested by: rain, dvossel ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@250395 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-27Merged revisions 249234 via svnmerge from kpfleming1-0/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r249234 | kpfleming | 2010-02-27 09:07:59 -0500 (Sat, 27 Feb 2010) | 1 line add a reference to the now-published IAX2 RFC ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@249235 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-09fixes a merging error for the iaxs and iaxsl off by one fixdvossel1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@245804 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-09Merged revisions 245792 via svnmerge from dvossel1-2/+2
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r245792 | dvossel | 2010-02-09 16:55:38 -0600 (Tue, 09 Feb 2010) | 12 lines Fixes iaxs and iaxsl size off by one issue. 2^15 = 32768 which is the maximum allowed iax2 callnumber. Creating the iaxs and iaxsl array of size 32768 means the maximum callnumber is actually out of bounds. This causes a nasty crash. (closes issue #15997) Reported by: exarv Patches: iax_fix.diff uploaded by dvossel (license 671) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@245793 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-05adds total call numbers available to 'iax2 show callnumber usage' cli outputdvossel1-1/+12
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@245006 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-27Fix the ability to specify an OSP token for an outbound IAX2 call.russell1-32/+2
When this patch was originally submitted, the code allowed for the token to be set via a channel variable. I decided that a cleaner approach would be to integrate it into the CHANNEL() function. Unfortunately, that is not a suitable approach. It's not possible to get the value set on the channel soon enough using that method. So, go back to the simple channel variable method. (closes issue #16711) Reported by: homesick Patches: iax-svn.diff uploaded by homesick (license 91) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@243482 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-10According to POSIX, the capital L modifier applies only to floating point types.tilghman1-1/+1
Fixes a crash on Solaris. (closes issue #16572) Reported by: crjw Patches: frame_changes.patch uploaded by crjw (license 963) Plus several others found and fixed by me git-svn-id: http://svn.digium.com/svn/asterisk/trunk@239074 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-07Merged revisions 238411 via svnmerge from dvossel1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r238411 | dvossel | 2010-01-07 14:14:25 -0600 (Thu, 07 Jan 2010) | 10 lines fixes crash in "scheduled_destroy" in chan_iax A signed short was used to represent a callnumber. This is makes it possible to attempt to access the iaxs array with a negative index. (closes issue #16565) Reported by: jensvb ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@238412 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-22fixes iax "can't compress subclass 4294967295" errordvossel1-2/+7
(closes issue #16456) Reported by: dvossel Tested by: dvossel git-svn-id: http://svn.digium.com/svn/asterisk/trunk@236144 f38db490-d61c-443f-a65b-d21fe96a405b
2009-11-20fixes iax2 show cache locking error, thanks alecdavis!dvossel1-1/+1
(closes issue #16094) Reported by: alecdavis Patches: bug16094.diff.txt uploaded by alecdavis (license 585) Tested by: alecdavis, dvossel git-svn-id: http://svn.digium.com/svn/asterisk/trunk@230726 f38db490-d61c-443f-a65b-d21fe96a405b
2009-11-15Merged revisions 230246 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r230246 | kpfleming | 2009-11-15 11:19:06 -0600 (Sun, 15 Nov 2009) | 6 lines Correct mistaken option name in error message. The configuration option for allowing hosts to make non-token-based calls is 'calltokenoptional', not 'calltokenignore'. (reported on asterisk-users) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@230247 f38db490-d61c-443f-a65b-d21fe96a405b
2009-11-13Display a list of channel variables in each channel-oriented event.tilghman1-4/+4
(Closes AST-33) Reviewboard: https://reviewboard.asterisk.org/r/368/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@230111 f38db490-d61c-443f-a65b-d21fe96a405b
2009-11-10Merged revisions 229167 via svnmerge from dvossel1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r229167 | dvossel | 2009-11-10 11:15:57 -0600 (Tue, 10 Nov 2009) | 9 lines don't crash on log message in solaris AST-2009-006 (closes issue #16206) Reported by: bklang Tested by: bklang ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@229168 f38db490-d61c-443f-a65b-d21fe96a405b
2009-11-04Two other trunk build fixes (reported by seanbright on #asterisk-dev)tilghman1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@227615 f38db490-d61c-443f-a65b-d21fe96a405b
2009-11-04Expand codec bitfield from 32 bits to 64 bits.tilghman1-149/+199
Reviewboard: https://reviewboard.asterisk.org/r/416/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@227580 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-21Merged revisions 225243 via svnmerge from dvossel1-9/+78
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r225243 | dvossel | 2009-10-21 15:58:08 -0500 (Wed, 21 Oct 2009) | 13 lines IAX2: VNAK loop caused by signaling frames with no destination call number It is possible for the PBX thread to queue up signaling frames before a destination call number is received. This can result in signaling frames being sent out with no destination call number. Since recent versions of Asterisk require accurate destination callnumbers for all Full Frames, this can cause a VNAK loop to occur. To resolve this no signaling frames are sent until a destination callnumber is received, and destination call numbers are now only required for iax_pvt matching when the frame is an ACK. Review: https://reviewboard.asterisk.org/r/413/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@225307 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-21Merged revisions 225032 via svnmerge from dvossel1-3/+14
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r225032 | dvossel | 2009-10-21 09:37:04 -0500 (Wed, 21 Oct 2009) | 20 lines IAX/SIP shrinkcallerid option The shrinking of caller id removes '(', ' ', ')', non-trailing '.', and '-' from the string. This means values such as 555.5555 and test-test result in 555555 and testtest. There are instances, such as Skype integration, where a specific value is passed via caller id that must be preserved unmodified. This patch makes the shrinking of caller id optional in chan_sip and chan_iax in order to support such cases. By default this option is on to preserve previous expected behavior. (closes issue #15940) Reported by: dimas Patches: v2-15940.patch uploaded by dimas (license 88) 15940_shrinkcallerid_trunk.c uploaded by dvossel (license 671) Tested by: dvossel Review: https://reviewboard.asterisk.org/r/408/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@225033 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-06Recorded merge of revisions 222152 via svnmerge from kpfleming1-0/+13
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r222152 | kpfleming | 2009-10-05 20:16:36 -0500 (Mon, 05 Oct 2009) | 20 lines Fix ao2_iterator API to hold references to containers being iterated. See Mantis issue for details of what prompted this change. Additional notes: This patch changes the ao2_iterator API in two ways: F_AO2I_DONTLOCK has become an enum instead of a macro, with a name that fits our naming policy; also, it is now necessary to call ao2_iterator_destroy() on any iterator that has been created. Currently this only releases the reference to the container being iterated, but in the future this could also release other resources used by the iterator, if the iterator implementation changes to use additional resources. (closes issue #15987) Reported by: kpfleming Review: https://reviewboard.asterisk.org/r/383/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@222176 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-02Merged revisions 222026 via svnmerge from dvossel1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r222026 | dvossel | 2009-10-02 12:32:13 -0500 (Fri, 02 Oct 2009) | 3 lines Removes unnecessary unlock, clarifies a memcpy. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@222030 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-21Merged revisions 219720 via svnmerge from dvossel1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r219720 | dvossel | 2009-09-21 11:55:53 -0500 (Mon, 21 Sep 2009) | 3 lines Reverting merge 219520. This change was not necessary. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@219721 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-19Merged revisions 219586 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r219586 | russell | 2009-09-18 21:51:13 -0500 (Fri, 18 Sep 2009) | 6 lines Make sure the iax_pvt exists before dereferencing it. This fixes the latest crash posted on issue 15609. (issue #15609) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@219587 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-18Merged revisions 219519 via svnmerge from dvossel1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r219519 | dvossel | 2009-09-18 18:19:50 -0500 (Fri, 18 Sep 2009) | 9 lines iax2 frame double free The iax frame's retrans sched id was written over right before iax2_frame_free was called. In iax2_frame_free that retrans id is used to delete the sched item. By writing over the retrans field before the sched item could be deleted, it was possible for a retransmit to occur on a freed frame. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@219520 f38db490-d61c-443f-a65b-d21fe96a405b