73 Commits (fca68adb9572ad9410b4fc0e521a99f07f21d4f0)

Author	SHA1	Message	Date
Mark Michelson	eee3091cbf	Merged revisions 136660 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk ........ r136660 | mmichelson | 2008-08-07 15:25:43 -0500 (Thu, 07 Aug 2008) | 4 lines Bump a LOG_NOTICE message to LOG_DEBUG since it appears once for every bridged call ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@136663 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Steve Murphy	638711f573	Merged revisions 135821 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk ................ r135821 | murf | 2008-08-05 17:45:32 -0600 (Tue, 05 Aug 2008) | 42 lines Merged revisions 135799 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r135799 | murf | 2008-08-05 17:13:20 -0600 (Tue, 05 Aug 2008) | 34 lines (closes issue #12982) Reported by: bcnit Tested by: murf I discovered that also, in the previous bug fixes and changes, the cdr.conf 'unanswered' option is not being obeyed, so I fixed this. And, yes, there are two 'answer' times involved in this scenario, and I would agree with you, that the first answer time is the time that should appear in the CDR. (the second 'answer' time is the time that the bridge was begun). I made the necessary adjustments, recording the first answer time into the peer cdr, and then using that to override the bridge cdr's value. To get the 'unanswered' CDRs to appear, I purposely output them, using the dial cmd to mark them as DIALED (with a new flag), and outputting them if they bear that flag, and you are in the right mode. I also corrected one small mention of the Zap device to equally consider the dahdi device. I heavily tested 10-sec-wait macros in dial, and without the macro call; I tested hangups while the macro was running vs. letting the macro complete and the bridge form. Looks OK. Removed all the instrumentation and debug. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135822 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Steve Murphy	7a26f22be2	Merged revisions 134922 via svnmerge from ... 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134923 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Kevin P. Fleming	261a4972f6	Merged revisions 134086 via svnmerge from ... 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134087 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Brett Bryant	bd279373b2	Merged revisions 131916 via svnmerge from ... 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131917 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Brett Bryant	384d11190e	Merged revisions 131717 via svnmerge from ... 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131718 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Steve Murphy	e45d4f3bf1	Merged revisions 130145 via svnmerge from ... 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130946 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Steve Murphy	b8002ee93e	Merged revisions 127793 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk ................ r127793 | murf | 2008-07-03 11:16:44 -0600 (Thu, 03 Jul 2008) | 38 lines Merged revisions 127663 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r127663 | murf | 2008-07-02 18:16:25 -0600 (Wed, 02 Jul 2008) | 30 lines The CDRfix4/5/6 omnibus cdr fixes. (closes issue #10927) Reported by: murf Tested by: murf, deeperror (closes issue #12907) Reported by: falves11 Tested by: murf, falves11 (closes issue #11849) Reported by: greyvoip As to 11849, I think these changes fix the core problems brought up in that bug, but perhaps not the more global problems created by the limitations of CDR's themselves not being oriented around transfers. Reopen if necc, but bug reports are not the best medium for enhancement discussions. We need to start a second-generation CDR standardization effort to cover transfers. (closes issue #11093) Reported by: rossbeer Tested by: greyvoip, murf ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@127830 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Steve Murphy	3a1b062a16	Merged revisions 123165 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk ........ r123165 | murf | 2008-06-16 14:43:46 -0600 (Mon, 16 Jun 2008) | 19 lines (closes issue #12689) Reported by: ys Many thanks to ys for doing the research on this problem. I didn't think it would be best to unlock the contexts and then relock them after the remove_extension2() call, so I added an extra arg to remove_extension2() and set it appropriately in each call. There were not that many. I considered forcing the code to lock the contexts before the call to remove_extension2(), but that would require a slightly greater degree of changes, especially since the find_context_locked is local to pbx.c I did a simple sanity test to make sure the code doesn't mess things up in general. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@123173 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Jeff Peeler	c902b29042	Merged revisions 122433 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk ........ r122433 | jpeeler | 2008-06-12 18:08:37 -0500 (Thu, 12 Jun 2008) | 4 lines (closes issue 0012193) Reported by: davidw Patch by: Corydon76, modified by me to work properly with ParkAndAnnounce app ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@122467 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Mark Michelson	a3a59c0f89	Merged revisions 114064 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk ................ r114064 | mmichelson | 2008-04-11 10:49:35 -0500 (Fri, 11 Apr 2008) | 19 lines Merged revisions 114063 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114063 | mmichelson | 2008-04-11 10:44:28 -0500 (Fri, 11 Apr 2008) | 11 lines Fix a race condition that may happen between a sip hangup and a "core show channel" command. This patch adds locking to prevent the resulting crash. (closes issue #12155) Reported by: tsearle Patches: show_channels_crash2.patch uploaded by tsearle (license 373) Tested by: tsearle ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114065 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Russell Bryant	4af367c3a9	Merged revisions 109447 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk ........ r109447 | twilson | 2008-03-18 10:43:34 -0500 (Tue, 18 Mar 2008) | 3 lines Go through and fix a bunch of places where character strings were being interpreted as format strings. Most of these changes are solely to make compiling with -Wsecurity and -Wformat=2 happy, and were not actual problems, per se. I also added format attributes to any printf wrapper functions I found that didn't have them. -Wsecurity and -Wmissing-format-attribute added to --enable-dev-mode. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109459 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Russell Bryant	68ebba346c	Merged revisions 107465 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk ........ r107465 | file | 2008-03-11 10:05:17 -0500 (Tue, 11 Mar 2008) | 4 lines Clarify comment about masquerading and playback of the parking slot. (closes issue #12180) Reported by: davidw ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108355 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Joshua Colp	a241dd0b5d	Merged revisions 107659 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk ................ r107659 | file | 2008-03-11 16:23:28 -0300 (Tue, 11 Mar 2008) | 12 lines Merged revisions 107646 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r107646 | file | 2008-03-11 16:20:01 -0300 (Tue, 11 Mar 2008) | 4 lines Make sure the visible indication is on the right channel so when the masquerade happens the proper indication is enacted. (closes issue #11707) Reported by: iam ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107666 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Russell Bryant	9c09333526	Merged revisions 105840 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk ........ r105840 | tilghman | 2008-03-04 17:04:29 -0600 (Tue, 04 Mar 2008) | 2 lines Whitespace changes only ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106306 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Terry Wilson	7d1891d5c3	Asterisk, when parking can drop rights a caller when a parking timeout occurs. Also, when doing built-in attended transfers, sometimes incorrectly passes rights from the transferrer to the transferee. This patch tries to fixes the parking issue and lays some groundwork for later fixing the transfer issue. ... (closes issue #11520) Reported by: pliew Tested by: otherwiseguy git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105477 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Jason Parker	5badb3c48a	Merged revisions 104598 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r104598 | qwell | 2008-02-27 11:26:55 -0600 (Wed, 27 Feb 2008) | 8 lines Inherit language from the transfering channel on a blind transfer. (closes issue #11682) Reported by: caio1982 Patches: local_atxfer_lang3-1.4.diff uploaded by caio1982 (license 22) Tested by: caio1982, victoryure ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104617 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Mark Michelson	9a9a4e9701	Remove more hardcoded pipe symbols and replace with commas. ... (closes issue #12072) Reported by: SimonSharman Patches: features.patch uploaded by SimonSharman (license 410) Tested by: SimonSharman git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104127 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jason Parker	1663494073	Merged revisions 102858 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r102858 | qwell | 2008-02-07 13:53:55 -0600 (Thu, 07 Feb 2008) | 7 lines Specify which digit string was matched in debug message. (closes issue #11949) Reported by: dimas Patches: v1-feature-debug.patch uploaded by dimas (license 88) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@102859 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Russell Bryant	bcf72e1adb	Merge rev 100626 from Asterisk 1.4. The svnmerge of this commit was a NoOp, since ... res_features doesn't exist in trunk. Thanks to qwell for pointing it out! git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100631 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Joshua Colp	65e684653d	Minor cosmetic change... ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100245 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jason Parker	32989872dd	Move chan_local dependency into places (only one) that previously depended on res_features, and used local channels ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100121 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jason Parker	3bd33214b9	Move code from res_features into (new file) main/features.c ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100039 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago