aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2008-11-14Merged revisions 156756 via svnmerge from tilghman1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r156756 | tilghman | 2008-11-13 18:43:13 -0600 (Thu, 13 Nov 2008) | 13 lines Merged revisions 156755 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156755 | tilghman | 2008-11-13 18:41:37 -0600 (Thu, 13 Nov 2008) | 6 lines ast_waitfordigit() requires that the channel be up, for no good logical reason. This prevents While/EndWhile from working within the "h" extension. Reported by: jgalarneau (for ABE C.2) Fixed by: me ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156757 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-13Merged revisions 156690 via svnmerge from tilghman1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r156690 | tilghman | 2008-11-13 15:30:41 -0600 (Thu, 13 Nov 2008) | 14 lines Merged revisions 156688 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156688 | tilghman | 2008-11-13 15:24:00 -0600 (Thu, 13 Nov 2008) | 7 lines Provide more space for all the data which can appear in an originating channel name. (closes issue #13398) Reported by: bamby Patches: manager.c.diff uploaded by bamby (license 430) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156691 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-13Merged revisions 156017 via svnmerge from bkruse1-18/+24
https://origsvn.digium.com/svn/asterisk/trunk ........ r156017 | pari | 2008-11-11 17:02:43 -0600 (Tue, 11 Nov 2008) | 5 lines Patch by Ryan Brindley -- Make sure that manager refuses any duplicate 'new category' requests in updateconfig (closes issue #13539) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156654 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-13Merged revisions 156649 via svnmerge from jpeeler1-3/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r156649 | jpeeler | 2008-11-13 13:17:50 -0600 (Thu, 13 Nov 2008) | 6 lines (closes issue #13891) Reported by: smurfix This reverts a change I made in 116297. At the time it seemed the change was required to solve an issue with attempting a transfer but then letting it timeout without dialing any digits. However, I didn't realize that having an empty extension was possible. I'm removing the immediate return that was added in pbx_find_extension if the extension is null. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156650 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-13Blocked revisions 156647 via svnmergetilghman0-0/+0
........ r156647 | tilghman | 2008-11-13 13:10:28 -0600 (Thu, 13 Nov 2008) | 3 lines Command offsets were not changed correctly when the command syntax for 'pri set debug' was changed from 'pri debug'. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156648 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-13Merged revisions 156612 via svnmerge from mmichelson2-11/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r156612 | mmichelson | 2008-11-13 11:07:56 -0600 (Thu, 13 Nov 2008) | 4 lines Kevin sent a note indicating that this change is not necessary, so I am reverting it ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156614 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-13Blocked revisions 156575 via svnmergeeliel0-0/+0
........ r156575 | eliel | 2008-11-13 13:46:06 -0200 (Thu, 13 Nov 2008) | 12 lines Introduce XML documentation for: - MeetMe() - MeetMeCount() - MeetMeChannelAdmin() - MeetMeAdmin() - SLAStation() - SLATrunk() - Add an attribute to optionlist 'hasparams' with the same functionality as the one we have in <parameter> and <argument> (the DTD was updated) - Fix a leak when getting an attribute while parsing an <optionlist>. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156576 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-13Blocked revisions 156541 via svnmergeeliel0-0/+0
........ r156541 | eliel | 2008-11-13 11:53:13 -0200 (Thu, 13 Nov 2008) | 3 lines Fix a typo introduced when changing xmldoc_has_arguments() to xmldoc_has_inside() we need to pass the name of the node that we are looking for. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156547 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-13Blocked revisions 156535 via svnmergeeliel0-0/+0
........ r156535 | eliel | 2008-11-13 11:08:34 -0200 (Thu, 13 Nov 2008) | 3 lines Remove trailing whitespaces using ':%s/\s\+$//' pointed by seanbright on #asterisk-dev ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156536 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Merged revisions 156388 via svnmerge from tilghman1-12/+15
https://origsvn.digium.com/svn/asterisk/trunk ................ r156388 | tilghman | 2008-11-12 15:34:51 -0600 (Wed, 12 Nov 2008) | 12 lines Merged revisions 156386 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156386 | tilghman | 2008-11-12 15:18:57 -0600 (Wed, 12 Nov 2008) | 5 lines When using call limits under 1 second, infinite call lengths are allowed, instead. (closes issue #13851) Reported by: ruddy ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156389 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Blocked revisions 156355 via svnmergeeliel0-0/+0
........ r156355 | eliel | 2008-11-12 18:27:40 -0200 (Wed, 12 Nov 2008) | 4 lines - Make alias->real_cmd point to the allocated space outside alias->alias. - Register the aliased cli command (or we will not alias anything). - Use ARRAY_LEN() when possible. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156356 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Merged revisions 156299 via svnmerge from murf1-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r156299 | murf | 2008-11-12 12:47:29 -0700 (Wed, 12 Nov 2008) | 26 lines Merged revisions 156297 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156297 | murf | 2008-11-12 12:36:16 -0700 (Wed, 12 Nov 2008) | 18 lines It turns out that the 0x0XX00 codes being returned for N, X, and Z are off by one, as per conversation with jsmith on #asterisk-dev; he was teaching a class and disconcerted that this published rule was not being followed, with patterns _NXX, _[1-8]22 and _[2-9]22... and NXX was winning, but [1-8] should have been. This change, tested on these 3 patterns now picks the proper one. However, this change may surprise users who set up dialplans based on previous behavior, which has been there for what, 2 and half years or so now. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156354 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Merged revisions 156295 via svnmerge from tilghman1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r156295 | tilghman | 2008-11-12 13:28:22 -0600 (Wed, 12 Nov 2008) | 13 lines Merged revisions 156294 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156294 | tilghman | 2008-11-12 13:26:45 -0600 (Wed, 12 Nov 2008) | 6 lines If the SLA thread is not started, then reload causes a memory leak. (closes issue #13889) Reported by: eliel Patches: app_meetme.c.patch uploaded by eliel (license 64) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156296 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Merged revisions 156290 via svnmerge from jpeeler1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r156290 | jpeeler | 2008-11-12 13:11:15 -0600 (Wed, 12 Nov 2008) | 11 lines Merged revisions 156289 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156289 | jpeeler | 2008-11-12 13:10:12 -0600 (Wed, 12 Nov 2008) | 3 lines For whatever reason, gcc only warned me about the possible use of an uninitialized variable when compiling 1.6.1. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156291 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Merged revisions 156243 via svnmerge from tilghman1-3/+27
https://origsvn.digium.com/svn/asterisk/trunk ................ r156243 | tilghman | 2008-11-12 12:55:18 -0600 (Wed, 12 Nov 2008) | 18 lines Merged revisions 156229 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156229 | tilghman | 2008-11-12 12:39:21 -0600 (Wed, 12 Nov 2008) | 11 lines Revert revision 132506, since it occasionally caused IAX2 HANGUP packets not to be sent, and instead, schedule a task to destroy the iax2 pvt structure 10 seconds later. This allows the IAX2 HANGUP packet to be queued, transmitted, and ACKed before the pvt is destroyed. (closes issue #13645) Reported by: dzajro Patches: 20081111__bug13645__3.diff.txt uploaded by Corydon76 (license 14) Tested by: vazir Reviewed: http://reviewboard.digium.com/r/51/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156288 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Fix build (res possibly unused in this function, says gcc)tilghman1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156284 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Merged revisions 156228 via svnmerge from jpeeler1-22/+148
https://origsvn.digium.com/svn/asterisk/trunk ................ r156228 | jpeeler | 2008-11-12 12:32:46 -0600 (Wed, 12 Nov 2008) | 16 lines Merged revisions 156178 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156178 | jpeeler | 2008-11-12 11:53:44 -0600 (Wed, 12 Nov 2008) | 8 lines (closes issue #13173) Reported by: pep This change adds an announce_thread responsible for playing announcements to an existing conference. This allows all announcing to be immediately stopped if necessary but more importantly allows other threads that need to play something to not block. There are multiple benefits to this, but the actual bug is for solving the scenario for a channel to be unusable after hang up for the entire duration of the parting announcement. The parting announcement can be extremely long depending on what the user recorded upon joining the conference. Reviewed by Russell on Review Board: http://reviewboard.digium.com/r/25/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156247 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Merged revisions 156169 via svnmerge from mmichelson1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r156169 | mmichelson | 2008-11-12 11:41:56 -0600 (Wed, 12 Nov 2008) | 15 lines Merged revisions 156167 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156167 | mmichelson | 2008-11-12 11:38:33 -0600 (Wed, 12 Nov 2008) | 7 lines When doing some tests, I was having a crash at the end of every call if an attended transfer occurred during the call. I traced the cause to the CDR on one of the channels being NULL. murf suggested a check in the end bridge callback to be sure the CDR is non-NULL before proceeding, so that's what I'm adding. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156171 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Merged revisions 156166 via svnmerge from russell1-6/+8
https://origsvn.digium.com/svn/asterisk/trunk ................ r156166 | russell | 2008-11-12 11:38:20 -0600 (Wed, 12 Nov 2008) | 15 lines Merged revisions 156164 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156164 | russell | 2008-11-12 11:29:52 -0600 (Wed, 12 Nov 2008) | 7 lines Move the sanity check that makes sure "always fork" is not set along with the console option to be after the code that reads options from asterisk.conf. This resolves a situation where Asterisk can start taking up 100% when misconfigured. (Thanks to Bryce Porter (x86 on IRC) for letting me log in to his system to figure out what was causing the 100% CPU problem.) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156168 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Blocked revisions 156162 via svnmergeeliel0-0/+0
........ r156162 | eliel | 2008-11-12 15:28:02 -0200 (Wed, 12 Nov 2008) | 3 lines - The paramname is a pointer allocated with strdup() or malloc(), so, we need to free it with ast_free(). ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156163 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Merged revisions 156127 via svnmerge from mmichelson2-2/+12
https://origsvn.digium.com/svn/asterisk/trunk ........ r156127 | mmichelson | 2008-11-12 09:33:11 -0600 (Wed, 12 Nov 2008) | 5 lines Add a couple of AC_SUBST calls to the AST_C_COMPILE_CHECK macro. These missing calls were discovered when working on timerfd support in a separate branch. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156128 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Blocked revisions 156125 via svnmergeeliel0-0/+0
........ r156125 | eliel | 2008-11-12 11:43:46 -0200 (Wed, 12 Nov 2008) | 8 lines Add XML documentation for AGI commands: - database deltree - database get - exec - get data - get full variable ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156126 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Blocked revisions 156120 via svnmergemvanbaak0-0/+0
........ r156120 | mvanbaak | 2008-11-12 07:46:04 +0100 (Wed, 12 Nov 2008) | 16 lines This commit does two things: - Add CLI aliases module to asterisk. - Remove all deprecated CLI commands from the code Initial work done by file. Junk-Y and lmadsen did a lot of work and testing to get the list of deprecated commands into the configuration file. Deprecated CLI commands are now handled by this new module, see cli_aliases.conf for more info about that. ok russellb@ via reviewboard (closes issue #13735) Reported by: mvanbaak ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156121 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Blocked revisions 156087 via svnmergeeliel0-0/+0
........ r156087 | eliel | 2008-11-12 00:20:05 -0200 (Wed, 12 Nov 2008) | 3 lines - Add 'database del', 'database put' and 'set music' AGI commands XML documentation. - Add to the DTD the possibility to put a parameter inside an <enum>. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156088 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Blocked revisions 156051 via svnmergeeliel0-0/+0
........ r156051 | eliel | 2008-11-11 22:17:43 -0200 (Tue, 11 Nov 2008) | 7 lines Implement AGI XML documentation parsing functions. A new <agi> element is used to describe the XML documentation. We have the usual synopsis,syntax,description and seealso for AGI commands. The CLI 'agi show commands' command was changed to show all the documentation se ctions. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156052 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-12Blocked revisions 156017-156018 via svnmergeqwell0-0/+0
........ r156017 | pari | 2008-11-11 17:02:43 -0600 (Tue, 11 Nov 2008) | 5 lines Patch by Ryan Brindley -- Make sure that manager refuses any duplicate 'new category' requests in updateconfig ........ r156018 | pari | 2008-11-11 17:32:31 -0600 (Tue, 11 Nov 2008) | 4 lines changing comment style to conform coding guidelines ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156050 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-11Merged revisions 155862 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r155862 | tilghman | 2008-11-10 15:12:28 -0600 (Mon, 10 Nov 2008) | 5 lines Make documentation of update method match documentation and update update2 method to match. Reported by: atis, via -dev mailing list. Fixed by: me ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156005 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-11Blocked revisions 155967 via svnmergekpfleming0-0/+0
........ r155967 | kpfleming | 2008-11-11 11:57:20 -0600 (Tue, 11 Nov 2008) | 3 lines use some fancy compiler magic (thanks to Matthew Woehlke on the gcc-help mailing list) to restore type-safety to S_OR by going back to a macro, but preserve the side-effect-safe usage of the macro arguments ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155968 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-10Merged revisions 155863 via svnmerge from mmichelson1-3/+9
https://origsvn.digium.com/svn/asterisk/trunk ................ r155863 | mmichelson | 2008-11-10 15:14:44 -0600 (Mon, 10 Nov 2008) | 22 lines Merged revisions 155861 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r155861 | mmichelson | 2008-11-10 15:07:39 -0600 (Mon, 10 Nov 2008) | 14 lines Channel drivers assume that when their indicate callback is invoked, that the channel on which the callback was called is locked. This patch corrects an instance in chan_agent where a channel's indicate callback is called directly without first locking the channel. This was leading to some observed locking issues in chan_local, but considering that all channel drivers operate under the same expectations, the generic fix in chan_agent is the right way to go. AST-126 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155864 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-10Merged revisions 155804 via svnmerge from tilghman1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r155803 | tilghman | 2008-11-10 14:49:59 -0600 (Mon, 10 Nov 2008) | 1 line I got tired of saying this in every single bugnote referring to this file. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155826 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-10Merged revisions 155763 via svnmerge from tilghman1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r155763 | tilghman | 2008-11-10 12:04:30 -0600 (Mon, 10 Nov 2008) | 6 lines Fix memory leak when MALLOC_DEBUG is enabled. (closes issue #13864) Reported by: eliel Patches: readline.c.patch uploaded by eliel (license 64) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155764 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-10Blocked revisions 155711 via svnmergeeliel0-0/+0
........ r155711 | eliel | 2008-11-10 11:53:23 -0200 (Mon, 10 Nov 2008) | 11 lines Move all the XML documentation API from pbx.c to xmldoc.c. Export the XML documentation API: ast_xmldoc_build_synopsis() ast_xmldoc_build_syntax() ast_xmldoc_build_description() ast_xmldoc_build_seealso() ast_xmldoc_build_arguments() ast_xmldoc_printable() ast_xmldoc_load_documentation() ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155712 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-09Merged revisions 155671 via svnmerge from seanbright1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r155671 | seanbright | 2008-11-09 11:30:29 -0500 (Sun, 09 Nov 2008) | 1 line Fix this as well. Pointed out by tzafrir. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155672 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-09Blocked revisions 155637 via svnmergeseanbright0-0/+0
........ r155637 | seanbright | 2008-11-08 22:34:28 -0500 (Sat, 08 Nov 2008) | 1 line Fix some spelling errors, and convert tabs to spaces. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155638 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-09Blocked revisions 155590 via svnmergeseanbright0-0/+0
........ r155590 | seanbright | 2008-11-08 20:59:59 -0500 (Sat, 08 Nov 2008) | 5 lines In order to move away from nested function use, some changes to the recently introduced ast_channel_search_locked need to be made. Specifically, the caller needs to be able to pass arbitrary data which in turn is passed to the callback. This patch addresses all of the nested functions currently in asterisk trunk. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155615 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-09Merged revisions 155554 via svnmerge from seanbright5-51/+57
https://origsvn.digium.com/svn/asterisk/trunk ................ r155554 | seanbright | 2008-11-08 20:27:00 -0500 (Sat, 08 Nov 2008) | 14 lines Merged revisions 155553 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r155553 | seanbright | 2008-11-08 20:08:07 -0500 (Sat, 08 Nov 2008) | 6 lines Use static functions here instead of nested ones. This requires a small change to the ast_bridge_config struct as well. To understand the reason for this change, see the following post: http://gcc.gnu.org/ml/gcc-help/2008-11/msg00049.html ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155556 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-08Merged revisions 155516 via svnmerge from russell2-3/+9
https://origsvn.digium.com/svn/asterisk/trunk ........ r155516 | russell | 2008-11-08 15:46:43 -0600 (Sat, 08 Nov 2008) | 3 lines - Check for failure when putting the packet in the ast_str - fix a spelling error in a header file ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155517 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-08Merged revisions 155513 via svnmerge from russell1-6/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r155513 | russell | 2008-11-08 15:34:36 -0600 (Sat, 08 Nov 2008) | 3 lines Remove some code that is basically a no-op. Code above this already ensures that the buffer is terminated. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155515 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Merged revisions 155467 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r155467 | mmichelson | 2008-11-07 17:41:44 -0600 (Fri, 07 Nov 2008) | 12 lines Set the invite state to INV_CANCELLED in a place that makes more sense. Where it was set before, it was impossible to actually delay sending a CANCEL if we had not yet received a provisional response to an INVITE. (closes issue #13626) Reported by: atis Patches: 13626.patch uploaded by putnopvut (license 60) Tested by: atis ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155469 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Blocked revisions 155401 via svnmergeseanbright0-0/+0
........ r155401 | seanbright | 2008-11-07 17:39:30 -0500 (Fri, 07 Nov 2008) | 8 lines Add ability to pass arbitrary data to the ao2_callback_fn (called from ao2_callback and ao2_find). Currently, passing OBJ_POINTER to either of these mandates that the passed 'arg' is a hashable object, making searching for an ao2 object based on outside criteria difficult. Reviewed by Russell and Mark M. via ReviewBoard: http://reviewboard.digium.com/r/36/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155402 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Merged revisions 155399 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r155399 | tilghman | 2008-11-07 16:28:58 -0600 (Fri, 07 Nov 2008) | 14 lines Merged revisions 155398 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r155398 | tilghman | 2008-11-07 16:27:32 -0600 (Fri, 07 Nov 2008) | 7 lines Clarify error message. (closes issue #13809) Reported by: denke Patches: 20081104__bug13809.diff.txt uploaded by Corydon76 (license 14) Tested by: denke ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155400 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Merged revisions 155395 via svnmerge from tilghman1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r155395 | tilghman | 2008-11-07 16:03:50 -0600 (Fri, 07 Nov 2008) | 2 lines Two bugs relating to colnames found by Marquis42 on #asterisk-dev ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155396 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Merged revisions 155360 via svnmerge from mmichelson1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r155360 | mmichelson | 2008-11-07 15:14:49 -0600 (Fri, 07 Nov 2008) | 8 lines Remove one more instance of the sample configuration lying about what's possible. The tz cannot be set in a context like this. It can only be set in the general section or per-mailbox. Thanks to sasargen on #asterisk-dev for pointing this out ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155362 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Merged revisions 155324 via svnmerge from tilghman1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r155324 | tilghman | 2008-11-07 14:13:32 -0600 (Fri, 07 Nov 2008) | 7 lines Send call release with unallocated cause instead of normal call clearing, when invalid extension is called. (closes issue #13408) Reported by: adomjan Patches: chan_dahdi.c-ss7-unallocated-2 uploaded by adomjan (license 487) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155325 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Blocked revisions 155284 via svnmergeseanbright0-0/+0
........ r155284 | seanbright | 2008-11-07 11:18:52 -0500 (Fri, 07 Nov 2008) | 6 lines Convert open-coded linked list in indications to the AST_LIST_* macros. This cleans the code up some and should make it more maintainable as time goes on. Reviewed by Russell, Kevin, Mark M., and Tilghman via ReviewBoard: http://reviewboard.digium.com/r/34/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155285 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Blocked revisions 155282 via svnmergekpfleming0-0/+0
........ r155282 | kpfleming | 2008-11-07 09:52:05 -0600 (Fri, 07 Nov 2008) | 1 line stringfields conversion for struct sip_peer, as requested :-) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155283 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Merged revisions 155264 via svnmerge from russell1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r155264 | russell | 2008-11-07 09:42:04 -0600 (Fri, 07 Nov 2008) | 3 lines Remove a bogus ast_free() that Kevin noticed. This was probably just left over from pre-astobj2ified chan_sip. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155272 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Merged revisions 155244 via svnmerge from russell1-3/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r155244 | russell | 2008-11-07 09:01:02 -0600 (Fri, 07 Nov 2008) | 4 lines Clarify which part of OBJ_MULTIPLE is not implemented, and under what case it is perfectly fine to use. (Inspired by a question I received about my last commit.) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155245 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Merged revisions 155241 via svnmerge from russell1-5/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r155241 | russell | 2008-11-07 08:50:30 -0600 (Fri, 07 Nov 2008) | 4 lines Fix some code in chan_sip that was intended to unlink multiple objects from a container. The OBJ_MULTIPLE flag must be provided here. Otherwise, this would only remove a single object. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155242 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Blocked revisions 155206 via svnmergekpfleming0-0/+0
........ r155206 | kpfleming | 2008-11-06 21:09:16 -0600 (Thu, 06 Nov 2008) | 1 line correct logic error noticed by rmudgett (thanks!) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155207 f38db490-d61c-443f-a65b-d21fe96a405b