aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2008-11-18Merged revisions 157496 via svnmerge from mmichelson1-16/+31
https://origsvn.digium.com/svn/asterisk/trunk ........ r157496 | mmichelson | 2008-11-18 15:59:24 -0600 (Tue, 18 Nov 2008) | 6 lines Based on Russell's advice on the asterisk-dev list, I have changed from using a global lock in update_call_counter to using the locks within the sip_pvt and sip_peer structures instead. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@157500 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-18Merged revisions 157427 via svnmerge from mmichelson1-16/+48
https://origsvn.digium.com/svn/asterisk/trunk ........ r157427 | mmichelson | 2008-11-18 14:23:58 -0600 (Tue, 18 Nov 2008) | 13 lines * Add a lock to be used in the update_call_counter function. * Revert logic to mirror 1.4's in the sense that it will not allow the call counter to dip below 0. These two measures prevent potential races that could cause a SIP peer to appear to be busy forever. (closes issue #13668) Reported by: mjc Patches: hintfix_trunk_rev152649.patch uploaded by wolfelectronic (license 586) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@157428 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-18Merged revisions 157306 via svnmerge from mmichelson5-2/+31
https://origsvn.digium.com/svn/asterisk/trunk ................ r157306 | mmichelson | 2008-11-18 12:31:08 -0600 (Tue, 18 Nov 2008) | 20 lines Merged revisions 157305 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r157305 | mmichelson | 2008-11-18 12:25:55 -0600 (Tue, 18 Nov 2008) | 12 lines Fix a crash in the end_bridge_callback of app_dial and app_followme which would occur at the end of an attended transfer. The error occurred because we initially stored a pointer to an ast_channel which then was hung up due to a masquerade. This commit adds a "fixup" callback to the bridge_config structure to allow for end_bridge_callback_data to be changed in the case that a new channel pointer is needed for the end_bridge_callback. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@157307 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-18Merged revisions 157302 via svnmerge from murf1-4/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r157302 | murf | 2008-11-18 11:07:55 -0700 (Tue, 18 Nov 2008) | 18 lines (closes issue #13420) Reported by: alex70 Patches: 13420.13539.patch uploaded by murf (license 17) Tested by: murf, awk This fixes two problems: a spurious linefeed insertion probably left over from pre-precomment times. Only generated when category had no previous comments. The other problem: Insertions could get the line-numbering out of whack and generate negative line numbers, causing chunks of line numbers to be emitted, on the scale of the number of lines up to that point in the file. In such cases, abort the looping, and all is well. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@157303 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-15Merged revisions 157164 via svnmerge from kpfleming3-4/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r157164 | kpfleming | 2008-11-15 20:45:19 +0100 (Sat, 15 Nov 2008) | 13 lines Merged revisions 157162-157163 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r157162 | kpfleming | 2008-11-15 20:24:24 +0100 (Sat, 15 Nov 2008) | 1 line dist-clean should remove dependency information files as well ........ r157163 | kpfleming | 2008-11-15 20:31:03 +0100 (Sat, 15 Nov 2008) | 1 line when an individual directory dist-clean is run, run clean in that directory first, and when running top-level dist-clean, do not run subdirectory clean operations twice ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@157165 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-15Merged revisions 157105 via svnmerge from kpfleming1-3/+48
https://origsvn.digium.com/svn/asterisk/trunk ........ r157105 | kpfleming | 2008-11-15 19:00:32 +0100 (Sat, 15 Nov 2008) | 13 lines major update to doxygen configuration file: 1) update to doxygen 1.5.x style file, as used in trunk 2) tell doxygen where are header files are, so include-file processing can be done 3) make all macros that are used to define variables/functions be expanded, so that doxygen will properly document the resulting variable/function 4) make all macros that are used to provide the contents of a variable (structure) be expanded, so that doxygen will be able to document the resulting fields 5) suppress compiler attributes (__attribute__(xxx)) from being seen by doxygen, so it will properly match up function definition and usage (for an example of th effect of this, look at the doxygen docs for ast_log() from before and afte this commit) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@157107 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-14Merged revisions 156911 via svnmerge from tilghman1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r156911 | tilghman | 2008-11-14 11:02:00 -0600 (Fri, 14 Nov 2008) | 4 lines Ping is missing the standard double-newline after the event. (closes issue #13903) Reported by: kebl0155 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@156912 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-14This is the 1.6.0 version of revision 156883 of trunk.mmichelson2-7/+29
This is different in that it preserves the case-sensitiveness of processing queues from configuration. closes issue #13703 git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@156889 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-14Merged revisions 156817 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r156817 | mmichelson | 2008-11-14 09:20:03 -0600 (Fri, 14 Nov 2008) | 18 lines Merged revisions 156816 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156816 | mmichelson | 2008-11-14 09:18:59 -0600 (Fri, 14 Nov 2008) | 10 lines If the prompt to reenter a voicemail password timed out, it resulted in the password not being saved, even if the input matched what you gave when first prompted to enter a new password. This is because the return value of ast_readstring was checked, but not checked properly. This bug was discovered by Jared Smith during an Asterisk training course. Thanks for reporting it! ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@156818 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-13Update to Coding Guidelinesbkruse1-6/+6
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@156653 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-13Merged revisions 156017 via svnmerge from bkruse1-14/+22
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.0@156652 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.0@156319 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.0@156251 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.0@156170 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-11Don't blow up if we get NULL when trying to parse out the full name fieldrussell1-1/+1
(fixed for Jared in the training room) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@156012 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-11remove prop that shouldn't be heremvanbaak0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@156007 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.0@156004 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.0@155815 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.0@155555 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.0@155468 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.0@155361 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-06Merged revisions 155121 via svnmerge from kpfleming3-86/+91
https://origsvn.digium.com/svn/asterisk/trunk ........ r155121 | kpfleming | 2008-11-06 16:49:19 -0600 (Thu, 06 Nov 2008) | 3 lines don't blindly assume that Darwin and Cygwin need GLOB_ABORTED defined; only define it if it is not already defined ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@155123 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-06Merged revisions 155012 via svnmerge from mmichelson1-2/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r155012 | mmichelson | 2008-11-06 13:46:53 -0600 (Thu, 06 Nov 2008) | 16 lines Merged revisions 155011 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r155011 | mmichelson | 2008-11-06 13:45:52 -0600 (Thu, 06 Nov 2008) | 8 lines The documentation listed the ability to set 'maxmsg' per context. The truth is that you can only set this in the general section or per mailbox. Thus I am updating the sample config file to be more accurate. Thanks to sasargen on IRC for bringing up this issue. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@155013 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-03Recorded merge of revisions 154072 via svnmerge from tilghman0-0/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r154072 | tilghman | 2008-11-03 16:28:12 -0600 (Mon, 03 Nov 2008) | 12 lines Merged revisions 154066 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r154066 | tilghman | 2008-11-03 16:27:10 -0600 (Mon, 03 Nov 2008) | 5 lines Attempting to expunge a mailbox when the mailstream is NULL will crash Asterisk. (Closes issue #13829) Reported by: jaroth Patch by: me (modified jaroth's patch) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@154081 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-03Merged revisions 154060 via svnmerge from tilghman1-3/+3
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r154060 | tilghman | 2008-11-03 15:48:21 -0600 (Mon, 03 Nov 2008) | 3 lines Remove the potential for a division by zero error. (Closes issue #13810) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@154062 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-03record revisions that were manually mergedkpfleming0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@153746 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-03Merge revision 153709 from trunkkpfleming7-24/+97
------------------------------------------------------------------------ r153709 | kpfleming | 2008-11-02 17:34:39 -0600 (Sun, 02 Nov 2008) | 3 lines instead of trying to forcibly load res_agi when app_stack is loaded (even if the administrator didn't want it loaded), use GCC weak symbols to determine whether it was loaded already or not; if it was loaded, then use it. ------------------------------------------------------------------------ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@153745 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-03port gcc 4.3.x warning fixes from trunk to this branchkpfleming48-763/+2913
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@153743 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-31Merged revisions 153181 via svnmerge from twilson5-23/+67
https://origsvn.digium.com/svn/asterisk/trunk ........ r153181 | twilson | 2008-10-31 13:55:33 -0500 (Fri, 31 Oct 2008) | 5 lines Recent CDR fixes moved execution of the 'h' exten into the bridging code, so variables that were set after ast_bridge_call was called would not show up in the 'h' exten. Added a callback function to handle setting variables, etc. from w/in the bridging code. Calls back into a nested function within the function calling ast_bridge_call (closes issue #13793) Reported by: greenfieldtech ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@153265 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-30Merged revisions 152993 via svnmerge from seanbright1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r152993 | seanbright | 2008-10-30 16:59:17 -0400 (Thu, 30 Oct 2008) | 10 lines Merged revisions 152992 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r152992 | seanbright | 2008-10-30 16:58:24 -0400 (Thu, 30 Oct 2008) | 2 lines The -I argument to aclocal needs a space before the include directory name. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@152994 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-30Merged revisions 152812 via svnmerge from kpfleming1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r152812 | kpfleming | 2008-10-30 11:54:29 -0500 (Thu, 30 Oct 2008) | 9 lines Merged revisions 152811 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r152811 | kpfleming | 2008-10-30 11:53:48 -0500 (Thu, 30 Oct 2008) | 3 lines instead of comparing the string pointer to 0, let's compare the value that was actually parsed out of the string (found by sparse) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@152813 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-30Merged revisions 152765 via svnmerge from tilghman1-41/+44
https://origsvn.digium.com/svn/asterisk/trunk ........ r152765 | tilghman | 2008-10-29 23:26:34 -0500 (Wed, 29 Oct 2008) | 5 lines Set up an example stdexten that preserves the original context and extension in the CDR. (Related to issue #13799) Reported by: davidw ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@152772 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-29Merged revisions 152646 via svnmerge from mmichelson1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r152646 | mmichelson | 2008-10-29 15:53:53 -0500 (Wed, 29 Oct 2008) | 9 lines If there was no named defined in a voicemail.conf mailbox entry, then app_directory would crash when attempting to read that entry from the file. We now check for the NULL or empty string properly so that there will be no crash. (closes issue #13804) Reported by: bluecrow76 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@152647 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-29Small modification to putnopvut's patch to fix this issue. Thanks for all ↵twilson1-55/+107
the help, putnopvut! (closes issue #12884) Reported by: bcnit Patches: 12884v4-1.6.0-branch.patch uploaded by otherwiseguy (license 396) Tested by: otherwiseguy git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@152644 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-28Merged revisions 152442 via svnmerge from tilghman1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r152442 | tilghman | 2008-10-28 16:38:26 -0500 (Tue, 28 Oct 2008) | 7 lines Only re-add the io port if it was closed, otherwise reload causes a memory leak. (closes issue #13785) Reported by: eliel Patches: chan_mgcp.c.patch uploaded by eliel (license 64) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@152443 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-27Merged revisions 152134 via svnmerge from tilghman1-10/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r152134 | tilghman | 2008-10-27 11:24:11 -0500 (Mon, 27 Oct 2008) | 4 lines Oops, only delete the ARG variables once upon release. The following section would have removed them again (removing variables from 2 stack frames, instead of just one). ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@152157 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-26Merged revisions 152060 via svnmerge from seanbright1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r152060 | seanbright | 2008-10-26 16:25:08 -0400 (Sun, 26 Oct 2008) | 15 lines Merged revisions 152059 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r152059 | seanbright | 2008-10-26 16:23:36 -0400 (Sun, 26 Oct 2008) | 7 lines Since passing \0 as the second argument to strchr is valid (and will match the trailing \0 of a string) we need to check that first, otherwise we end up with incorrect results. Fix suggested by reporter. (closes issue #13787) Reported by: meitinger ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@152062 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-23Fix some memory leaks. These issues are 1.6.0 specific.russell1-2/+9
- Freeing the peer got accidentally removed from the peer's destructor. It is still needed for astobj, but not for astobj2. - Fix some places that called find_user or find_peer, but did not release the reference that was returned. (closes issue #13331) Reported by: sergee Patches: chan_sip-3leaks-16-r151244.diff uploaded by sergee (license 138) Tested by: sergee git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@151765 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-20Merged revisions 151242-151243 via svnmerge from kpfleming19-1122/+1074
https://origsvn.digium.com/svn/asterisk/trunk ................ r151242 | kpfleming | 2008-10-20 07:59:04 +0300 (Mon, 20 Oct 2008) | 9 lines Merged revisions 151240 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r151240 | kpfleming | 2008-10-20 07:45:56 +0300 (Mon, 20 Oct 2008) | 3 lines break up acinclude.m4 into individual files, which will make it easier to maintain, easier to add new macros (less patching) and will ease maintenance of these macros across Asterisk branches ........ ................ r151243 | kpfleming | 2008-10-20 08:00:56 +0300 (Mon, 20 Oct 2008) | 9 lines Merged revisions 151241 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r151241 | kpfleming | 2008-10-20 07:57:33 +0300 (Mon, 20 Oct 2008) | 2 lines rename this macro to properly reflect what it does ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@151244 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-18Merged revisions 150817 via svnmerge from bweschke1-1/+9
https://origsvn.digium.com/svn/asterisk/trunk ........ r150817 | bweschke | 2008-10-17 22:18:33 -0400 (Fri, 17 Oct 2008) | 8 lines Using the GetVar handler in AMI is potentially dangerous (insta-crash [tm]) when you use a dialplan function that requires a channel and then you don't provide one or provide an invalid one in the Channel: parameter. We'll handle this situation exactly the same way it was handled in pbx.c back on r61766. We'll create a bogus channel for the function call and destroy it when we're done. If we have trouble allocating the bogus channel then we're not going to try executing the function call at all and run the risk of crashing. (closes issue #13715) reported by: makoto patch by: bweschke ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@150854 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-17Instead of merging commit 150307 to 1.6.0, I hadmmichelson1-8/+5
meant to block it in 1.6.1...time to go home :) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@150313 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-17Merged revisions 150307 via svnmerge from mmichelson1-5/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r150307 | mmichelson | 2008-10-16 19:13:35 -0500 (Thu, 16 Oct 2008) | 14 lines After a long discussion on #asterisk-bugs, it seems kind of odd that a channel would be named after the port on which it came in on. For endpoints that always include ":5060" as part of the From: header, it will mean that you have a ton of channels with names like "SIP/5060-3ea38a8b." I am boldly moving forward with this change in trunk, but I'm not touching other branches with this one since this definitely would qualify as a behavior change. If there is a problem with this commit, and I haven't seen the obvious reason why you'd want to name the channel after the port from which the call originated, then please feel free to revert this ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@150308 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-16Merged revisions 150125 via svnmerge from rmudgett1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r150125 | rmudgett | 2008-10-16 11:04:45 -0500 (Thu, 16 Oct 2008) | 9 lines Merged revisions 150124 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r150124 | rmudgett | 2008-10-16 10:56:06 -0500 (Thu, 16 Oct 2008) | 1 line Fix memory leak found by customer ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@150126 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-15Merged revisions 149756 via svnmerge from bweschke1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r149756 | bweschke | 2008-10-15 16:14:20 -0400 (Wed, 15 Oct 2008) | 10 lines Merged revisions 149683 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r149683 | bweschke | 2008-10-15 14:28:54 -0400 (Wed, 15 Oct 2008) | 4 lines An update to the documentation/example of agents.conf.sample with the correct parameter for this feature as defined in chan_agent.c (closes issue #13709) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@149757 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-15Merged revisions 149487 via svnmerge from kpfleming1-16/+47
https://origsvn.digium.com/svn/asterisk/trunk ................ r149487 | kpfleming | 2008-10-15 13:26:36 +0200 (Wed, 15 Oct 2008) | 9 lines Merged revisions 149452 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r149452 | kpfleming | 2008-10-15 12:30:40 +0200 (Wed, 15 Oct 2008) | 3 lines fix some problems when parsing SIP messages that have the maximum number of headers or body lines that we support ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@149495 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-14Merged revisions 148913 via svnmerge from mmichelson1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r148913 | mmichelson | 2008-10-14 12:38:06 -0500 (Tue, 14 Oct 2008) | 17 lines Merged revisions 148912 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r148912 | mmichelson | 2008-10-14 12:33:38 -0500 (Tue, 14 Oct 2008) | 9 lines Deadlock prevention in chan_local. (closes issue #13676) Reported by: tacvbo Patches: 13676.patch uploaded by putnopvut (license 60) Tested by: tacvbo ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@148914 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-14Merged revisions 148738 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r148738 | kpfleming | 2008-10-14 12:33:14 +0200 (Tue, 14 Oct 2008) | 9 lines Merged revisions 148736 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r148736 | kpfleming | 2008-10-14 12:30:54 +0200 (Tue, 14 Oct 2008) | 3 lines on Ubuntu (at least), recent versions of ld in binutils delete all debugging symbols when -x is supplied; since the reasons why -x is being passed are lost in the mists of time, remove it so debugging will work properly ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@148739 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-14Merged revisions 148612 via svnmerge from kpfleming1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r148612 | kpfleming | 2008-10-14 03:06:45 -0500 (Tue, 14 Oct 2008) | 9 lines Merged revisions 148611 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r148611 | kpfleming | 2008-10-14 02:54:41 -0500 (Tue, 14 Oct 2008) | 3 lines it would be nice if this message printing code had actually been tested before it was committed... ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@148613 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-13Blocked revisions 148519 via svnmergemurf0-0/+0
........ r148519 | murf | 2008-10-13 11:14:38 -0600 (Mon, 13 Oct 2008) | 15 lines Hmmm. Nobody (but me) is interested in seeing the trie info when they do 'dialplan show ...' (even with debug set to non-zero); so I set up a 'dialplan debug [context]' cli command instead, to explicitly show just the trie info. I even added an extension_exists() call to make sure the trie info is built. I moved the explanatory header to above the extension loop to ensure it only prints once. And it will do this now, whether debug is set or not. I removed the trie printing from the 'dialplan show' command entirely. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@148559 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-10Merged revisions 148373 via svnmerge from mmichelson1-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r148373 | mmichelson | 2008-10-10 16:18:10 -0500 (Fri, 10 Oct 2008) | 8 lines Make sure that the inUse and inRinging fields for a sip peer cannot go below zero. This is a regression from 1.4 and so it will be applied to 1.6.0 as well. (closes issue #13668) Reported by: mjc ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@148374 f38db490-d61c-443f-a65b-d21fe96a405b