[asterisk-commits] murf: branch murf/bug_7638 r58921 - in
/team/murf/bug_7638: ./ apps/ build_to...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Mar 15 08:26:04 MST 2007
Author: murf
Date: Thu Mar 15 10:26:03 2007
New Revision: 58921
URL: http://svn.digium.com/view/asterisk?view=rev&rev=58921
Log:
Merged revisions 57519,57557,57590,57621,57651,57691,57708,57736,57769,57771-57772,57799,57827,57871,57873,57875,57915,57943,57979,57993,58024-58025,58054-58055,58101,58120,58122-58123,58149,58166,58208,58224,58241,58244,58286,58304,58321,58353,58355,58390,58437,58475,58480,58511,58541,58592,58605,58639,58670,58706,58742,58761,58780,58784,58822,58844,58846,58866,58871,58873,58881,58895,58898,58900-58901,58904,58907 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r57519 | file | 2007-03-02 11:05:29 -0700 (Fri, 02 Mar 2007) | 2 lines
Don't try to do recursive locking/unlocking when it isn't supported.
................
r57557 | russell | 2007-03-02 16:05:25 -0700 (Fri, 02 Mar 2007) | 11 lines
Merged revisions 57556 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r57556 | russell | 2007-03-02 17:03:01 -0600 (Fri, 02 Mar 2007) | 3 lines
Update the check that is used to determine whether zaptel transcoder support
is present. The interface has changed.
........
................
r57590 | russell | 2007-03-02 17:01:25 -0700 (Fri, 02 Mar 2007) | 5 lines
Add the missing configuration template to the sample config file.
Thanks to Lacy Moore on the asterisk-users list for pointing out that this
was missing!
................
r57621 | dhubbard | 2007-03-02 18:11:36 -0700 (Fri, 02 Mar 2007) | 9 lines
Merged revisions 57620 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r57620 | dhubbard | 2007-03-02 18:59:24 -0600 (Fri, 02 Mar 2007) | 1 line
submitted patch for Georgian language, issue 9010, submitted by Alexander Shaduri
........
................
r57651 | tilghman | 2007-03-02 23:46:24 -0700 (Fri, 02 Mar 2007) | 18 lines
Merged revisions 57649 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r57649 | tilghman | 2007-03-03 00:45:00 -0600 (Sat, 03 Mar 2007) | 10 lines
Merged revisions 57648 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r57648 | tilghman | 2007-03-03 00:36:55 -0600 (Sat, 03 Mar 2007) | 2 lines
Memory leak of a list, if call recording was abandoned
........
................
................
r57691 | tilghman | 2007-03-03 07:40:18 -0700 (Sat, 03 Mar 2007) | 3 lines
Expand datastores to add the notion of inheritance. This will be needed for
the conversion of IAX2 variables from the current custom method to ast_storage.
................
r57708 | murf | 2007-03-03 08:35:44 -0700 (Sat, 03 Mar 2007) | 1 line
updated the regression tests
................
r57736 | tilghman | 2007-03-03 09:43:36 -0700 (Sat, 03 Mar 2007) | 2 lines
Convert stack apps to use ast_storage channel structure
................
r57769 | file | 2007-03-04 20:24:18 -0700 (Sun, 04 Mar 2007) | 10 lines
Merged revisions 57768 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r57768 | file | 2007-03-04 22:22:17 -0500 (Sun, 04 Mar 2007) | 2 lines
Preserve marker bit when P2P bridging. (issue #9198 reported by edgreenberg)
........
................
r57771 | file | 2007-03-04 20:39:32 -0700 (Sun, 04 Mar 2007) | 10 lines
Merged revisions 57770 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r57770 | file | 2007-03-04 22:35:03 -0500 (Sun, 04 Mar 2007) | 2 lines
Don't reference a potentially NULL pointer. (issue #9199 reported by klolik)
........
................
r57772 | file | 2007-03-04 20:41:48 -0700 (Sun, 04 Mar 2007) | 2 lines
Remove no longer present CLI commands from sample extensions.conf. (issue #9193 reported by junky)
................
r57799 | file | 2007-03-04 21:21:28 -0700 (Sun, 04 Mar 2007) | 10 lines
Merged revisions 57798 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r57798 | file | 2007-03-04 23:19:53 -0500 (Sun, 04 Mar 2007) | 2 lines
Don't allow a NULL pointer to reach ast_frdup. (issue #9155 reported by cmaj)
........
................
r57827 | murf | 2007-03-05 08:30:37 -0700 (Mon, 05 Mar 2007) | 17 lines
Merged revisions 57826 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r57826 | murf | 2007-03-05 08:20:17 -0700 (Mon, 05 Mar 2007) | 9 lines
Merged revisions 57825 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r57825 | murf | 2007-03-05 07:53:57 -0700 (Mon, 05 Mar 2007) | 1 line
Fixed a typo introduced via 9156 (either the gotos or their doc strings are wrong)
........
................
................
r57871 | file | 2007-03-05 10:55:29 -0700 (Mon, 05 Mar 2007) | 18 lines
Merged revisions 57870 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r57870 | file | 2007-03-05 12:52:03 -0500 (Mon, 05 Mar 2007) | 10 lines
Merged revisions 57869 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r57869 | file | 2007-03-05 12:49:18 -0500 (Mon, 05 Mar 2007) | 2 lines
Make create_dirpath use our standard for return values. -1 is failure, 0 is success. (issue #9205 reported by ballares)
........
................
................
r57873 | file | 2007-03-05 11:45:28 -0700 (Mon, 05 Mar 2007) | 2 lines
I like it when app_meetme builds under dev mode, don't you?
................
r57875 | file | 2007-03-05 11:46:59 -0700 (Mon, 05 Mar 2007) | 10 lines
Merged revisions 57872 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r57872 | file | 2007-03-05 13:39:28 -0500 (Mon, 05 Mar 2007) | 2 lines
Don't create a listen channel and record the conference unless the option is turned on. (issue #9204 reported by francesco_r)
........
................
r57915 | file | 2007-03-05 12:20:45 -0700 (Mon, 05 Mar 2007) | 10 lines
Merged revisions 57914 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r57914 | file | 2007-03-05 14:19:07 -0500 (Mon, 05 Mar 2007) | 2 lines
Since chan_iax2 does not support reception of DTMF with duration ensure that it is set to 0 on the frame. (issue #8521 reported by gdhgdh)
........
................
r57943 | file | 2007-03-05 13:13:51 -0700 (Mon, 05 Mar 2007) | 2 lines
Add zap show version CLI command. This pulls the version/echo canceller in use directly using the ZT_GETVERSION ioctl. (issue #9094 reported by tootai)
................
r57979 | rizzo | 2007-03-06 01:36:28 -0700 (Tue, 06 Mar 2007) | 3 lines
remove duplicate const
................
r57993 | rizzo | 2007-03-06 01:51:45 -0700 (Tue, 06 Mar 2007) | 3 lines
move declaration to the beginning of a block
................
r58024 | russell | 2007-03-06 11:02:07 -0700 (Tue, 06 Mar 2007) | 8 lines
Blocked revisions 57591 via svnmerge
........
r57591 | russell | 2007-03-02 18:02:29 -0600 (Fri, 02 Mar 2007) | 1 line
add missing configuration template. Thanks to Lacy Moore on asterisk-users for pointing this out\!
........
................
r58025 | russell | 2007-03-06 11:02:35 -0700 (Tue, 06 Mar 2007) | 11 lines
Merged revisions 58023 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58023 | russell | 2007-03-06 12:01:20 -0600 (Tue, 06 Mar 2007) | 3 lines
Return an error of transmit_response is called without a session.
(issue #9002)
........
................
r58054 | oej | 2007-03-06 13:41:21 -0700 (Tue, 06 Mar 2007) | 2 lines
Debug control, debug control.
................
r58055 | oej | 2007-03-06 13:45:29 -0700 (Tue, 06 Mar 2007) | 18 lines
Merged revisions 58053 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r58053 | oej | 2007-03-06 21:37:07 +0100 (Tue, 06 Mar 2007) | 10 lines
Merged revisions 58052 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r58052 | oej | 2007-03-06 21:33:21 +0100 (Tue, 06 Mar 2007) | 2 lines
Change error message to proper message
........
................
................
r58101 | russell | 2007-03-06 15:15:02 -0700 (Tue, 06 Mar 2007) | 3 lines
Sync codec_zap with the one that is in the 1.4 branch so that it can actually
build here, too.
................
r58120 | russell | 2007-03-06 16:01:30 -0700 (Tue, 06 Mar 2007) | 11 lines
Merged revisions 58119 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58119 | russell | 2007-03-06 17:00:57 -0600 (Tue, 06 Mar 2007) | 3 lines
Clarify the documentation of the dialout and sendvoicemail options.
(issue #9000, caio1982 and serge-v)
........
................
r58122 | murf | 2007-03-06 16:19:59 -0700 (Tue, 06 Mar 2007) | 17 lines
Merged revisions 58121 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r58121 | murf | 2007-03-06 16:10:14 -0700 (Tue, 06 Mar 2007) | 9 lines
Merged revisions 58115 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r58115 | murf | 2007-03-06 15:52:52 -0700 (Tue, 06 Mar 2007) | 1 line
Fix for 9220: Eyebeam cannot renew subscriptions for presence info. Reason: re-SUBSCRIBE requests don't include Accept headers, which the rfc says are optional (to put it tersely), (it uses MAY), and luckily, the sip_pvt struct has the format info stored, so we simply leave it if the format is set, and the accept header null.
........
................
................
r58123 | russell | 2007-03-06 16:20:57 -0700 (Tue, 06 Mar 2007) | 6 lines
Send a manager AgentComplete event when the agent transfers the call, in
addition to where it is already sent if either side hangs up.
(issue #9219, rgollent)
In passing, I put this code in a function so it would not be duplicated
a third time.
................
r58149 | russell | 2007-03-06 16:58:38 -0700 (Tue, 06 Mar 2007) | 3 lines
Add some documentation on the arguments to the base64 encode/decode functions.
(inspired by issue #9215)
................
r58166 | russell | 2007-03-06 17:26:01 -0700 (Tue, 06 Mar 2007) | 20 lines
Merged revisions 58165 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r58165 | russell | 2007-03-06 18:25:19 -0600 (Tue, 06 Mar 2007) | 12 lines
Merged revisions 58164 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r58164 | russell | 2007-03-06 18:20:13 -0600 (Tue, 06 Mar 2007) | 4 lines
If the channels acquired using the manager Redirect action are not up, then
don't attempt to do anything with them. It could lead to weird behavior,
including crashes. (issue #8977)
........
................
................
r58208 | russell | 2007-03-06 18:07:16 -0700 (Tue, 06 Mar 2007) | 3 lines
Add the format of the file that is currently being played to the verbose message.
(issue #9105, junky)
................
r58224 | oej | 2007-03-07 01:08:46 -0700 (Wed, 07 Mar 2007) | 3 lines
Adding reference to ices home page. Anyone that has tested with ices2 ?
................
r58241 | file | 2007-03-07 10:55:11 -0700 (Wed, 07 Mar 2007) | 10 lines
Merged revisions 58240 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58240 | file | 2007-03-07 12:52:58 -0500 (Wed, 07 Mar 2007) | 2 lines
Ensure we have (or should have) at least one matching codec before attempting early bridge SDP seeding. (issue #9221 reported by marcelbarbulescu)
........
................
r58244 | russell | 2007-03-07 11:20:51 -0700 (Wed, 07 Mar 2007) | 25 lines
Merged revisions 58243 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r58243 | russell | 2007-03-07 12:19:19 -0600 (Wed, 07 Mar 2007) | 17 lines
(This bug was reported to me by Kinsey Moore)
Merged revisions 58242 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r58242 | russell | 2007-03-07 12:17:07 -0600 (Wed, 07 Mar 2007) | 7 lines
Fix a problem where the Asterisk channel name could be that of the wrong IAX2
user for a call. This is because the first step of choosing this name is to
look for an IAX2 peer that happens to have the same IP/port number that this
call is coming from and assuming that is it. However, this is not always
correct. So, I have made it change this name after authentication happens
since at that point, we have an exact match.
........
................
................
r58286 | file | 2007-03-07 13:05:05 -0700 (Wed, 07 Mar 2007) | 2 lines
Make the loader less noisy under valgrind.
................
r58304 | russell | 2007-03-07 15:30:52 -0700 (Wed, 07 Mar 2007) | 7 lines
Add the ability to dynamically specify weights for responses to DUNDi queries.
This can be done using a global variable or a dialplan function. Using the
SHELL() function will allow you to use an external script to determine what the
weight in the response should be. This can be very useful in load balancing
applications.
(inspired by discussions with blitzrage and jsmith in #asterisk-bugs)
................
r58321 | russell | 2007-03-07 18:06:00 -0700 (Wed, 07 Mar 2007) | 14 lines
Merged revisions 58320 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58320 | russell | 2007-03-07 19:01:46 -0600 (Wed, 07 Mar 2007) | 6 lines
If we receive ZT_EVENT_REMOVED, destroy the specified channel.
(issue #7256, tzafrir)
Also, update the configure script to make sure that we don't try to build
chan_zap if the installed version of zaptel does not include ZT_EVENT_REMOVED.
........
................
r58353 | kpfleming | 2007-03-08 06:21:38 -0700 (Thu, 08 Mar 2007) | 15 lines
Merged revisions 58351-58352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58351 | kpfleming | 2007-03-08 08:17:17 -0500 (Thu, 08 Mar 2007) | 2 lines
fix two cases where HTTP session file descriptors would not be closed
........
r58352 | kpfleming | 2007-03-08 08:17:42 -0500 (Thu, 08 Mar 2007) | 2 lines
fix a compiler warning, and overwriting 'res' value
........
................
r58355 | kpfleming | 2007-03-08 06:27:02 -0700 (Thu, 08 Mar 2007) | 10 lines
Merged revisions 58354 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58354 | kpfleming | 2007-03-08 08:23:46 -0500 (Thu, 08 Mar 2007) | 2 lines
this change was not needed; fclose() handles closing the file descriptor already
........
................
r58390 | file | 2007-03-08 09:09:23 -0700 (Thu, 08 Mar 2007) | 18 lines
Merged revisions 58389 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r58389 | file | 2007-03-08 11:07:10 -0500 (Thu, 08 Mar 2007) | 10 lines
Merged revisions 58388 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r58388 | file | 2007-03-08 11:04:58 -0500 (Thu, 08 Mar 2007) | 2 lines
Only print out debug message if the definition that makes the variables shows up was actually defined. (issue #9233 reported by serginuez)
........
................
................
r58437 | file | 2007-03-08 11:05:54 -0700 (Thu, 08 Mar 2007) | 10 lines
Merged revisions 58436 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58436 | file | 2007-03-08 13:01:00 -0500 (Thu, 08 Mar 2007) | 2 lines
Make early SDP seeding even smarter! We have to check codecs in the make_compatible function too. (issue #9221 reported by marcelbarbulescu)
........
................
r58475 | russell | 2007-03-08 13:56:57 -0700 (Thu, 08 Mar 2007) | 11 lines
Merged revisions 58474 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58474 | russell | 2007-03-08 14:54:56 -0600 (Thu, 08 Mar 2007) | 3 lines
Refactor hold handling a bit so that it does not require keeping the call up
when a call is put on hold.
........
................
r58480 | tilghman | 2007-03-08 14:34:40 -0700 (Thu, 08 Mar 2007) | 10 lines
Merged revisions 58479 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58479 | tilghman | 2007-03-08 15:33:03 -0600 (Thu, 08 Mar 2007) | 2 lines
Fix segfault (Issue 9236)
........
................
r58511 | russell | 2007-03-08 15:08:28 -0700 (Thu, 08 Mar 2007) | 11 lines
Merged revisions 58510 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58510 | russell | 2007-03-08 16:06:54 -0600 (Thu, 08 Mar 2007) | 3 lines
Add a missing break statement so that handling the above event does not
incorrectly destroy the channel. (issue #9242, andrew)
........
................
r58541 | russell | 2007-03-08 16:21:44 -0700 (Thu, 08 Mar 2007) | 13 lines
Merged revisions 58512 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58512 | russell | 2007-03-08 16:15:15 -0600 (Thu, 08 Mar 2007) | 5 lines
Hang up the channel that put the call on hold in the event processing thread to
avoid a race condition. Also, if the station originated the call that it is
putting on hold, don't hang up the trunk if it was the only station on the call
and it is hanging up due to hold and not a normal hangup.
........
................
r58592 | file | 2007-03-09 13:53:37 -0700 (Fri, 09 Mar 2007) | 18 lines
Merged revisions 58584 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r58584 | file | 2007-03-09 15:49:47 -0500 (Fri, 09 Mar 2007) | 10 lines
Merged revisions 58579 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r58579 | file | 2007-03-09 15:46:43 -0500 (Fri, 09 Mar 2007) | 2 lines
If we are unable to lookup the host in a c line we have to abort, otherwise the previous data is gone and we will (potentially) have no data when all is said and done.
........
................
................
r58605 | file | 2007-03-09 14:10:20 -0700 (Fri, 09 Mar 2007) | 10 lines
Merged revisions 58604 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58604 | file | 2007-03-09 16:08:19 -0500 (Fri, 09 Mar 2007) | 2 lines
Fix spelling of unavailable in voicemail documentation. (issue #9248 reported by tensai)
........
................
r58639 | russell | 2007-03-09 17:00:26 -0700 (Fri, 09 Mar 2007) | 16 lines
Merged revisions 58638 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58638 | russell | 2007-03-09 17:59:10 -0600 (Fri, 09 Mar 2007) | 8 lines
Merge some updates to the SLA documentation. I plan to keep working on this
to explain all of the expected behavior with call handling, configuration
details for specific phones, and other things. However, I got tired of doing
it in plain text, so I switched to using LaTeX. I have included the PDF version.
I haven't been able to get a nice looking plain text version out of it yet, but
I'm not terribly concerned since this is supposed to be more of the manual,
while the plain text sample configuration file is the reference.
........
................
r58670 | russell | 2007-03-09 21:01:07 -0700 (Fri, 09 Mar 2007) | 10 lines
Merged revisions 58669 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58669 | russell | 2007-03-09 21:58:27 -0600 (Fri, 09 Mar 2007) | 2 lines
Make the compiler happy and initialize a variable.
........
................
r58706 | russell | 2007-03-10 11:15:41 -0700 (Sat, 10 Mar 2007) | 14 lines
Merged revisions 58705 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58705 | russell | 2007-03-10 12:11:11 -0600 (Sat, 10 Mar 2007) | 6 lines
Fix a few more places in chan_iax2 where the ast_frame used for receiving a
frame was not properly initialized.
- Interpolating a frame when the jitterbuffer is in use
- decrypting a frame when IAX2 encryption is on
- frames in an IAX2 trunk
........
................
r58742 | qwell | 2007-03-11 10:43:14 -0600 (Sun, 11 Mar 2007) | 5 lines
Add CLI command "marko show birthday" to show "birthday information"
for Mark Spencers upcoming 30th birthday.
To enable, run `make menuselect` and select the option MARKO_BDAY under Compiler Flags.
................
r58761 | kpfleming | 2007-03-11 15:57:05 -0600 (Sun, 11 Mar 2007) | 2 lines
grammatical errors are bad, mmmkay?
................
r58780 | file | 2007-03-11 18:54:13 -0600 (Sun, 11 Mar 2007) | 10 lines
Merged revisions 58779 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58779 | file | 2007-03-11 20:51:16 -0400 (Sun, 11 Mar 2007) | 2 lines
Add matchexterniplocally setting which only substitutes your externip/externhost setting if it matches the localnet setting. I know of at least two people who need opposite settings, so I made it an option! (issue #8821 reported by kokoskarokoska)
........
................
r58784 | file | 2007-03-11 19:22:29 -0600 (Sun, 11 Mar 2007) | 10 lines
Merged revisions 58783 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58783 | file | 2007-03-11 21:21:12 -0400 (Sun, 11 Mar 2007) | 2 lines
Allow RFC2833 compensation to compensate for even stupider implementations by queueing up the end frame at the start, not the actual end. (issue #8963 reported by AndrewZ)
........
................
r58822 | oej | 2007-03-12 03:37:13 -0600 (Mon, 12 Mar 2007) | 2 lines
Change URL to OpenH323 (thanks, Tzafrir!)
................
r58844 | oej | 2007-03-13 03:15:17 -0600 (Tue, 13 Mar 2007) | 10 lines
Merged revisions 58843 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58843 | oej | 2007-03-13 10:12:16 +0100 (Tue, 13 Mar 2007) | 2 lines
Issue #9251 - Clear From URI from user attributes (tgrman)
........
................
r58846 | oej | 2007-03-13 04:14:13 -0600 (Tue, 13 Mar 2007) | 11 lines
Merged revisions 58845 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58845 | oej | 2007-03-13 11:03:03 +0100 (Tue, 13 Mar 2007) | 3 lines
Don't hangup the call on OK or errors on MESSAGE and INFO
inside of a dialog (like video update requests).
........
................
r58866 | russell | 2007-03-13 15:22:33 -0600 (Tue, 13 Mar 2007) | 17 lines
Merge changes from team/russell/sqlite:
* Add new module, cdr_sqlite3_custom which allows logging custom CDRs into a
SQLite3 database. (issue #7149, alerios)
* Add new module, res_config_sqlite, which adds realtime database configuration
support for SQLite version 2. I decided that this was ok since we didn't have
any realtime support for version 3. If someone ports this to version 3, then
version 2 support can be removed or marked deprecated.
(issue #7790, rbarun_proformatique)
* Mark cdr_sqlite as deprecated in favor of cdr_sqlite3_custom.
Also, note that there were other modules on the bug tracker that did not make
the cut because they provided some duplicated functionality. Those are:
* cdr_sqlite3 (issue #6754, moy)
* cdr_sqlite3 (issue #8694, bsd)
................
r58871 | russell | 2007-03-13 17:11:30 -0600 (Tue, 13 Mar 2007) | 9 lines
Merged revisions 58870 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58870 | russell | 2007-03-13 18:11:08 -0500 (Tue, 13 Mar 2007) | 1 line
fix the reference to the SLA documentation
........
................
r58873 | russell | 2007-03-13 17:20:41 -0600 (Tue, 13 Mar 2007) | 12 lines
Merged revisions 58872 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58872 | russell | 2007-03-13 18:19:51 -0500 (Tue, 13 Mar 2007) | 4 lines
Ensure that the blinky lights show that the trunk stopped ringing when the
trunk hangs up before a station has answered it.
(issue #9234, reported by francesco_r)
........
................
r58881 | tilghman | 2007-03-13 19:56:03 -0600 (Tue, 13 Mar 2007) | 11 lines
Merged revisions 58880 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58880 | tilghman | 2007-03-13 20:47:08 -0500 (Tue, 13 Mar 2007) | 3 lines
Issue 9162 - pbx_substitute_variables_helper assumes the buffer is initialized
to all zeroes. This fixes a case where it wasn't.
........
................
r58895 | russell | 2007-03-14 10:34:03 -0600 (Wed, 14 Mar 2007) | 16 lines
Merged revisions 58894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58894 | russell | 2007-03-14 11:33:01 -0500 (Wed, 14 Mar 2007) | 8 lines
By default, don't attempt to do any CallerID handling at all with SLA because
it is known to not work properly in some situations. However, add an option to
enable it for those that would like to use it anyway.
The short story behind this is that to properly handle CallerID with SLA, we
need the ability to change the CallerID on an existing call, and we are not
ready to handle that.
........
................
r58898 | russell | 2007-03-14 10:40:52 -0600 (Wed, 14 Mar 2007) | 19 lines
Merged revisions 58897 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r58897 | russell | 2007-03-14 11:40:22 -0500 (Wed, 14 Mar 2007) | 11 lines
Merged revisions 58896 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r58896 | russell | 2007-03-14 11:38:48 -0500 (Wed, 14 Mar 2007) | 3 lines
Add a note to the security file that the Asterisk CLI and log files may contain
sensitive information, and that people should keep this in mind.
........
................
................
r58900 | oej | 2007-03-14 10:59:35 -0600 (Wed, 14 Mar 2007) | 18 lines
Merged revisions 58848 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r58848 | oej | 2007-03-13 12:49:35 +0100 (Tue, 13 Mar 2007) | 10 lines
Merged revisions 58847 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r58847 | oej | 2007-03-13 12:45:52 +0100 (Tue, 13 Mar 2007) | 2 lines
Issue #9229 - No port in request URI on register to non default SIP ports (neelakantan)
........
................
................
r58901 | oej | 2007-03-14 11:01:37 -0600 (Wed, 14 Mar 2007) | 3 lines
Correct reference to Radius library
THanks Philippe - Greetings from Lisboa, Portugal
................
r58904 | russell | 2007-03-14 11:42:52 -0600 (Wed, 14 Mar 2007) | 10 lines
Merged revisions 58902 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58902 | russell | 2007-03-14 12:04:38 -0500 (Wed, 14 Mar 2007) | 2 lines
Add a more basic example setup to the examples section
........
................
r58907 | russell | 2007-03-14 13:19:00 -0600 (Wed, 14 Mar 2007) | 12 lines
Merged revisions 58906 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58906 | russell | 2007-03-14 14:18:08 -0500 (Wed, 14 Mar 2007) | 4 lines
Some people like to put "limitonpeer" instead of "limitonpeers" in their
configuration. While we're at it, support "limitonpeerz" and
"limitonpeerssssss". (inspired by issue #9172)
........
................
Added:
team/murf/bug_7638/cdr/cdr_sqlite3_custom.c
- copied unchanged from r58907, trunk/cdr/cdr_sqlite3_custom.c
team/murf/bug_7638/configs/cdr_sqlite3_custom.conf
- copied unchanged from r58907, trunk/configs/cdr_sqlite3_custom.conf
team/murf/bug_7638/configs/res_config_sqlite.conf
- copied unchanged from r58907, trunk/configs/res_config_sqlite.conf
team/murf/bug_7638/doc/res_config_sqlite.txt
- copied unchanged from r58907, trunk/doc/res_config_sqlite.txt
team/murf/bug_7638/doc/sla.pdf
- copied unchanged from r58907, trunk/doc/sla.pdf
team/murf/bug_7638/doc/sla.tex
- copied unchanged from r58907, trunk/doc/sla.tex
team/murf/bug_7638/res/res_config_sqlite.c
- copied unchanged from r58907, trunk/res/res_config_sqlite.c
Removed:
team/murf/bug_7638/doc/sla.txt
Modified:
team/murf/bug_7638/ (props changed)
team/murf/bug_7638/CHANGES
team/murf/bug_7638/UPGRADE.txt
team/murf/bug_7638/apps/app_ices.c
team/murf/bug_7638/apps/app_meetme.c
team/murf/bug_7638/apps/app_queue.c
team/murf/bug_7638/apps/app_stack.c
team/murf/bug_7638/apps/app_voicemail.c
team/murf/bug_7638/build_tools/cflags.xml
team/murf/bug_7638/build_tools/menuselect-deps.in
team/murf/bug_7638/cdr/cdr_radius.c
team/murf/bug_7638/cdr/cdr_sqlite.c
team/murf/bug_7638/channels/chan_h323.c
team/murf/bug_7638/channels/chan_iax2.c
team/murf/bug_7638/channels/chan_sip.c
team/murf/bug_7638/channels/chan_skinny.c
team/murf/bug_7638/channels/chan_zap.c
team/murf/bug_7638/codecs/codec_zap.c
team/murf/bug_7638/configs/dundi.conf.sample
team/murf/bug_7638/configs/extconfig.conf.sample
team/murf/bug_7638/configs/extensions.conf.sample
team/murf/bug_7638/configs/sip.conf.sample
team/murf/bug_7638/configs/sla.conf.sample
team/murf/bug_7638/configs/voicemail.conf.sample
team/murf/bug_7638/configure
team/murf/bug_7638/configure.ac
team/murf/bug_7638/doc/security.txt
team/murf/bug_7638/funcs/func_strings.c
team/murf/bug_7638/include/asterisk/autoconfig.h.in
team/murf/bug_7638/include/asterisk/channel.h
team/murf/bug_7638/include/asterisk/utils.h
team/murf/bug_7638/main/asterisk.c
team/murf/bug_7638/main/channel.c
team/murf/bug_7638/main/dsp.c
team/murf/bug_7638/main/file.c
team/murf/bug_7638/main/http.c
team/murf/bug_7638/main/loader.c
team/murf/bug_7638/main/manager.c
team/murf/bug_7638/main/pbx.c
team/murf/bug_7638/main/rtp.c
team/murf/bug_7638/main/say.c
team/murf/bug_7638/main/slinfactory.c
team/murf/bug_7638/makeopts.in
team/murf/bug_7638/pbx/ael/ael-test/ref.ael-test2
team/murf/bug_7638/pbx/ael/ael-test/ref.ael-test3
team/murf/bug_7638/pbx/ael/ael-test/ref.ael-test4
team/murf/bug_7638/pbx/ael/ael-test/ref.ael-test6
team/murf/bug_7638/pbx/ael/ael-test/ref.ael-test7
team/murf/bug_7638/pbx/ael/ael-test/ref.ael-vtest13
team/murf/bug_7638/pbx/pbx_dundi.c
team/murf/bug_7638/res/res_jabber.c
team/murf/bug_7638/res/res_odbc.c
Propchange: team/murf/bug_7638/
------------------------------------------------------------------------------
automerge = si
Propchange: team/murf/bug_7638/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/murf/bug_7638/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/murf/bug_7638/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 15 10:26:03 2007
@@ -1,1 +1,1 @@
-/trunk:1-57509
+/trunk:1-58919
Modified: team/murf/bug_7638/CHANGES
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7638/CHANGES?view=diff&rev=58921&r1=58920&r2=58921
==============================================================================
--- team/murf/bug_7638/CHANGES (original)
+++ team/murf/bug_7638/CHANGES Thu Mar 15 10:26:03 2007
@@ -6,10 +6,8 @@
-------------
* Added the bindaddr option to gtalk.conf.
- * Added the ability to specify arguments to the Dial application when using
- the DUNDi switch in the dialplan.
* Added the ability to customize which sound files are used for some of the
- prompts within the Voicemail application by changing them in voicemail.conf
+ prompts within the Voicemail application by changing them in voicemail.conf
* Argument support for Gosub application
* Ability to set process limits without restarting Asterisk
* SS7 support in chan_zap (via libss7 library)
@@ -67,6 +65,9 @@
* Added 'o' and 'X' options to Chanspy.
* Added the parkedcallreparking option to features.conf
* SMDI is now enabled in voicemail using the smdienable option.
+ * Added zap show version CLI command to chan_zap.
+ * Added a new CDR module, cdr_sqlite3_custom.
+ * Added a new realtime configuration module, res_config_sqlite
AMI - The manager (TCP/TLS/HTTP)
--------------------------------
@@ -84,7 +85,7 @@
------------------
* Added the DEVSTATE() dialplan function which allows retrieving any device
state in the dialplan, as well as creating custom device states that are
- controllable from the dialplan.
+ controllable from the dialplan.
* Extend CALLERID() function with "pres" and "ton" parameters to
fetch string representation of calling number presentation indicator
and numeric representation of type of calling number value.
@@ -99,18 +100,27 @@
-----------
* The default SIP useragent= identifier now includes the Asterisk version
* A new option, match_auth_username in sip.conf changes the matching of incoming requests.
- If set, and the incoming request carries authentication info,
- the username to match in the users list is taken from the Digest header
- rather than from the From: field. This feature is considered experimental.
+ If set, and the incoming request carries authentication info,
+ the username to match in the users list is taken from the Digest header
+ rather than from the From: field. This feature is considered experimental.
* The "musiconhold" and "musicclass" settings in sip.conf are now removed,
- since they where replaced by "mohsuggest" and "mohinterpret" in version 1.4
+ since they where replaced by "mohsuggest" and "mohinterpret" in version 1.4
* The "localmask" setting was removed in version 1.2 and the reminder about it
- being removed is now also removed.
+ being removed is now also removed.
* A new option "busy-level" for setting a level of calls where asterisk reports
- a device as busy, to separate it from call-limit
+ a device as busy, to separate it from call-limit
* A new realtime family called "sipregs" is now supported to store SIP registration
- data. If this family is defined, "sippeers" will be used for configuration and
- "sipregs" for registrations. If it's not defined, "sippeers" will be used for
- registration data, as before.
+ data. If this family is defined, "sippeers" will be used for configuration and
+ "sipregs" for registrations. If it's not defined, "sippeers" will be used for
+ registration data, as before.
* The SIPPEER function have new options for port address, call and pickup groups
* Added support for T.140 realtime text in SIP/RTP
+
+DUNDi changes
+-------------
+ * Added the ability to specify arguments to the Dial application when using
+ the DUNDi switch in the dialplan.
+ * Added the ability to set weights for responses dynamically. This can be
+ done using a global variable or a dialplan function. Using the SHELL()
+ function would allow you to have an external script set the weight for
+ each response.
Modified: team/murf/bug_7638/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7638/UPGRADE.txt?view=diff&rev=58921&r1=58920&r2=58921
==============================================================================
--- team/murf/bug_7638/UPGRADE.txt (original)
+++ team/murf/bug_7638/UPGRADE.txt Thu Mar 15 10:26:03 2007
@@ -36,3 +36,9 @@
performs mostly a 'ChanExists' sort of function.
* SetCallerPres() has been replaced with the CALLERPRES() dialplan function
and is now deprecated.
+
+CDR:
+
+* The cdr_sqlite module has been marked as deprecated in favor of
+ cdr_sqlite3_custom. It will potentially be removed from the tree
+ after Asterisk 1.6 is released.
Modified: team/murf/bug_7638/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7638/apps/app_ices.c?view=diff&rev=58921&r1=58920&r2=58921
==============================================================================
--- team/murf/bug_7638/apps/app_ices.c (original)
+++ team/murf/bug_7638/apps/app_ices.c Thu Mar 15 10:26:03 2007
@@ -22,6 +22,8 @@
*
* \author Mark Spencer <markster at digium.com>
*
+ * \extref ICES - http://www.icecast.org/ices.php
+ *
* \ingroup applications
*/
Modified: team/murf/bug_7638/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7638/apps/app_meetme.c?view=diff&rev=58921&r1=58920&r2=58921
==============================================================================
--- team/murf/bug_7638/apps/app_meetme.c (original)
+++ team/murf/bug_7638/apps/app_meetme.c Thu Mar 15 10:26:03 2007
@@ -65,6 +65,7 @@
#include "asterisk/astobj.h"
#include "asterisk/devicestate.h"
#include "asterisk/dial.h"
+#include "asterisk/causes.h"
#include "enter.h"
#include "leave.h"
@@ -360,6 +361,7 @@
SLA_TRUNK_STATE_RINGING,
SLA_TRUNK_STATE_UP,
SLA_TRUNK_STATE_ONHOLD,
+ SLA_TRUNK_STATE_ONHOLD_BYME,
};
enum sla_hold_access {
@@ -448,8 +450,6 @@
enum sla_event_type {
/*! A station has put the call on hold */
SLA_EVENT_HOLD,
- /*! A station has taken the call off of hold */
- SLA_EVENT_UNHOLD,
/*! The state of a dial has changed */
SLA_EVENT_DIAL_STATE,
/*! The state of a ringing trunk has changed */
@@ -496,7 +496,7 @@
/*!
* \brief A structure for data used by the sla thread
*/
-static struct sla {
+static struct {
/*! The SLA thread ID */
pthread_t thread;
ast_cond_t cond;
@@ -506,6 +506,9 @@
AST_LIST_HEAD_NOLOCK(, sla_failed_station) failed_stations;
AST_LIST_HEAD_NOLOCK(, sla_event) event_q;
unsigned int stop:1;
+ /*! Attempt to handle CallerID, even though it is known not to work
+ * properly in some situations. */
+ unsigned int attempt_callerid:1;
} sla = {
.thread = AST_PTHREADT_NULL,
};
@@ -520,7 +523,7 @@
* conversion... the numbers have been modified
* to give the user a better level of adjustability
*/
-static const char const gain_map[] = {
+static char const gain_map[] = {
-15,
-13,
-10,
@@ -765,18 +768,6 @@
free(cnf);
cnf = NULL;
goto cnfout;
- }
- cnf->lchan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
- if (cnf->lchan) {
- ast_set_read_format(cnf->lchan, AST_FORMAT_SLINEAR);
- ast_set_write_format(cnf->lchan, AST_FORMAT_SLINEAR);
- ztc.chan = 0;
- ztc.confmode = ZT_CONF_CONFANN | ZT_CONF_CONFANNMON;
- if (ioctl(cnf->lchan->fds[0], ZT_SETCONF, &ztc)) {
- ast_log(LOG_WARNING, "Error setting conference\n");
- ast_hangup(cnf->lchan);
- cnf->lchan = NULL;
- }
}
/* Fill the conference struct */
cnf->start = time(NULL);
@@ -1074,6 +1065,7 @@
S(SLA_TRUNK_STATE_RINGING)
S(SLA_TRUNK_STATE_UP)
S(SLA_TRUNK_STATE_ONHOLD)
+ S(SLA_TRUNK_STATE_ONHOLD_BYME)
}
return "Uknown State";
#undef S
@@ -1283,7 +1275,7 @@
}
/*! \brief Queue a SLA event from the conference */
-static void sla_queue_event_conf(enum sla_event_type type, const struct ast_channel *chan,
+static void sla_queue_event_conf(enum sla_event_type type, struct ast_channel *chan,
struct ast_conference *conf)
{
struct sla_station *station;
@@ -1402,11 +1394,22 @@
}
}
- if ((conf->recording == MEETME_RECORD_OFF) && ((confflags & CONFFLAG_RECORDCONF) || (conf->lchan))) {
- pthread_attr_init(&conf->attr);
- pthread_attr_setdetachstate(&conf->attr, PTHREAD_CREATE_DETACHED);
- ast_pthread_create_background(&conf->recordthread, &conf->attr, recordthread, conf);
- pthread_attr_destroy(&conf->attr);
+ if ((conf->recording == MEETME_RECORD_OFF) && (confflags & CONFFLAG_RECORDCONF) && ((conf->lchan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL)))) {
+ ast_set_read_format(conf->lchan, AST_FORMAT_SLINEAR);
+ ast_set_write_format(conf->lchan, AST_FORMAT_SLINEAR);
+ ztc.chan = 0;
+ ztc.confno = conf->zapconf;
+ ztc.confmode = ZT_CONF_CONFANN | ZT_CONF_CONFANNMON;
+ if (ioctl(conf->lchan->fds[0], ZT_SETCONF, &ztc)) {
+ ast_log(LOG_WARNING, "Error starting listen channel\n");
+ ast_hangup(conf->lchan);
+ conf->lchan = NULL;
+ } else {
+ pthread_attr_init(&conf->attr);
[... 4248 lines stripped ...]
More information about the asterisk-commits
mailing list