summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2007-08-16Make conf2ael build on 64-bit systems.Joshua Colp
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79687 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16Merged revisions 79665 via svnmerge from Philippe Sultan
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79665 | phsultan | 2007-08-16 11:37:10 +0200 (Thu, 16 Aug 2007) | 21 lines A fix for two critical problems detected while working with Daniel McKeehan in issue #10184. Upon priority change, the resource list is not NULL terminated when moving an item to the end of the list. This makes Asterisk endlessy loop whenever it needs to read the list. Jids with different resource and priority values, like in Gmail's and GoogleTalk's jabber clients put that problem in evidence. Upon reception of a 'from' attribute with an empty resource string, Asterisk crashes when trying to access the found->cap pointer if the resource list for the given buddy is not empty. This situation is perfectly valid and must be handled. The Gizmoproject's jabber client put that problem in evidence. Also added a few comments in the code as well as a handle for the capabilities from Gmail's jabber client, which are stored in a caps:c tag rather than the usual c tag. Closes issue #10184. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16Merged revisions 79642 via svnmerge from Christian Richter
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79642 | crichter | 2007-08-16 10:21:21 +0200 (Do, 16 Aug 2007) | 1 line 0x80 + protocol is wrong for USERUSER when we want to send IA5 Chars. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79660 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16Doc changeOlle Johansson
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79638 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15Modify the names of functions/variables in res_musiconhold to be useful.Jason Parker
Closes issue #10464, patch by caio1982 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79634 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15Missing from murf's last trunk commit, which was why trunk won't compileTilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15Remove properties that appeared from Steve's last branch merge. Automerge ↵Joshua Colp
has already run so everyone's branches based off of trunk are probably toast by now. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79611 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15This commit closes bug 7605, and half-closes 7638. The AEL code has been ↵Steve Murphy
redistributed/repartitioned to allow code re-use both inside and outside of Asterisk. This commit introduces the utils/conf2ael program, and an external config-file reader, for both normal config files, and for extensions.conf (context, exten, prio); It provides an API for programs outside of asterisk to use to play with the dialplan and config files. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15Merged revisions 79553 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79553 | file | 2007-08-15 11:40:23 -0300 (Wed, 15 Aug 2007) | 6 lines (closes issue #10440) Reported by: irroot (closes issue #10454) Reported by: flo_turc Increase maximum timestamp skew to 120. 20 was apparently far too low. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79558 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15Merged revisions 79527 via svnmerge from Mark Michelson
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79527 | mmichelson | 2007-08-15 09:26:40 -0500 (Wed, 15 Aug 2007) | 5 lines Fixed an error in the Russian language voicemail intro. (issue #10458, reported and patched by Oleh) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15Merged revisions 79523 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79523 | file | 2007-08-15 11:18:44 -0300 (Wed, 15 Aug 2007) | 6 lines (closes issue #10456) Reported by: irroot Patches: sip_timeout.patch uploaded by irroot (license 52) Change hardcoded timer value to defined value. I'm doing this in 1.4 as well so if it needs to be changed in the future this place would not have been forgotten. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79524 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15Merged revisions 78936 via svnmerge from Christian Richter
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r78936 | crichter | 2007-08-10 15:24:03 +0200 (Fr, 10 Aug 2007) | 1 line fixed a bug with the useruser information element. We send them now also in the disconnect message. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79507 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-14Merged revisions 79470 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79470 | russell | 2007-08-14 13:49:10 -0500 (Tue, 14 Aug 2007) | 2 lines Fix another spot where an iax2_peer would be leaked if realtime was in use. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-14Merged revisions 79436 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79436 | russell | 2007-08-14 12:31:39 -0500 (Tue, 14 Aug 2007) | 3 lines Fix some memory leaks throughout chan_iax2 related to the use of realtime. I found these while working on iax2_peer object reference tracking. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-14Merged revisions 79397 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79397 | file | 2007-08-14 12:27:13 -0300 (Tue, 14 Aug 2007) | 4 lines (closes issue #10415) Reported by: atis Revert fix for #10327 as it causes more issues then it solves. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79403 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-14Merged revisions 79255 via svnmerge from Steve Murphy
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79255 | murf | 2007-08-13 11:49:54 -0600 (Mon, 13 Aug 2007) | 1 line This patch fixes bug 10411. I added a new regression test, some regression test cleanups ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79392 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-14(closes issue #10427)Joshua Colp
Reported by: pj Two of the three places ast_waitfor_nandfds could branch off to did not clear outfd and exception. If the calling function did not clear these there was a chance they could get a false positive on testing to see whether they were set. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-14Don't ask me why, but waitfordigit will immediately return a 1 on my system, ↵Steve Murphy
unless the outfd is initialized to -1 before calling the nandfds func git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-13Merged revisions 79334 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79334 | file | 2007-08-13 18:57:20 -0300 (Mon, 13 Aug 2007) | 2 lines Instead of accepting a single DTMF character accept a full string. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79335 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-13Only use the sanitysql if it's not zero-lenTilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79333 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-13Merged revisions 79301 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79301 | russell | 2007-08-13 15:37:50 -0500 (Mon, 13 Aug 2007) | 3 lines Don't call find_peer in registry_authrequest with the pvt lock held to avoid a deadlock. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-13Merged revisions 79276 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79276 | russell | 2007-08-13 15:18:30 -0500 (Mon, 13 Aug 2007) | 4 lines Release the pvt lock before calling find_peer in register_verify to avoid a deadlock. Also, remove some unnecessary locking in auth_fail that was only done recursively. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79277 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-13Merged revisions 79274 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79274 | russell | 2007-08-13 15:02:57 -0500 (Mon, 13 Aug 2007) | 3 lines Don't call find_peer within update_registry with a pvt lock held. This can cause a deadlock as the code will eventually call find_callno. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79275 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-13Merged revisions 79272 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79272 | russell | 2007-08-13 14:27:39 -0500 (Mon, 13 Aug 2007) | 9 lines I am fighting deadlocks in chan_iax2. I have tracked them down to a single core issue. You can not call find_callno() while holding a pvt lock as this function has to lock another (every) other pvt lock. Doing so can lead to a classic deadlock. So, I am tracking down all of the code paths where this can happen and fixing them. The fix I committed earlier today was along the same theme. This patch fixes some code down the path of authenticate_reply. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-13Allow non-realtime queues to have realtime membersMark Michelson
(issue #10424, reported and patched by irroot) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79238 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-13Merged revisions 79214 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79214 | russell | 2007-08-13 10:28:13 -0500 (Mon, 13 Aug 2007) | 4 lines Fix a potential deadlock in socket_process. check_provisioning can eventually call find_callno. You can't hold a pvt lock while calling find_callno because it goes through and locks every single one looking for a match. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79222 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-13Merged revisions 79207 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79207 | file | 2007-08-13 11:51:09 -0300 (Mon, 13 Aug 2007) | 2 lines Add an API call to allow the engine to know that DTMF was received. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-13constify the return value of reason2strRussell Bryant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79176 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-13Merged revisions 79174 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79174 | file | 2007-08-13 11:18:04 -0300 (Mon, 13 Aug 2007) | 4 lines (closes issue #10437) Reported by: haklin Don't set the callerid name and number a second time on a newly created channel. ast_channel_alloc itself already sets it and setting it twice would cause a memory leak. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-11Merged revisions 79142 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79142 | tilghman | 2007-08-11 00:23:04 -0500 (Sat, 11 Aug 2007) | 2 lines Ensure the connection gets marked as used at allocation time (closes issue #10429, report and fix by mnicholson) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-10Use localized softkey labels.Jason Parker
Add some information about localization "codes". git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79109 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-10Merged revisions 79099 via svnmerge from Steve Murphy
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79099 | murf | 2007-08-10 14:53:43 -0600 (Fri, 10 Aug 2007) | 1 line From a user complaint on #asterisk, I have forced pbx_spool to explain what reason codes mean, when they are logged ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79100 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-10Store custom device states in astdb so that they will persist a restart. As aRussell Bryant
side benefit, this simplifies the code a bit, too. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-10Bring up to date with poll changes.Joshua Colp
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79074 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-10Merged revisions 79049 via svnmerge from Steve Murphy
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79049 | murf | 2007-08-10 12:25:51 -0600 (Fri, 10 Aug 2007) | 1 line Re bug behavior mentioned in #asterisk, made this tweak to code, to prevent hundreds of log messages from being generated ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79068 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-10oops. forgot to commit the prop change on .Steve Murphy
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-10Merged revisions 79044 via svnmerge from Steve Murphy
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79044 | murf | 2007-08-10 11:43:49 -0600 (Fri, 10 Aug 2007) | 1 line This will help debug; from a question asked on #asterisk ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79045 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-10Merge a set of device state improvements from team/russell/events.Russell Bryant
The way a device state change propagates is kind of silly, in my opinion. A device state provider calls a function that indicates that the state of a device has changed. Then, another thread goes back and calls a callback for the device state provider to find out what the new state is before it can go send it off to whoever cares. I have changed it so that you can include the state that the device has changed to in the first function call from the device state provider. This removes the need to have to call the callback, which locks up critical containers to go find out what the state changed to. This change set changes the "simple" device state providers to use the new method. This includes parking, meetme, and SLA. I have also mostly converted chan_agent in my branch, but still have some more things to think through before presenting the plan for converting channel drivers to ensure all of the right events get generated ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-10Merged revisions 78995 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r78995 | russell | 2007-08-10 10:20:09 -0500 (Fri, 10 Aug 2007) | 4 lines The last set of changes that I made to "core show locks" made it not able to track mutexes unless they were declared using AST_MUTEX_DEFINE_STATIC. Locks initialized with ast_mutex_init() were not tracked. It should work now. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79005 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-10Merged revisions 78955 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r78955 | file | 2007-08-10 11:15:53 -0300 (Fri, 10 Aug 2007) | 2 lines Don't bother having the core pass through or emulate begin DTMF frames when in an ast_waitstream. It only cares about the end of DTMF. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78956 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-10Merged revisions 78951 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r78951 | file | 2007-08-10 10:49:19 -0300 (Fri, 10 Aug 2007) | 4 lines (closes issue #10422) Reported by: bhowell Add note to sample configuration about module load order and how it can cause perfectly good queue members to be marked as invalid. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78952 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-09Merged revisions 78907 via svnmerge from Mark Michelson
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r78907 | mmichelson | 2007-08-09 18:47:00 -0500 (Thu, 09 Aug 2007) | 4 lines Improved a bit of logic regarding comma-separated mailboxes in has_voicemail. Also added some braces to some compound if statements since unbraced if statements scare me in general. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78908 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-09Merged revisions 78891 via svnmerge from Steve Murphy
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r78891 | murf | 2007-08-09 17:10:46 -0600 (Thu, 09 Aug 2007) | 1 line This fixes bug 10416; thanks to mvanbaak for the pretty output ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78906 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-09Blocked revisions 78860 via svnmergeMark Michelson
........ r78860 | mmichelson | 2007-08-09 17:03:48 -0500 (Thu, 09 Aug 2007) | 3 lines Removing some extra debug code I left in my last commit ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78862 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-09Merged revisions 78859 via svnmerge from Mark Michelson
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r78859 | mmichelson | 2007-08-09 16:51:17 -0500 (Thu, 09 Aug 2007) | 9 lines Quite a few changes regarding IMAP storage. 1. instead of using inboxcount as the core message counting function, we use messagecount instead. This makes it possible to count messages in folders besides just INBOX and Old. 2. inboxcount and hasvoicemail now use messagecount as their means of determining return values. 3. Added a copy_message function for IMAP storage. Unfortunately I don't have the means to test it, but it seems like a pretty straightforward function. 4. Removed a #ifndef IMAP_STORAGE and matching #endif from leave_voicemail for a couple of reasons. One, we want to support copying mail to multiple IMAP boxes, and two, IMAP was broken because a STORE macro had been moved into this section of code. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78861 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-09Don't use strncpy for moving a chunk of memory to another that is overlapping.Russell Bryant
This was found by running Asterisk under valgrind. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78829 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-09Blocked revisions 78826 via svnmergeMark Michelson
........ r78826 | mmichelson | 2007-08-09 14:52:43 -0500 (Thu, 09 Aug 2007) | 3 lines I broke canreinvite...Now I'm fixing it. I put some new code in the wrong place and so I've reverted the canreinvite section to how it was and put my new code where it should be. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78828 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-09When looking up a mailbox, use the default context if not specified as ↵Russell Bryant
something else git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78824 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-09Restore the ability to have multiple mailboxes listed for the mailbox optionRussell Bryant
in sip.conf. chan_sip now maintains separate internal MWI subscriptions for each one. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-09Merged revisions 78778 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r78778 | russell | 2007-08-09 12:58:31 -0500 (Thu, 09 Aug 2007) | 1 line add a comment to indicate that inboxcount for ODBC_STORAGE needs to be fixed to support multiple mailboxes ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78779 65c4cc65-6c06-0410-ace0-fbb531ad65f3