aboutsummaryrefslogtreecommitdiffstats
path: root/main
AgeCommit message (Collapse)AuthorFilesLines
2008-08-02Merged revisions 135265 via svnmerge from murf1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r135265 | murf | 2008-08-01 22:51:29 -0600 (Fri, 01 Aug 2008) | 31 lines (closes issue #13202) Reported by: falves11 Tested by: murf falves11 == The changes I introduce here seem to clear up the problem for me. However, if they do not for you, please reopen this bug, and we'll keep digging. The root of this problem seems to be a subtle memory corruption introduced when creating an extension with an empty extension name. While valgrind cannot detect it outside of DEBUG_MALLOC mode, when compiled with DEBUG_MALLOC, this is certain death. The code in main/features.c is a puzzle to me. On the initial module load, the code is attempting to add the parking extension before the features.conf file has even been opened! I just wrapped the offending call with an if() that will not try to add the extension if the extension name is empty. THis seems to solve the corruption, and let the "memory show allocations" work as one would expect. But, really, adding an extension with an empty name is a seriously bad thing to allow, as it will mess up all the pattern matching algorithms, etc. So, I added a statement to the add_extension2 code to return a -1 if this is attempted. in 1.6.0, the changes to only main/pbx.c were applicable, as apparently the code added to main/features by jpeeler were not included in 1.6.0. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@135266 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31Merged revisions 135016 via svnmerge from kpfleming1-10/+10
https://origsvn.digium.com/svn/asterisk/trunk ................ r135016 | kpfleming | 2008-07-31 17:28:42 -0500 (Thu, 31 Jul 2008) | 11 lines Merged revisions 134983 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r134983 | kpfleming | 2008-07-31 17:18:11 -0500 (Thu, 31 Jul 2008) | 3 lines accomodate users who seem to lack a sense of humor :-) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@135034 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31Merged revisions 134980 via svnmerge from tilghman1-5/+13
https://origsvn.digium.com/svn/asterisk/trunk ................ r134980 | tilghman | 2008-07-31 16:55:42 -0500 (Thu, 31 Jul 2008) | 16 lines Blocked revisions 134976 via svnmerge ........ r134976 | tilghman | 2008-07-31 16:53:19 -0500 (Thu, 31 Jul 2008) | 9 lines Specify codecs in callfiles and manager, to allow video calls to be set up from callfiles and AMI. (closes issue #9531) Reported by: Geisj Patches: 20080715__bug9531__1.4.diff.txt uploaded by Corydon76 (license 14) 20080715__bug9531__1.6.0.diff.txt uploaded by Corydon76 (license 14) Tested by: Corydon76 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134981 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31Merged revisions 134922 via svnmerge from murf1-4/+14
https://origsvn.digium.com/svn/asterisk/trunk ................ r134922 | murf | 2008-07-31 13:48:08 -0600 (Thu, 31 Jul 2008) | 63 lines Merged revisions 134883 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r134883 | murf | 2008-07-31 13:23:42 -0600 (Thu, 31 Jul 2008) | 51 lines (closes issue #11849) Reported by: greyvoip Tested by: murf OK, a few days of debugging, a bunch of instrumentation in chan_sip, main/channel.c, main/pbx.c, etc. and 5 solid notebook pages of notes later, I have made the small tweek necc. to get the start time right on the second CDR when: A Calls B B answ. A hits Xfer button on sip phone, A dials C and hits the OK button, A hangs up C answers ringing phone B and C converse B and/or C hangs up But does not harm the scenario where: A Calls B B answ. B hits xfer button on sip phone, B dials C and hits the OK button, B hangs up C answers ringing phone A and C converse A and/or C hangs up The difference in start times on the second CDR is because of a Masquerade on the B channel when the xfer number is sent. It ends up replacing the CDR on the B channel with a duplicate, which ends up getting tossed out. We keep a pointer to the first CDR, and update *that* after the bridge closes. But, only if the CDR has changed. I hope this change is specific enough not to muck up any current CDR-based apps. In my defence, I assert that the previous information was wrong, and this change fixes it, and possibly other similar scenarios. I wonder if I should be doing the same thing for the channel, as I did for the peer, but I can't think of a scenario this might affect. I leave it, then, as an exersize for the users, to find the scenario where the chan's CDR changes and loses the proper start time. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134923 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30Merged revisions 134703 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r134703 | tilghman | 2008-07-30 17:38:58 -0500 (Wed, 30 Jul 2008) | 2 lines Oops, wrong define ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134706 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30Merged revisions 134476 via svnmerge from mmichelson1-1/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r134476 | mmichelson | 2008-07-30 13:33:12 -0500 (Wed, 30 Jul 2008) | 12 lines Merged revisions 134475 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r134475 | mmichelson | 2008-07-30 13:31:47 -0500 (Wed, 30 Jul 2008) | 4 lines Fix a spot where a function could return without bringing a channel out of autoservice. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134477 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-28Merged revisions 134125 via svnmerge from mmichelson1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r134125 | mmichelson | 2008-07-28 14:53:56 -0500 (Mon, 28 Jul 2008) | 27 lines This commit compensates for buggy poll(2) implementations. Asterisk has, for a long time, had its own implementation of poll(2) which just used the input arguments to call select(2). In 1.4, this internal implementation was used for Darwin systems. This was removed in Asterisk trunk at some point, but it seems as though this was not the right move to make. On Mac OS X, it appears as though the poll used to gather CLI input does not respond properly when connecting via a remote Asterisk console. Reverting to the use of Asterisk's poll fixed the issue. Also, there is now an option for the configure script, --enable-internal-poll, which will allow for anyone to use Asterisk's internal poll implementation in case they suspect that their system's poll implementation is buggy. closes issue #11928) Reported by: adriavidal Patches: 1.6.0-configurev2.patch uploaded by putnopvut (license 60) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134126 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-28Merged revisions 134086 via svnmerge from kpfleming4-35/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r134086 | kpfleming | 2008-07-28 11:42:00 -0500 (Mon, 28 Jul 2008) | 3 lines remove remaining Zaptel references in various places ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134087 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-28Merged revisions 134050 via svnmerge from mmichelson1-2/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r134050 | mmichelson | 2008-07-28 11:00:19 -0500 (Mon, 28 Jul 2008) | 3 lines merging the zap_and_dahdi_trunk branch up to trunk ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134052 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-26Include the licensing page in 1.6.0 as well. Now, this page exists in 1.4, ↵russell1-7/+1
trunk, and 1.6.0. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@133982 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-26Merged revisions 133945-133946 via svnmerge from russell1-5/+16
https://origsvn.digium.com/svn/asterisk/trunk ........ r133945 | russell | 2008-07-26 10:15:14 -0500 (Sat, 26 Jul 2008) | 6 lines ast_device_state() gets called in two different ways. The first way is when called from elsewhere in Asterisk to find the current state of a device. In that case, we want to use the cached value if it exists. The other way is when processing a device state change. In that case, we do not want to check the cache because returning the last known state is counter productive. ........ r133946 | russell | 2008-07-26 10:16:20 -0500 (Sat, 26 Jul 2008) | 1 line actually use the cache_cache argument ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@133947 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-25Include the http_decode function from trunkbkruse1-3/+20
to replace the + with a space. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@133804 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-25Merged revisions 133665 via svnmerge from tilghman2-36/+16
https://origsvn.digium.com/svn/asterisk/trunk ................ r133665 | tilghman | 2008-07-25 12:24:43 -0500 (Fri, 25 Jul 2008) | 16 lines Merged revisions 133649 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r133649 | tilghman | 2008-07-25 12:19:39 -0500 (Fri, 25 Jul 2008) | 8 lines Fix some errant device states by making the devicestate API more strict in terms of the device argument (only without the unique identifier appended). (closes issue #12771) Reported by: davidw Patches: 20080717__bug12771.diff.txt uploaded by Corydon76 (license 14) Tested by: davidw, jvandal, murf ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@133671 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-24Merged revisions 133448 via svnmerge from mmichelson1-7/+9
https://origsvn.digium.com/svn/asterisk/trunk ........ r133448 | mmichelson | 2008-07-24 14:53:37 -0500 (Thu, 24 Jul 2008) | 12 lines Print the correct PID in log messages. Prior to this commit, only the logger thread's PID would be printed. (closes issue #13150) Reported by: atis Patches: log_pid.diff uploaded by putnopvut (license 60) Tested by: eliel ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@133449 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-23Merged revisions 133299 via svnmerge from murf1-21/+37
https://origsvn.digium.com/svn/asterisk/trunk ........ r133299 | murf | 2008-07-23 16:03:48 -0600 (Wed, 23 Jul 2008) | 27 lines (closes issue #13144) Reported by: murf Tested by: murf For: J. Geis The 'data' field in the ast_exten struct was being 'moved' from the current dialplan to the replacement dialplan. This was not good, as the current dialplan could have problems in the time between the change and when the new dialplan is swapped in. So, I modified the merge_and_delete code to strdup the 'data' field (the args to the app call), and then it's freed as normal. I improved a few messages; I added code to limit the number of calls to the context_merge_incls_swits_igps_other_registrars() to one per context. I don't think having it called multiple times per context was doing anything bad, but it was inefficient. I hope this fixes the problems Mr. Geiss was noting in asterisk-users, see http://lists.digium.com/pipermail/asterisk-users/2008-July/215634.html ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@133300 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-23Merged revisions 133171 via svnmerge from mmichelson1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r133171 | mmichelson | 2008-07-23 14:48:03 -0500 (Wed, 23 Jul 2008) | 20 lines Merged revisions 133169 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r133169 | mmichelson | 2008-07-23 14:39:47 -0500 (Wed, 23 Jul 2008) | 12 lines As suggested by seanbright, the PSEUDO_CHAN_LEN in app_chanspy should be set at load time, not at compile time, since dahdi_chan_name is determined at load time. Also changed the next_unique_id_to_use to have the static qualifier. Also added the dahdi_chan_name_len variable so that strlen(dahdi_chan_name) isn't necessary. Thanks to seanbright for the suggestion. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@133172 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-23Merged revisions 132964 via svnmerge from kpfleming1-11/+42
https://origsvn.digium.com/svn/asterisk/trunk ................ r132964 | kpfleming | 2008-07-23 11:30:18 -0500 (Wed, 23 Jul 2008) | 10 lines Merged revisions 132872 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r132872 | kpfleming | 2008-07-23 06:52:18 -0500 (Wed, 23 Jul 2008) | 2 lines minor optimization for stringfields: when a field is being set to a larger value than it currently contains and it happens to be the most recent field allocated from the currentl pool, it is possible to 'grow' it without having to waste the space it is currently using (or potentially even allocate a new pool) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132965 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-21Merged revisions 132511 via svnmerge from tilghman1-0/+31
https://origsvn.digium.com/svn/asterisk/trunk ........ r132511 | tilghman | 2008-07-21 16:00:47 -0500 (Mon, 21 Jul 2008) | 2 lines (Step 2 of 2) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132513 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-21Merged revisions 132510 via svnmerge from tilghman4-1/+400
https://origsvn.digium.com/svn/asterisk/trunk ........ r132510 | tilghman | 2008-07-21 15:59:03 -0500 (Mon, 21 Jul 2008) | 5 lines Optionally build integer-based routines for FSK tone decoding (but default to the more accurate float-based routines). (Closes issue #11679) (Step 1 of 2) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132512 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-21Merged revisions 132390 via svnmerge from russell22-10267/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r132390 | russell | 2008-07-21 09:47:41 -0500 (Mon, 21 Jul 2008) | 16 lines Remove libresample from the Asterisk source tree. It is now available in its own repository, and must be installed like any other library for Asterisk to use. The two modules that require it are codec_resample and app_jack. To install libresample: $ svn co http://svn.digium.com/svn/libresample/trunk libresample $ cd libresample $ ./configure $ make $ sudo make install This code is currently in our own repository because the build system did not include the appropriate targets for building a dynamic library or for installing the library. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132391 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-18Merged revisions 132242 via svnmerge from bbryant1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r132242 | bbryant | 2008-07-18 17:19:56 -0500 (Fri, 18 Jul 2008) | 4 lines Fixes problem where manager users loaded from users.conf would be removed early (before the routine to load the configuration was finished) because a variable wasn't initialized. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132245 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-18Merged revisions 132113 via svnmerge from tilghman1-19/+75
https://origsvn.digium.com/svn/asterisk/trunk ................ r132113 | tilghman | 2008-07-18 14:09:39 -0500 (Fri, 18 Jul 2008) | 14 lines Merged revisions 132112 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r132112 | tilghman | 2008-07-18 14:06:10 -0500 (Fri, 18 Jul 2008) | 6 lines Fix for Taiwanese number syntax (closes issue #12319) Reported by: CharlesWang Patches: saynumber-tw-1.4.18.1.patch uploaded by CharlesWang (license 444) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132114 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-18Merged revisions 132109 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r132109 | tilghman | 2008-07-18 13:50:37 -0500 (Fri, 18 Jul 2008) | 14 lines Merged revisions 132107 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r132107 | tilghman | 2008-07-18 13:47:50 -0500 (Fri, 18 Jul 2008) | 6 lines Textual clarification (closes issue #13106) Reported by: flefoll Patches: config.c.br14.120173.patch-unknown-directive uploaded by flefoll (license 244) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132110 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-18Merged revisions 132050 via svnmerge from bbryant1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r132050 | bbryant | 2008-07-18 12:55:41 -0500 (Fri, 18 Jul 2008) | 8 lines Fix magic Revision keywords in hashtab.c and change cdr_radius.c to use the same keyword as the other files (patch by eliel). (closes issue #13104) Reported by: eliel Patches: revision.patch uploaded by eliel (license 64) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132051 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-18Merged revisions 131989 via svnmerge from tilghman1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r131989 | tilghman | 2008-07-18 12:10:34 -0500 (Fri, 18 Jul 2008) | 10 lines Merged revisions 131988 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r131988 | tilghman | 2008-07-18 12:10:01 -0500 (Fri, 18 Jul 2008) | 2 lines Oops ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131990 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-18Merged revisions 131986 via svnmerge from tilghman1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r131986 | tilghman | 2008-07-18 11:48:18 -0500 (Fri, 18 Jul 2008) | 10 lines Merged revisions 131985 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r131985 | tilghman | 2008-07-18 11:46:23 -0500 (Fri, 18 Jul 2008) | 2 lines Preserve ABI compatibility with last change ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131987 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-18Merged revisions 131982 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r131982 | tilghman | 2008-07-18 11:33:56 -0500 (Fri, 18 Jul 2008) | 10 lines Merged revisions 131970 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r131970 | tilghman | 2008-07-18 11:30:31 -0500 (Fri, 18 Jul 2008) | 2 lines Make the ast_assert call within ast_sched_del report something useful. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131984 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-18Merged revisions 131923 via svnmerge from kpfleming3-1233/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r131923 | kpfleming | 2008-07-18 11:16:12 -0500 (Fri, 18 Jul 2008) | 10 lines Merged revisions 131921 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r131921 | kpfleming | 2008-07-18 11:15:41 -0500 (Fri, 18 Jul 2008) | 2 lines remove the dlfcn compatibility stuff, because no platforms that Asterisk currently runs on it use it, and it doesn't build anyway ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131924 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-18Merged revisions 131916 via svnmerge from bbryant1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r131916 | bbryant | 2008-07-18 10:38:22 -0500 (Fri, 18 Jul 2008) | 12 lines Merged revisions 131915 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r131915 | bbryant | 2008-07-18 10:34:42 -0500 (Fri, 18 Jul 2008) | 4 lines Fix a bug in blind transfers where the BLINDTRANSFER variable isn't always set to the other end of the blind transfer. (closes issue #12586) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131917 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-17Merged revisions 131717 via svnmerge from bbryant1-9/+9
https://origsvn.digium.com/svn/asterisk/trunk ........ r131717 | bbryant | 2008-07-17 13:14:42 -0500 (Thu, 17 Jul 2008) | 8 lines Fix a memory leak in register_group_feature when attempting to register a feature without specifying a group or feature to register. (closes issue #13101) Reported by: eliel Patches: features.c.patch uploaded by eliel (license 64) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131718 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-16Merged revisions 131445 via svnmerge from bbryant1-5/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r131445 | bbryant | 2008-07-16 16:24:18 -0500 (Wed, 16 Jul 2008) | 9 lines Fixes an issue with "core show sysinfo" that used the wrong operator to calculate the number of bytes from a sysinfo structure. unsigned long. (closes issue #13057) Reported by: eliel Patches: asterisk.c.patch uploaded by eliel (license 64) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131455 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-16Merged revisions 131166 via svnmerge from tilghman1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r131166 | tilghman | 2008-07-15 19:52:48 -0500 (Tue, 15 Jul 2008) | 3 lines Fix rotate strategy (Closes issue #13086) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131168 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-15Merged revisions 131129 via svnmerge from murf1-3/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r131129 | murf | 2008-07-15 17:36:19 -0600 (Tue, 15 Jul 2008) | 21 lines (closes issue #12960) Reported by: mnicholson Spent most of the day on this bug, and the solution was so simple. Just had to find and understand the problem. The problem was, that the routine to copy the existing switches, includes, and ignorepats from the old context to the new one, wasn't getting called when the context is already existent. (In other words, if AEL is adding a new context to the mix, they get copied, but if pbx_config already defined a context, then the copy wasn't happening. This made no sense, so I moved the call to copy the includes & etc, no matter the case. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131131 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-15Merged revisions 131044 via svnmerge from tilghman2-10/+10
https://origsvn.digium.com/svn/asterisk/trunk ................ r131044 | tilghman | 2008-07-15 13:25:34 -0500 (Tue, 15 Jul 2008) | 16 lines Merged revisions 130959 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r130959 | tilghman | 2008-07-15 12:19:13 -0500 (Tue, 15 Jul 2008) | 8 lines astman_send_error does not need a newline appended -- the API takes care of that for us. (closes issue #13068) Reported by: gknispel_proformatique Patches: asterisk_1_4_astman_send.patch uploaded by gknispel (license 261) asterisk_trunk_astman_send.patch uploaded by gknispel (license 261) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131060 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-15Merged revisions 131013 via svnmerge from mvanbaak1-4/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r131013 | mvanbaak | 2008-07-15 19:49:48 +0200 (Tue, 15 Jul 2008) | 15 lines Merged revisions 131012 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r131012 | mvanbaak | 2008-07-15 19:47:15 +0200 (Tue, 15 Jul 2008) | 7 lines remove 4 lines of redundant code. (closes issue #13080) Reported by: gknispel_proformatique Patches: trunk_ast_cdr_setapp.patch uploaded by gknispel (license 261) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131014 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-15Merged revisions 130145 via svnmerge from murf2-241/+723
https://origsvn.digium.com/svn/asterisk/trunk Merging this rev from trunk to 1.6.0 was not simple. Why? Because we've enhanced trunk to do a [fast] merge-and-delete operation which also solved problems with contexts having entries from different registrars. Fast as in the amount of time the contexts are locked down. That *is* fast, but traversing the entire dialplan looking for priorities to delete takes more time overall. This particular fix involved pulling in those enhancements from trunk, along with all the various fixes and refinements made along the way. Merging all this from trunk into 1.6 involved: a. mergetrunk6 in the stuff from 130145; b. revert all but the prop changes c. catalog all revisions to pbx.c since 1.6.0 was forked (at rev 105596). d. catalog all revisions to pbx.c in trunk since 1.6.0 was forked, making special note of all revs that were not merged into 1.6.0. e. study each rev in trunk not applied to 1.6.0, and determine if it was involved in the merge_and_delete enhancements in trunk. 25 commits were done in 1.6.0, all but one (106306) was a merge from trunk. Trunk had 22 additional changes, of which 7 were involved in the merge_and_delete enhancements: 106757 108894 109169 116461 123358 130145 130297 f. Go to trunk and collect patches, one by one, of the changes made by each rev across the entire source tree, using svn diff -c <num> > pfile g. Apply each patch in order to 1.6.0, and resolve all failures and compilation problems before proceding to the next patch. h. test the stuff. i. profit! ........ r130145 | murf | 2008-07-11 12:24:31 -0600 (Fri, 11 Jul 2008) | 40 lines (closes issue #13041) Reported by: eliel Tested by: murf (closes issue #12960) Reported by: mnicholson In this 'omnibus' fix, I **think** I solved both the problem in 13041, where unloading pbx_ael.so caused crashes, or incomplete removal of previous registrar'ed entries. And I added code to completely remove all includes, switches, and ignorepats that had a matching registrar entry, which should appease 12960. I also added a lot of seemingly useless brackets around single statement if's, which helped debug so much that I'm leaving them there. I added a routine to check the correlation between the extension tree lists and the hashtab tables. It can be amazingly helpful when you have lots of dialplan stuff, and need to narrow down where a problem is occurring. It's ifdef'd out by default. I cleaned up the code around the new CIDmatch code. It was leaving hanging extens with bad ptrs, getting confused over which objects to remove, etc. I tightened up the code and changed the call to remove_exten in the merge_and_delete code. I added more conditions to check for empty context worthy of deletion. It's not empty if there are any includes, switches, or ignorepats present. If I've missed anything, please re-open this bug, and be prepared to supply example dialplan code. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130946 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-14Merged revisions 130854 via svnmerge from mmichelson1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r130854 | mmichelson | 2008-07-14 17:22:57 -0500 (Mon, 14 Jul 2008) | 9 lines Fix a memory leak in the case that /dev/null cannot be opened when running startup commands from cli.conf (closes issue #13066) Reported by: eliel Patches: asterisk.c.patch uploaded by eliel (license 64) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130855 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-14Merged revisions 130744 via svnmerge from mvanbaak1-5/+13
https://origsvn.digium.com/svn/asterisk/trunk ................ r130744 | mvanbaak | 2008-07-14 19:21:18 +0200 (Mon, 14 Jul 2008) | 18 lines Merged revisions 130735 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r130735 | mvanbaak | 2008-07-14 19:10:21 +0200 (Mon, 14 Jul 2008) | 10 lines notify the user that dnsmgr refresh wont work when dnsmgr is not enabled. Previously this command would automagically appear and disappear. This was confusing. (closes issue #12796) Reported by: chappell Patches: dnsmgr_refresh_3.diff uploaded by chappell (license 8) Tested by: russell, chappell, mvanbaak ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130752 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-14Merged revisions 130635 via svnmerge from russell1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r130635 | russell | 2008-07-14 05:39:23 -0500 (Mon, 14 Jul 2008) | 10 lines Merged revisions 130634 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r130634 | russell | 2008-07-14 05:38:14 -0500 (Mon, 14 Jul 2008) | 2 lines Bump up the debug level for a message. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130636 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-13Merged revisions 130574 via svnmerge from mvanbaak1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r130574 | mvanbaak | 2008-07-14 00:50:31 +0200 (Mon, 14 Jul 2008) | 16 lines Merged revisions 130573 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r130573 | mvanbaak | 2008-07-14 00:48:51 +0200 (Mon, 14 Jul 2008) | 8 lines fix memory leak when originate from manager cannot create a thread (closes issue #13069) Reported by: gknispel_proformatique Patches: asterisk_trunk_action_originate.patch uploaded by gknispel (license 261) Tested by: gknispel_proformatique, mvanbaak ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130575 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11Merged revisions 130237 via svnmerge from mmichelson1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r130237 | mmichelson | 2008-07-11 15:03:55 -0500 (Fri, 11 Jul 2008) | 11 lines Merged revisions 130236 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r130236 | mmichelson | 2008-07-11 15:03:23 -0500 (Fri, 11 Jul 2008) | 3 lines Remove redundant logic ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130238 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11Merged revisions 130174 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r130174 | mmichelson | 2008-07-11 14:14:15 -0500 (Fri, 11 Jul 2008) | 15 lines Merged revisions 130173 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r130173 | mmichelson | 2008-07-11 14:13:29 -0500 (Fri, 11 Jul 2008) | 7 lines Fix a typo in audiohook_read_frame_both. While this change has not been proven to fix any specific issue, it is incorrect and could cause unforeseen problems. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130175 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11Merged revisions 130129 via svnmerge from bbryant6-8/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r130129 | bbryant | 2008-07-11 13:09:35 -0500 (Fri, 11 Jul 2008) | 8 lines Janitor patch to change uses of sizeof to ARRAY_LEN (closes issue #13054) Reported by: pabelanger Patches: ARRAY_LEN.patch2 uploaded by pabelanger (license 224) Tested by: seanbright ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130130 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11Merged revisions 129968 via svnmerge from kpfleming1-1/+19
https://origsvn.digium.com/svn/asterisk/trunk ................ r129968 | kpfleming | 2008-07-11 09:16:15 -0500 (Fri, 11 Jul 2008) | 18 lines Merged revisions 129966 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r129966 | kpfleming | 2008-07-11 09:03:52 -0500 (Fri, 11 Jul 2008) | 5 lines fix a flaw found while experimenting with structure alignment and padding; low-fence checking would not work properly on 64-bit platforms, because the compiler was putting 4 bytes of padding between the fence field and the allocation memory block added a very obvious runtime warning if this condition reoccurs, so the developer who broke it can be chastised into fixing it :-) ........ r129967 | kpfleming | 2008-07-11 09:03:52 -0500 (Fri, 11 Jul 2008) | 5 lines simplify calculation ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129969 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-09Merged revisions 129437 via svnmerge from mmichelson1-4/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r129437 | mmichelson | 2008-07-09 14:40:30 -0500 (Wed, 09 Jul 2008) | 21 lines Merged revisions 129436 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r129436 | mmichelson | 2008-07-09 14:32:20 -0500 (Wed, 09 Jul 2008) | 13 lines Fix a problem where inbound rfc2833 audio would be sent to the core instead of being P2P bridged. When the core regenerated the rfc2833 packet for the outbound leg, the SSRC would be different than the RTP audio on the call leg causing DTMF detection issues on the far end. (closes issue #12955) Reported by: tonyredstone Patches: dynamic_rtp.patch uploaded by tsearle (license 373) Tested by: tonyredstone ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129438 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-09Merged revisions 129399 via svnmerge from mattf1-2/+18
https://origsvn.digium.com/svn/asterisk/trunk ........ r129399 | mattf | 2008-07-09 10:57:06 -0500 (Wed, 09 Jul 2008) | 1 line Add Proceeding() application (#13025) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129400 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-09Merged revisions 129344 via svnmerge from seanbright4-55/+95
https://origsvn.digium.com/svn/asterisk/trunk ................ r129344 | seanbright | 2008-07-09 09:44:43 -0400 (Wed, 09 Jul 2008) | 12 lines Merged revisions 129343 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r129343 | seanbright | 2008-07-09 09:41:21 -0400 (Wed, 09 Jul 2008) | 4 lines Look for the system installed awk instead of assuming it's at /usr/bin/awk. Pointed out by jmls via #asterisk-dev. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129345 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-08Merged revisions 129156 via svnmerge from bbryant2-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r129156 | bbryant | 2008-07-08 16:00:01 -0500 (Tue, 08 Jul 2008) | 6 lines Fix a bug in SRV lookups where dnsmgr would discard everything but the first SRV result from DNS before processing weights and priorities and dns_parse_answer wouldn't report that there were no records in DNS unless a failure occured. Also fixed a bug where dnsmgr_refresh would report that a entry was being changed when ast_gethostbyname had failed. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129157 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-08Merged revisions 129045 via svnmerge from bbryant8-29/+29
https://origsvn.digium.com/svn/asterisk/trunk ........ r129045 | bbryant | 2008-07-08 11:40:28 -0500 (Tue, 08 Jul 2008) | 7 lines Janitor project to convert sizeof to ARRAY_LEN macro. (closes issue #13002) Reported by: caio1982 Patches: janitor_arraylen5.diff uploaded by caio1982 (license 22) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129046 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-04Merged revisions 128027 via svnmerge from tilghman1-61/+54
https://origsvn.digium.com/svn/asterisk/trunk ................ r128027 | tilghman | 2008-07-04 11:06:34 -0500 (Fri, 04 Jul 2008) | 16 lines Merged revisions 127973 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r127973 | tilghman | 2008-07-03 22:30:30 -0500 (Thu, 03 Jul 2008) | 8 lines Fix the 'dialplan remove extension' logic, so that it a) works with cidmatch, and b) completes contexts correctly when the extension is ambiguous. (closes issue #12980) Reported by: licedey Patches: 20080703__bug12980.diff.txt uploaded by Corydon76 (license 14) Tested by: Corydon76 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@128028 f38db490-d61c-443f-a65b-d21fe96a405b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 22:12:37 +0000