aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2008-08-24Merged revisions 139707 via svnmerge from tilghman1-1/+17
https://origsvn.digium.com/svn/asterisk/trunk ........ r139707 | tilghman | 2008-08-24 11:26:48 -0500 (Sun, 24 Aug 2008) | 2 lines Memory leak ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139708 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-24Blocked revisions 139704 via svnmergetilghman0-0/+0
........ r139704 | tilghman | 2008-08-24 11:23:15 -0500 (Sun, 24 Aug 2008) | 2 lines Eliminate open coding of ast_str ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139705 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-22Merged revisions 139662 via svnmerge from murf1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r139662 | murf | 2008-08-22 16:32:35 -0600 (Fri, 22 Aug 2008) | 14 lines Merged revisions 139635 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r139635 | murf | 2008-08-22 16:24:02 -0600 (Fri, 22 Aug 2008) | 6 lines I found some problems with the code I committed earlier, when I merged them into trunk, so I'm coming back to clean up. And, in the process, I found an error in the code I added to trunk and 1.6.x, that I'll fix using this patch also. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139671 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-22Merged revisions 139627 via svnmerge from murf3-1/+48
https://origsvn.digium.com/svn/asterisk/trunk ................ r139627 | murf | 2008-08-22 16:03:13 -0600 (Fri, 22 Aug 2008) | 59 lines Merged revisions 139347 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r139347 | murf | 2008-08-21 17:03:50 -0600 (Thu, 21 Aug 2008) | 47 lines (closes issue #13251) Reported by: sergee Tested by: murf THis is a bold move for a static release fix, but I wouldn't have made it if I didn't feel confident (at least a *bit* confident) that it wouldn't mess everyone up. The reasoning goes something like this: 1. We simply cannot do anything with CDR's at the current point (in pbx.c, after the __ast_pbx_run loop). It's way too late to have any affect on the CDRs. The CDR is already posted and gone, and the remnants have been cleared. 2. I was very much afraid that moving the running of the 'h' extension down into the bridge code (where it would be now practical to do it), would result in a lot more calls to the 'h' exten, so I implemented it as another exten under another name, but found, to my pleasant surprise, that there was a 1:1 correspondence to the running of the 'h' exten in the pbx_run loop, and the new spot at the end of the bridge. So, I ifdef'd out the current 'h' loop, and moved it into the bridge code. The only difference I can see is the stuff about the AST_PBX_KEEPALIVE, and hopefully, if this is still an important decision point, I can replicate it if there are complaints. To be perfectly honest, the KEEPALIVE situation is not totally clear to me, and how it relates to a post-bridge situation is less clear. I suspect the users will point out everything in total clarity if this steps on anyone's toes! 3. I temporarily swap the bridge_cdr into the channel before running the 'h' exten, which makes it possible for users to edit the cdr before it goes out the door. And, of course, with the endbeforehexten config var set, the users can also get at the billsec/duration vals. After the h exten finishes, the cdr is swapped back and processing continues as normal. Please, all who deal with CDR's, please test this version of Asterisk, and file bug reports as appropriate! ........ I also made a little fix to the app_dial's 'e' option, that is related to my updates. ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139628 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-22Blocked revisions 139563 via svnmergemmichelson0-0/+0
........ r139563 | mmichelson | 2008-08-22 15:20:58 -0500 (Fri, 22 Aug 2008) | 15 lines The -1 return value from incomplete or improper headers for the SipNotify manager command was causing the current manager session to become disconnected. Change the return value to 0 for these cases. Also change a test for a NULL pointer to be ast_strlen_zero instead. (closes issue #13351) Reported by: Laureano Patches: sipnotify_action_fix.patch uploaded by Laureano (license 265) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139564 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-22Blocked revisions 139558 via svnmergemmichelson0-0/+0
........ r139558 | mmichelson | 2008-08-22 15:02:35 -0500 (Fri, 22 Aug 2008) | 9 lines Add missing unique id to ParkedCallGiveUp and ParkedCallTimeOut manager events (closes issue #13358) Reported by: srt Patches: 13358_parking_events.diff uploaded by srt (license 378) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139559 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-22Merged revisions 139554 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r139554 | mmichelson | 2008-08-22 14:45:41 -0500 (Fri, 22 Aug 2008) | 16 lines Merged revisions 139553 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r139553 | mmichelson | 2008-08-22 14:45:19 -0500 (Fri, 22 Aug 2008) | 8 lines Fix compilation when DEBUG_THREAD_LOCALS is selected (closes issue #13298) Reported by: snuffy Patches: bug13298_20080822.diff uploaded by snuffy (license 35) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139555 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-22Blocked revisions 139525 via svnmergemmichelson0-0/+0
................ r139525 | mmichelson | 2008-08-22 14:24:26 -0500 (Fri, 22 Aug 2008) | 15 lines Blocked revisions 139521 via svnmerge ........ r139521 | mmichelson | 2008-08-22 14:23:02 -0500 (Fri, 22 Aug 2008) | 8 lines Remove show_frame_stats_deprecated since it is not used anywhere and causes build errors if building under dev-mode with TRACE_FRAMES selected in menuselect. (closes issue #13362) Reported by: snuffy ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139528 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-22Merged revisions 139469 via svnmerge from mmichelson1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r139469 | mmichelson | 2008-08-22 12:25:12 -0500 (Fri, 22 Aug 2008) | 11 lines Merged revisions 139466 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r139466 | mmichelson | 2008-08-22 12:24:47 -0500 (Fri, 22 Aug 2008) | 3 lines Fix the build. Thanks, mvanbaak! ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139471 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-22Merged revisions 139457 via svnmerge from mmichelson1-1/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r139457 | mmichelson | 2008-08-22 11:58:21 -0500 (Fri, 22 Aug 2008) | 15 lines Merged revisions 139456 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r139456 | mmichelson | 2008-08-22 11:57:38 -0500 (Fri, 22 Aug 2008) | 7 lines Prevent a deadlock in chan_iax2 resulting from incorrect locking order between iax2_pvt and ast_channel structures. AST-13 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139458 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-21Merged revisions 139391 via svnmerge from jpeeler1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r139391 | jpeeler | 2008-08-21 18:41:50 -0500 (Thu, 21 Aug 2008) | 11 lines Merged revisions 139387 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r139387 | jpeeler | 2008-08-21 18:39:31 -0500 (Thu, 21 Aug 2008) | 3 lines Fixes loop that could possibly never exit in the event of a channel never being able to be opened or specify after a restart. (closes issue #11017) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139400 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-21Merged revisions 139281 via svnmerge from phsultan1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r139281 | phsultan | 2008-08-21 11:55:31 +0200 (Thu, 21 Aug 2008) | 5 lines Fix two memory leaks in chan_gtalk, thanks Eliel! (closes issue #13310) Reported by: eliel Patches: chan_gtalk.c.patch uploaded by eliel (license 64) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139282 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-20Merged revisions 139215 via svnmerge from russell1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r139215 | russell | 2008-08-20 17:16:36 -0500 (Wed, 20 Aug 2008) | 19 lines Merged revisions 139213 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r139213 | russell | 2008-08-20 17:14:35 -0500 (Wed, 20 Aug 2008) | 11 lines Fix a crash in the ChanSpy application. The issue here is that if you call ChanSpy and specify a spy group, and sit in the application long enough looping through the channel list, you will eventually run out of stack space and the application with exit with a seg fault. The backtrace was always inside of a harmless snprintf() call, so it was tricky to track down. However, it turned out that the call to snprintf() was just the biggest stack consumer in this code path, so it would always be the first one to hit the boundary. (closes issue #13338) Reported by: ruddy ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139216 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-20Blocked revisions 139210 via svnmergeqwell0-0/+0
........ r139210 | qwell | 2008-08-20 17:06:40 -0500 (Wed, 20 Aug 2008) | 7 lines Fix output of sipshowpeer manager response. (closes issue #13346) Reported by: srt Patches: 13346_malformed_sip_show_peer_response.diff uploaded by srt (license 378) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139211 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-20Fix bug where the samples were not accurate when in G723 mode, which wouldsruffell1-5/+6
cause the timestamp field of the RTP header to be invalid. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139155 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-20Merged revisions 139083 via svnmerge from murf1-4/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r139083 | murf | 2008-08-20 11:25:07 -0600 (Wed, 20 Aug 2008) | 20 lines Merged revisions 139074 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r139074 | murf | 2008-08-20 11:14:55 -0600 (Wed, 20 Aug 2008) | 12 lines (closes issue #13263) Reported by: brainy Tested by: murf The specialized reset routine is tromping on the flags field of the CDR. I made a change to not reset the DISABLED bit. This should get rid of this problem. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139104 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-20Blocked revisions 139020 via svnmergemvanbaak0-0/+0
........ r139020 | mvanbaak | 2008-08-20 18:16:53 +0200 (Wed, 20 Aug 2008) | 4 lines fix unholding phones after hangup on older cisco phones. Patch by wedhorn. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139021 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-20Merged revisions 139016 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r139016 | mmichelson | 2008-08-20 10:38:47 -0500 (Wed, 20 Aug 2008) | 14 lines Merged revisions 139015 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r139015 | mmichelson | 2008-08-20 10:37:56 -0500 (Wed, 20 Aug 2008) | 6 lines sip_read should properly handle a NULL return from sip_rtp_read. (closes issue #13257) Reported by: travishein ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139017 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-19Blocked revisions 138943 via svnmergemmichelson0-0/+0
................ r138943 | mmichelson | 2008-08-19 18:19:40 -0500 (Tue, 19 Aug 2008) | 19 lines Merged revisions 138942 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r138942 | mmichelson | 2008-08-19 18:17:17 -0500 (Tue, 19 Aug 2008) | 11 lines Reset agent_pvt variables back to the values in agents.conf (from what the corresponding channel variables were set to) when the agent logs out. (closes issue #13098) Reported by: davidw Patches: 20080731__issue13098_agent_ackcall_not_reset.diff uploaded by bbryant (license 36) Tested by: davidw ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138944 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-19Manually add revision 138887 from trunk to the 1.6.0mmichelson1-0/+2
branch. I had misunderstood the policy for when to merge to 1.6.0 since it moved to rc status. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138890 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-19Blocked revisions 138887 via svnmergemmichelson0-0/+0
................ r138887 | mmichelson | 2008-08-19 13:52:04 -0500 (Tue, 19 Aug 2008) | 31 lines Merged revisions 138886 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r138886 | mmichelson | 2008-08-19 13:50:53 -0500 (Tue, 19 Aug 2008) | 23 lines Add a lock and unlock prior to the destruction of the chanspy_ds lock to ensure that no other threads still have it locked. While this should not happen under normal circumstances, it appears that if the spyer and spyee hang up at nearly the same time, the following may occur. 1. ast_channel_free is called on the spyee's channel. 2. The chanspy datastore is removed from the spyee's channel in ast_channel_free. 3. In the spyer's thread, the spyer attempts to remove and destroy the datastore from the spyee channel, but the datastore has already been removed in step 2, so the spyer continues in the code. 4. The spyee's thread continues and calls the datastore's destroy callback, chanspy_ds_destroy. This involves locking the chanspy_ds. 5. Now the spyer attempts to destroy the chanspy_ds lock. The problem is that in step 4, the spyee has locked this lock, meaning that the spyer is attempting to destroy a lock which is currently locked by another thread. The backtrace provided in issue #12969 supports the idea that this is possible (and has even occurred). This commit does not close the issue, but should help in preventing one type of crash associated with the use of app_chanspy. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138889 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-19Blocked revisions 138851 via svnmergemvanbaak0-0/+0
........ r138851 | mvanbaak | 2008-08-19 18:56:50 +0200 (Tue, 19 Aug 2008) | 8 lines chan_skinny now respects callwaiting=no (closes issue #12691) Reported by: sbisker Patches: callwaitingv1.diff uploaded by wedhorn (license 30) Tested by: wedhorn on old skinny phones, mvanbaak on 7960 and 7905 with latest firmware ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138852 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-19Merged revisions 138845 via svnmerge from murf5-251/+258
https://origsvn.digium.com/svn/asterisk/trunk ........ r138845 | murf | 2008-08-19 10:31:24 -0600 (Tue, 19 Aug 2008) | 1 line Oops. put a decl in a generated file. My bad, but fixed now. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138847 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-19Merged revisions 138815 via svnmerge from murf4-289/+328
https://origsvn.digium.com/svn/asterisk/trunk ........ r138815 | murf | 2008-08-19 09:59:12 -0600 (Tue, 19 Aug 2008) | 19 lines These changes are in regards to bug 13249, where users are being surprised by the changes made to the Set app in trunk/1.6.x, as they come from the 1.4 world. They are only bitten if they write their AEL dialplan in the 1.4 world, and then carry it over to a trunk/1.6.x installation where a "make samples" was executed, or where they hand-edited the asterisk.conf file and added the [compat] category with app_set = 1.6 (or higher). (this commit does not totally solve 13249, at least not yet) The change involves issueing a single warning while the AEL file is loading, if: 1. app_set is present in the config file, and set to 1.6 or higher. 2. there are double quotes in an assignment statement (eg x = "hi there";) 3. the warning was not already issued. The standalone app, aelparse, does not (yet) issue this warning. I'd have to have it read in the asterisk.conf file, and that's a bit of hassle. I'll add it if users request it, tho. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138846 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-19Merged revisions 138778-138780 via svnmerge from seanbright1-9/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r138778 | seanbright | 2008-08-18 20:08:27 -0400 (Mon, 18 Aug 2008) | 1 line While we're at it, make this machine parseable too. ........ r138779 | seanbright | 2008-08-18 20:09:38 -0400 (Mon, 18 Aug 2008) | 1 line And remove code we don't need anymore. ........ r138780 | seanbright | 2008-08-18 20:10:56 -0400 (Mon, 18 Aug 2008) | 1 line Let it compile now, too (woops) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138781 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-18Merged revisions 138775 via svnmerge from seanbright1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r138775 | seanbright | 2008-08-18 19:42:36 -0400 (Mon, 18 Aug 2008) | 3 lines Change event header to RegistrationTime to be more consistent (and avoid breaking existing frameworks). Pointed out by Laureano on #asterisk-dev. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138776 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-18Blocked revisions 138694 via svnmergemmichelson0-0/+0
........ r138694 | mmichelson | 2008-08-18 15:23:11 -0500 (Mon, 18 Aug 2008) | 10 lines Change the queue timeout priority logic into less ugly and confusing code pieces. Clarify the logic within queues.conf.sample. (closes issue #12690) Reported by: atis Patches: queue_timeoutpriority.patch uploaded by atis (license 242) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138695 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-18Merged revisions 138687 via svnmerge from mmichelson1-9/+9
https://origsvn.digium.com/svn/asterisk/trunk ................ r138687 | mmichelson | 2008-08-18 15:04:10 -0500 (Mon, 18 Aug 2008) | 18 lines Merged revisions 138685 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r138685 | mmichelson | 2008-08-18 15:01:14 -0500 (Mon, 18 Aug 2008) | 10 lines Change the inequalities used in app_queue with regards to timeouts from being strict to non-strict for more accuracy. (closes issue #13239) Reported by: atis Patches: app_queue_timeouts_v2.patch uploaded by atis (license 242) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138688 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-18Merged revisions 138631 via svnmerge from qwell1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r138631 | qwell | 2008-08-18 10:54:07 -0500 (Mon, 18 Aug 2008) | 1 line Remove option that isn't valid here. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138632 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-18Merged revisions 138518 via svnmerge from jpeeler1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r138518 | jpeeler | 2008-08-17 21:13:04 -0500 (Sun, 17 Aug 2008) | 1 line add missing define for SS7 in dahdi_restart ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138519 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-17Merged revisions 138482 via svnmerge from seanbright1-4/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r138482 | seanbright | 2008-08-17 10:12:11 -0400 (Sun, 17 Aug 2008) | 6 lines Move Uniqueid to the end of the event for those that rely on the position of the name/value pairs, pointed out by snuffy-home on #asterisk-commits. For those of you who rely on the position of name/value pairs in manager events... stop... that is why associative arrays were invented. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138483 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-17Merged revisions 138479 via svnmerge from seanbright1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r138479 | seanbright | 2008-08-17 09:51:08 -0400 (Sun, 17 Aug 2008) | 7 lines Add Uniqueid header to ParkedCall manager event. (closes issue #13323) Reported by: srt Patches: 13323_unique_id_for_parkedcalls_event.diff uploaded by srt (license 378) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138480 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-17Merged revisions 138476 via svnmerge from seanbright1-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r138476 | seanbright | 2008-08-17 09:40:36 -0400 (Sun, 17 Aug 2008) | 7 lines Add missing colons to RTCPReceived and RTCPSent manager events. (closes issue #13319) Reported by: srt Patches: 13319_rtcp_manager_event_headers.diff uploaded by srt (license 378) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138477 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-17Merged revisions 138473 via svnmerge from seanbright1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r138473 | seanbright | 2008-08-17 09:31:54 -0400 (Sun, 17 Aug 2008) | 7 lines Fix the output of the JitterBufStats manager event. (closes issue #13324) Reported by: srt Patches: 13324_missing_nl_in_jitterbufstats_event_2.diff uploaded by srt (license 378) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138474 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-16Merged revisions 138442 via svnmerge from seanbright1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r138442 | seanbright | 2008-08-16 12:40:43 -0400 (Sat, 16 Aug 2008) | 4 lines Since it's introduction in revision 3497, cdr_tds has *never* read the port configuration option from cdr_tds.conf. So go ahead and remove it from the sample config. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138443 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-16Merged revisions 138412 via svnmerge from tilghman1-2/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r138412 | tilghman | 2008-08-16 08:07:08 -0500 (Sat, 16 Aug 2008) | 2 lines Fix compilation warnings (found with dev-mode) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138413 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-16Blocked revisions 138409 via svnmergetilghman0-0/+0
........ r138409 | tilghman | 2008-08-16 07:52:06 -0500 (Sat, 16 Aug 2008) | 3 lines Also make sure hinting won't crash on reload. (Closes issue #13312) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138410 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-16Merged revisions 138361 via svnmerge from jpeeler1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r138361 | jpeeler | 2008-08-15 20:13:26 -0500 (Fri, 15 Aug 2008) | 9 lines Merged revisions 138360 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r138360 | jpeeler | 2008-08-15 20:12:18 -0500 (Fri, 15 Aug 2008) | 1 line fixes use count to properly decrement if an active dahdi channel is destroyed allowing module to be unloaded ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138362 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-16Merged revisions 138311 via svnmerge from jpeeler1-148/+355
https://origsvn.digium.com/svn/asterisk/trunk ................ r138311 | jpeeler | 2008-08-15 18:46:09 -0500 (Fri, 15 Aug 2008) | 20 lines Merged revisions 138119,138151,138238 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r138119 | jpeeler | 2008-08-15 14:21:51 -0500 (Fri, 15 Aug 2008) | 4 lines Fixes the dahdi restart functionality. Dahdi restart allows one to restart all DAHDI channels, even if they are currently in use. This is different from unloading and then loading the module since unloading requires the use count to be zero. Reloading the module is different in that the signalling is not changed from what it was originally configured. Also, this fixes not closing all the file descriptors for D-channels upon module unload (which would prevent loading the module afterwards). (closes issue #11017) ........ r138151 | jpeeler | 2008-08-15 14:41:29 -0500 (Fri, 15 Aug 2008) | 1 line declared static mutexes using AST_MUTEX_DEFINE_STATIC macro ........ r138238 | jpeeler | 2008-08-15 16:28:26 -0500 (Fri, 15 Aug 2008) | 1 line initialize condition variable ss_thread_complete using ast_cond_init ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138333 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-15Merged revisions 138260 via svnmerge from tilghman2-41/+51
https://origsvn.digium.com/svn/asterisk/trunk ................ r138260 | tilghman | 2008-08-15 17:54:57 -0500 (Fri, 15 Aug 2008) | 16 lines Merged revisions 138258 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r138258 | tilghman | 2008-08-15 17:33:42 -0500 (Fri, 15 Aug 2008) | 8 lines More fixes for realtime peers. (closes issue #12921) Reported by: Nuitari Patches: 20080804__bug12921.diff.txt uploaded by Corydon76 (license 14) 20080815__bug12921.diff.txt uploaded by Corydon76 (license 14) Tested by: Corydon76 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138262 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-15Merged revisions 138206 via svnmerge from tilghman2-12/+11
https://origsvn.digium.com/svn/asterisk/trunk ........ r138206 | tilghman | 2008-08-15 15:35:24 -0500 (Fri, 15 Aug 2008) | 4 lines Remove deprecated syntax from sample config file (closes issue #13314) Reported by: kue ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138207 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-15rename all zfd instances in chan_dahdi to dfd to match 1.4 (left over from ↵jpeeler1-293/+293
DAHDI transition) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138157 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-15Blocked revisions 138155 via svnmergejpeeler0-0/+0
........ r138155 | jpeeler | 2008-08-15 15:12:19 -0500 (Fri, 15 Aug 2008) | 1 line rename all zfd instances in chan_dahdi to dfd to match 1.4 (left over from DAHDI transition) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138156 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-15Blocked revisions 138148 via svnmergetilghman0-0/+0
........ r138148 | tilghman | 2008-08-15 14:36:11 -0500 (Fri, 15 Aug 2008) | 2 lines Change free to ast_free_ptr, too ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138149 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-15Blocked revisions 138124 via svnmergetilghman0-0/+0
........ r138124 | tilghman | 2008-08-15 14:22:48 -0500 (Fri, 15 Aug 2008) | 4 lines e->data can be NULL, so use the safe version of ast_strdup() (closes issue #13312) Reported by: pj ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138136 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-15Blocked revisions 138086 via svnmergetilghman0-0/+0
........ r138086 | tilghman | 2008-08-15 13:02:15 -0500 (Fri, 15 Aug 2008) | 2 lines regseconds is actually stored as the epoch time, not registration length ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138087 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-15Merged revisions 138028 via svnmerge from russell1-9/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r138028 | russell | 2008-08-15 10:09:46 -0500 (Fri, 15 Aug 2008) | 17 lines Merged revisions 138027 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r138027 | russell | 2008-08-15 10:07:16 -0500 (Fri, 15 Aug 2008) | 9 lines Ensure that when a hangup occurs in autoservice, that a hangup frame gets properly deferred to be read from the channel owner when it gets taken out of autoservice. (closes issue #12874) Reported by: dimas Patches: v1-12874.patch uploaded by dimas (license 88) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138029 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-15Merged revisions 138024 via svnmerge from tilghman1-4/+15
https://origsvn.digium.com/svn/asterisk/trunk ................ r138024 | tilghman | 2008-08-15 10:03:32 -0500 (Fri, 15 Aug 2008) | 16 lines Merged revisions 138023 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r138023 | tilghman | 2008-08-15 09:51:12 -0500 (Fri, 15 Aug 2008) | 8 lines Additional check for more string specifiers than arguments. (closes issue #13299) Reported by: adomjan Patches: 20080813__bug13299.diff.txt uploaded by Corydon76 (license 14) func_strings.c-sprintf.patch uploaded by adomjan (license 487) Tested by: adomjan ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138025 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-14Merged revisions 137987 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r137987 | russell | 2008-08-14 17:43:15 -0500 (Thu, 14 Aug 2008) | 2 lines Fix a bashism that causes an error when trying to build the pdf on ubuntu ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@137988 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-14Merged revisions 137933 via svnmerge from seanbright1-9/+9
https://origsvn.digium.com/svn/asterisk/trunk ........ r137933 | seanbright | 2008-08-14 14:47:28 -0400 (Thu, 14 Aug 2008) | 8 lines Fix memory leak in cdr_sqlite3_custom. (closes issue #13304) Reported by: eliel Patches: sqlite.patch uploaded by eliel (license 64) (Slightly modified by me) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@137934 f38db490-d61c-443f-a65b-d21fe96a405b