[asterisk-commits] file: branch file/ah r59245 - in /team/file/ah:
./ apps/ build_tools/ cdr/ ch...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Mar 26 17:07:03 MST 2007
Author: file
Date: Mon Mar 26 19:07:02 2007
New Revision: 59245
URL: http://svn.digium.com/view/asterisk?view=rev&rev=59245
Log:
Merged revisions 58866,58871,58873,58881,58895,58898,58900-58901,58904,58907,58924,58932,58934,58936,58938,58940,58942,58948-58950,58954,58956,58958,58995,59036,59038,59041,59043,59050-59051,59071-59073,59077,59079-59080,59082-59083,59088,59090,59146,59181,59183,59190-59191,59196,59201,59203-59205,59208,59210-59211,59214,59216,59218,59224,59226,59229,59231,59233-59234,59236 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r58866 | russell | 2007-03-13 17:22:33 -0400 (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 19:11:30 -0400 (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 19:20:41 -0400 (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 21:56:03 -0400 (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 12:34:03 -0400 (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 12:40:52 -0400 (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 12:59:35 -0400 (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 13:01:37 -0400 (Wed, 14 Mar 2007) | 3 lines
Correct reference to Radius library
THanks Philippe - Greetings from Lisboa, Portugal
................
r58904 | russell | 2007-03-14 13:42:52 -0400 (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 15:19:00 -0400 (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)
........
................
r58924 | file | 2007-03-15 14:21:03 -0400 (Thu, 15 Mar 2007) | 10 lines
Merged revisions 58923 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58923 | file | 2007-03-15 15:13:21 -0300 (Thu, 15 Mar 2007) | 2 lines
Don't assume that the pvt structure will still exist after calling schedule_delivery as it may not. (issue #9278 reported by fmachado)
........
................
r58932 | russell | 2007-03-15 18:29:45 -0400 (Thu, 15 Mar 2007) | 21 lines
Merged revisions 58931 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58931 | russell | 2007-03-15 17:25:12 -0500 (Thu, 15 Mar 2007) | 13 lines
Merge changes from svn/asterisk/team/russell/LaTeX_docs.
* Convert most of the doc directory into a single LaTeX formatted document
so that we can generate a PDF, HTML, or other formats from this
information.
* Add a CLI command to dump the application documentation into LaTeX format
which will only be include if the configure script is run with
--enable-dev-mode.
* The PDF turned out to be close to 1 MB, so it is not included. However, you
can simply run "make asterisk.pdf" to generate it yourself. We may include
it in release tarballs or have automatically generated ones on the web site,
but that has yet to be decided.
........
................
r58934 | tilghman | 2007-03-15 18:33:46 -0400 (Thu, 15 Mar 2007) | 10 lines
Merged revisions 58933 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58933 | tilghman | 2007-03-15 17:32:33 -0500 (Thu, 15 Mar 2007) | 2 lines
Function works fine, but the documentation is backwards.
........
................
r58936 | russell | 2007-03-15 18:36:34 -0400 (Thu, 15 Mar 2007) | 10 lines
Merged revisions 58935 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58935 | russell | 2007-03-15 17:35:52 -0500 (Thu, 15 Mar 2007) | 2 lines
have prep_tarball attempt to build asterisk.pdf
........
................
r58938 | russell | 2007-03-15 18:52:27 -0400 (Thu, 15 Mar 2007) | 10 lines
Merged revisions 58937 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58937 | russell | 2007-03-15 17:51:29 -0500 (Thu, 15 Mar 2007) | 2 lines
Add Asterisk version information to the generated PDF
........
................
r58940 | tilghman | 2007-03-15 19:12:33 -0400 (Thu, 15 Mar 2007) | 9 lines
Blocked revisions 58939 via svnmerge
........
r58939 | tilghman | 2007-03-15 18:11:33 -0500 (Thu, 15 Mar 2007) | 2 lines
Expand deprecation warnings from simply warning on use to the builtin documentation.
........
................
r58942 | russell | 2007-03-15 19:24:30 -0400 (Thu, 15 Mar 2007) | 9 lines
Merged revisions 58941 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58941 | russell | 2007-03-15 18:24:09 -0500 (Thu, 15 Mar 2007) | 1 line
add a link to the rubber homepage
........
................
r58948 | russell | 2007-03-15 19:56:10 -0400 (Thu, 15 Mar 2007) | 11 lines
Merged revisions 58947 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58947 | russell | 2007-03-15 18:53:26 -0500 (Thu, 15 Mar 2007) | 3 lines
Add configure script checking for GTK2 and some additional Makefile targets
to support gmenuselect
........
................
r58949 | tilghman | 2007-03-15 20:02:43 -0400 (Thu, 15 Mar 2007) | 2 lines
Fix trunk so that it compiles again
................
r58950 | tilghman | 2007-03-15 20:04:00 -0400 (Thu, 15 Mar 2007) | 10 lines
Merged revisions 58946 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58946 | tilghman | 2007-03-15 18:52:48 -0500 (Thu, 15 Mar 2007) | 2 lines
Refashion dump command to match common syntax and update the resulting appdocs TeX file
........
................
r58954 | russell | 2007-03-15 21:13:36 -0400 (Thu, 15 Mar 2007) | 10 lines
Merged revisions 58953 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58953 | russell | 2007-03-15 20:12:40 -0500 (Thu, 15 Mar 2007) | 2 lines
Add the --pdf option to the usage of rubber in prep_tarball
........
................
r58956 | russell | 2007-03-15 21:42:04 -0400 (Thu, 15 Mar 2007) | 10 lines
Blocked revisions 58955 via svnmerge
........
r58955 | russell | 2007-03-15 20:41:00 -0500 (Thu, 15 Mar 2007) | 3 lines
Making these documentation changes in the 1.4 branch upset various people, so
these chanes will only be done in the trunk.
........
................
r58958 | russell | 2007-03-15 21:43:41 -0400 (Thu, 15 Mar 2007) | 9 lines
Merged revisions 58957 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58957 | russell | 2007-03-15 20:42:37 -0500 (Thu, 15 Mar 2007) | 1 line
fix a couple SLA documentation references
........
................
r58995 | file | 2007-03-16 12:14:04 -0400 (Fri, 16 Mar 2007) | 10 lines
Merged revisions 58992 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58992 | file | 2007-03-16 12:12:28 -0400 (Fri, 16 Mar 2007) | 2 lines
Wait for the async thread to exit when hanging up all of the paged phones under all circumstances. (issue #9181 reported by PhilSmith)
........
................
r59036 | bweschke | 2007-03-18 12:59:48 -0400 (Sun, 18 Mar 2007) | 11 lines
Merged revisions 59035 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59035 | bweschke | 2007-03-18 12:36:44 -0400 (Sun, 18 Mar 2007) | 3 lines
Don't return a non-zero return code if the profile doesn't exist, to match what the documentation says it already does. (#9307 Reported by kkiely)
........
................
r59038 | oej | 2007-03-18 16:39:37 -0400 (Sun, 18 Mar 2007) | 11 lines
Merged revisions 59037 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59037 | oej | 2007-03-18 21:37:06 +0100 (Sun, 18 Mar 2007) | 3 lines
Issue #9313, Asterisk crash on SIP return code 0 (reported by qwerty1979)
........
................
r59041 | tilghman | 2007-03-19 11:43:15 -0400 (Mon, 19 Mar 2007) | 10 lines
Merged revisions 59040 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59040 | tilghman | 2007-03-19 10:42:26 -0500 (Mon, 19 Mar 2007) | 2 lines
Fix unescaped semicolon (reported via -dev list)
........
................
r59043 | file | 2007-03-19 11:54:42 -0400 (Mon, 19 Mar 2007) | 9 lines
Blocked revisions 59042 via svnmerge
........
r59042 | file | 2007-03-19 11:52:28 -0400 (Mon, 19 Mar 2007) | 2 lines
Fix typo in help for CDR function. (issue #9295 reported by ajohnson)
........
................
r59050 | tilghman | 2007-03-19 18:31:14 -0400 (Mon, 19 Mar 2007) | 10 lines
Merged revisions 59049 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59049 | tilghman | 2007-03-19 17:29:56 -0500 (Mon, 19 Mar 2007) | 2 lines
Oops, this should have been a %d all along
........
................
r59051 | file | 2007-03-19 18:32:40 -0400 (Mon, 19 Mar 2007) | 2 lines
It is possible for mod to become invalid after we unload it (if it's a dynamic module) so move it around a bit.
................
r59071 | murf | 2007-03-20 14:15:03 -0400 (Tue, 20 Mar 2007) | 1 line
blocking 59069... will commit these changes with separate patch
................
r59072 | murf | 2007-03-20 14:15:56 -0400 (Tue, 20 Mar 2007) | 1 line
blocking 59070... it was just a repair, doesn't need to be here
................
r59073 | murf | 2007-03-20 14:18:06 -0400 (Tue, 20 Mar 2007) | 1 line
The fix for the AEL <<security hole>> (bug 9316) is here...
................
r59077 | file | 2007-03-20 16:44:58 -0400 (Tue, 20 Mar 2007) | 10 lines
Merged revisions 59076 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59076 | file | 2007-03-20 16:42:46 -0400 (Tue, 20 Mar 2007) | 2 lines
Copy len variable as well, should fix remaining IAX2 DTMF issues.
........
................
r59079 | tilghman | 2007-03-20 17:06:11 -0400 (Tue, 20 Mar 2007) | 10 lines
Merged revisions 59078 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59078 | tilghman | 2007-03-20 16:04:52 -0500 (Tue, 20 Mar 2007) | 2 lines
Fix defines for inline stack backtraces (only used by developers anyway)
........
................
r59080 | file | 2007-03-20 22:46:02 -0400 (Tue, 20 Mar 2007) | 2 lines
Make the database show command spit out how many results it got. (issue #9332 reported by junky)
................
r59082 | file | 2007-03-20 23:27:58 -0400 (Tue, 20 Mar 2007) | 10 lines
Merged revisions 59081 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59081 | file | 2007-03-20 23:25:48 -0400 (Tue, 20 Mar 2007) | 2 lines
Until we can do media level parsing for sendrecv/etc just use the first value found. This crept up when a phone was offered audio+video and returned an inactive video stream. chan_sip thought the phone said to put the person on hold but that was totally wrong. (issue #9319 reported by benbrown)
........
................
r59083 | file | 2007-03-20 23:33:57 -0400 (Tue, 20 Mar 2007) | 2 lines
Minor tweak. Only queue up an unhold control frame if we are actually on hold. This would have shown itself when a call was initially being setup and the SDP data was being parsed in.
................
r59088 | file | 2007-03-21 14:06:59 -0400 (Wed, 21 Mar 2007) | 18 lines
Merged revisions 59087 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r59087 | file | 2007-03-21 14:04:58 -0400 (Wed, 21 Mar 2007) | 10 lines
Merged revisions 59086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r59086 | file | 2007-03-21 14:03:20 -0400 (Wed, 21 Mar 2007) | 2 lines
Indicate the filename changed when it is changed. (issue #9311 reported by jsmith)
........
................
................
r59090 | file | 2007-03-21 14:10:01 -0400 (Wed, 21 Mar 2007) | 10 lines
Merged revisions 59089 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59089 | file | 2007-03-21 14:08:57 -0400 (Wed, 21 Mar 2007) | 2 lines
Add svg mimetype for pari.
........
................
r59146 | murf | 2007-03-22 10:48:09 -0400 (Thu, 22 Mar 2007) | 9 lines
Merged revisions 59145 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59145 | murf | 2007-03-22 08:40:53 -0600 (Thu, 22 Mar 2007) | 1 line
The stuff in utils was compiling with -O6 even if DONT_OPTIMIZE is set in menuconfig. Added the include to fix that
........
................
r59181 | kpfleming | 2007-03-22 19:39:26 -0400 (Thu, 22 Mar 2007) | 10 lines
Merged revisions 59180 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59180 | kpfleming | 2007-03-22 16:34:22 -0700 (Thu, 22 Mar 2007) | 2 lines
remove variables that are no longer used (--enable-dev-mode is good, developers should be using it)
........
................
r59183 | kpfleming | 2007-03-22 19:41:37 -0400 (Thu, 22 Mar 2007) | 10 lines
Merged revisions 59182 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59182 | kpfleming | 2007-03-22 16:40:01 -0700 (Thu, 22 Mar 2007) | 2 lines
don't allow string input to overrun the buffer to hold it
........
................
r59190 | murf | 2007-03-23 12:17:57 -0400 (Fri, 23 Mar 2007) | 17 lines
Merged revisions 59188 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r59188 | murf | 2007-03-23 10:09:01 -0600 (Fri, 23 Mar 2007) | 9 lines
Merged revisions 59186 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r59186 | murf | 2007-03-23 09:57:26 -0600 (Fri, 23 Mar 2007) | 1 line
Added a few words in the Macro doc strings about the behavior of macros with hangups (et al.), as per 9337
........
................
................
r59191 | file | 2007-03-23 12:41:18 -0400 (Fri, 23 Mar 2007) | 2 lines
Update modules.txt to new loader. (issue #9358 reported by eliel)
................
r59196 | file | 2007-03-23 21:42:11 -0400 (Fri, 23 Mar 2007) | 18 lines
Merged revisions 59195 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r59195 | file | 2007-03-23 21:39:44 -0400 (Fri, 23 Mar 2007) | 10 lines
Merged revisions 59194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r59194 | file | 2007-03-23 21:35:49 -0400 (Fri, 23 Mar 2007) | 2 lines
Only try to handle a response if it has a response code.
........
................
................
r59201 | file | 2007-03-26 11:20:17 -0400 (Mon, 26 Mar 2007) | 10 lines
Merged revisions 59200 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59200 | file | 2007-03-26 11:16:29 -0400 (Mon, 26 Mar 2007) | 2 lines
Have ast_copy_string magically appear in the aelparse binary! DONT_OPTIMIZE should now work once again.
........
................
r59203 | nadi | 2007-03-26 11:59:56 -0400 (Mon, 26 Mar 2007) | 12 lines
Merged revisions 59202 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59202 | nadi | 2007-03-26 17:25:53 +0200 (Mo, 26 Mär 2007) | 4 lines
* mISDN >= 1.2 provides a dsp pipeline for i.e. echo cancellation modules, make chan_misdn use it.
* add a check for linux/mISDNdsp.h to configure.ac and update the autogenerated files: 'configure', 'autoconfig.h.in'
(the 'configure' script was not in sync with the latest configure.ac, so the diff is a bit bigger than expected).
........
................
r59204 | mattf | 2007-03-26 12:46:07 -0400 (Mon, 26 Mar 2007) | 2 lines
Small API related SS7 updates.
................
r59205 | mattf | 2007-03-26 12:48:29 -0400 (Mon, 26 Mar 2007) | 3 lines
Fix bug in which parameter type we are passing. This shouldn't be a problem
since both types are the same underneath.
................
r59208 | russell | 2007-03-26 13:51:27 -0400 (Mon, 26 Mar 2007) | 15 lines
Merged revisions 59207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59207 | russell | 2007-03-26 12:45:55 -0500 (Mon, 26 Mar 2007) | 7 lines
The AUDIORTPQOS and VIDEORTPQOS variables are not fully functional in some
because they get set in sip_hangup. So, there are common situations where
the variables will not be available in the dialplan at all. So, this patch
provides an alternate method for getting to this information by introducing
AUDIORTPQOS and VIDEORTPQOS dialplan functions.
(issue #9370, patch by Corydon76, with some testing by blitzrage)
........
................
r59210 | murf | 2007-03-26 13:56:26 -0400 (Mon, 26 Mar 2007) | 9 lines
Merged revisions 59206 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59206 | murf | 2007-03-26 11:38:29 -0600 (Mon, 26 Mar 2007) | 1 line
A fix for the flex input files, DONT_COMPILE, and STANDALONE_AEL
........
................
r59211 | russell | 2007-03-26 13:57:50 -0400 (Mon, 26 Mar 2007) | 9 lines
Merged revisions 59209 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59209 | russell | 2007-03-26 12:53:07 -0500 (Mon, 26 Mar 2007) | 1 line
Rename the new dialplan functions to match the variable name
........
................
r59214 | file | 2007-03-26 14:14:33 -0400 (Mon, 26 Mar 2007) | 10 lines
Merged revisions 59213 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59213 | file | 2007-03-26 14:13:06 -0400 (Mon, 26 Mar 2007) | 2 lines
Make SpeechBackground obey the digit timeout value.
........
................
r59216 | russell | 2007-03-26 14:29:10 -0400 (Mon, 26 Mar 2007) | 11 lines
Merged revisions 59215 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59215 | russell | 2007-03-26 13:28:29 -0500 (Mon, 26 Mar 2007) | 3 lines
Fix some codec negotiation problems when CallerID support is not enabled in SLA.
(issue #9308, reported by twilson)
........
................
r59218 | russell | 2007-03-26 14:34:41 -0400 (Mon, 26 Mar 2007) | 12 lines
Merged revisions 59217 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59217 | russell | 2007-03-26 13:33:50 -0500 (Mon, 26 Mar 2007) | 4 lines
Somehow the code for building the email for voicemail got out of sync. This
change makes a few tweaks to get 1.4 in sync with trunk.
(issue #9301)
........
................
r59224 | file | 2007-03-26 15:35:24 -0400 (Mon, 26 Mar 2007) | 10 lines
Merged revisions 59223 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59223 | file | 2007-03-26 16:34:14 -0300 (Mon, 26 Mar 2007) | 2 lines
Add ability to specify no timeout. This means as soon as the prompt is done playing it moves on to the next priority.
........
................
r59226 | murf | 2007-03-26 16:27:02 -0400 (Mon, 26 Mar 2007) | 9 lines
Merged revisions 59225 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59225 | murf | 2007-03-26 14:06:12 -0600 (Mon, 26 Mar 2007) | 1 line
Fix for 9257; by eliminating the globals in main/config.c, we make it thread-safe, which is a minimum requirement.
........
................
r59229 | tilghman | 2007-03-26 17:44:59 -0400 (Mon, 26 Mar 2007) | 10 lines
Merged revisions 59227 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59227 | tilghman | 2007-03-26 16:37:41 -0500 (Mon, 26 Mar 2007) | 2 lines
Change this to a single dp function to make oej happy.
........
................
r59231 | tilghman | 2007-03-26 17:46:32 -0400 (Mon, 26 Mar 2007) | 9 lines
Blocked revisions 59230 via svnmerge
........
r59230 | tilghman | 2007-03-26 16:45:44 -0500 (Mon, 26 Mar 2007) | 2 lines
Oops, this should be case insensitive
........
................
r59233 | murf | 2007-03-26 17:47:37 -0400 (Mon, 26 Mar 2007) | 9 lines
Merged revisions 59228 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59228 | murf | 2007-03-26 15:41:32 -0600 (Mon, 26 Mar 2007) | 1 line
fix for 9373 (duplicate context in AEL crashes asterisk). I turned a duplicate context from a WARNING to an ERROR. Now you get a module load failure, and asterisk just exits. That's better than a crash, right\?
........
................
r59234 | murf | 2007-03-26 18:17:37 -0400 (Mon, 26 Mar 2007) | 1 line
updated the regressions with regards to 9373, the crash on double contexts, and brought other regressions up to date
................
r59236 | murf | 2007-03-26 18:24:16 -0400 (Mon, 26 Mar 2007) | 1 line
added the no. 18 regression test
................
Added:
team/file/ah/cdr/cdr_sqlite3_custom.c
- copied unchanged from r59236, trunk/cdr/cdr_sqlite3_custom.c
team/file/ah/configs/cdr_sqlite3_custom.conf
- copied unchanged from r59236, trunk/configs/cdr_sqlite3_custom.conf
team/file/ah/configs/res_config_sqlite.conf
- copied unchanged from r59236, trunk/configs/res_config_sqlite.conf
team/file/ah/doc/ael.tex
- copied unchanged from r59236, trunk/doc/ael.tex
team/file/ah/doc/ajam.tex
- copied unchanged from r59236, trunk/doc/ajam.tex
team/file/ah/doc/app-sms.tex
- copied unchanged from r59236, trunk/doc/app-sms.tex
team/file/ah/doc/ast_appdocs.tex
- copied unchanged from r59236, trunk/doc/ast_appdocs.tex
team/file/ah/doc/asterisk-conf.tex
- copied unchanged from r59236, trunk/doc/asterisk-conf.tex
team/file/ah/doc/asterisk.tex
- copied unchanged from r59236, trunk/doc/asterisk.tex
team/file/ah/doc/billing.tex
- copied unchanged from r59236, trunk/doc/billing.tex
team/file/ah/doc/cdrdriver.tex
- copied unchanged from r59236, trunk/doc/cdrdriver.tex
team/file/ah/doc/chaniax.tex
- copied unchanged from r59236, trunk/doc/chaniax.tex
team/file/ah/doc/channelvariables.tex
- copied unchanged from r59236, trunk/doc/channelvariables.tex
team/file/ah/doc/cliprompt.tex
- copied unchanged from r59236, trunk/doc/cliprompt.tex
team/file/ah/doc/configuration.tex
- copied unchanged from r59236, trunk/doc/configuration.tex
team/file/ah/doc/dundi.tex
- copied unchanged from r59236, trunk/doc/dundi.tex
team/file/ah/doc/enum.tex
- copied unchanged from r59236, trunk/doc/enum.tex
team/file/ah/doc/extensions.tex
- copied unchanged from r59236, trunk/doc/extensions.tex
team/file/ah/doc/freetds.tex
- copied unchanged from r59236, trunk/doc/freetds.tex
team/file/ah/doc/hardware.tex
- copied unchanged from r59236, trunk/doc/hardware.tex
team/file/ah/doc/ices.tex
- copied unchanged from r59236, trunk/doc/ices.tex
team/file/ah/doc/imapstorage.tex
- copied unchanged from r59236, trunk/doc/imapstorage.tex
team/file/ah/doc/ip-tos.tex
- copied unchanged from r59236, trunk/doc/ip-tos.tex
team/file/ah/doc/jitterbuffer.tex
- copied unchanged from r59236, trunk/doc/jitterbuffer.tex
team/file/ah/doc/localchannel.tex
- copied unchanged from r59236, trunk/doc/localchannel.tex
team/file/ah/doc/manager.tex
- copied unchanged from r59236, trunk/doc/manager.tex
team/file/ah/doc/misdn.tex
- copied unchanged from r59236, trunk/doc/misdn.tex
team/file/ah/doc/mp3.tex
- copied unchanged from r59236, trunk/doc/mp3.tex
team/file/ah/doc/odbcstorage.tex
- copied unchanged from r59236, trunk/doc/odbcstorage.tex
team/file/ah/doc/privacy.tex
- copied unchanged from r59236, trunk/doc/privacy.tex
team/file/ah/doc/queuelog.tex
- copied unchanged from r59236, trunk/doc/queuelog.tex
team/file/ah/doc/queues-with-callback-members.tex
- copied unchanged from r59236, trunk/doc/queues-with-callback-members.tex
team/file/ah/doc/realtime.tex
- copied unchanged from r59236, trunk/doc/realtime.tex
team/file/ah/doc/res_config_sqlite.txt
- copied unchanged from r59236, trunk/doc/res_config_sqlite.txt
team/file/ah/doc/security.tex
- copied unchanged from r59236, trunk/doc/security.tex
team/file/ah/pbx/ael/ael-test/ael-test18/
- copied from r59236, trunk/pbx/ael/ael-test/ael-test18/
team/file/ah/pbx/ael/ael-test/ael-test18/extensions.ael
- copied unchanged from r59236, trunk/pbx/ael/ael-test/ael-test18/extensions.ael
team/file/ah/pbx/ael/ael-test/ael-test19/
- copied from r59236, trunk/pbx/ael/ael-test/ael-test19/
team/file/ah/pbx/ael/ael-test/ael-test19/extensions.ael
- copied unchanged from r59236, trunk/pbx/ael/ael-test/ael-test19/extensions.ael
team/file/ah/pbx/ael/ael-test/ref.ael-test18
- copied unchanged from r59236, trunk/pbx/ael/ael-test/ref.ael-test18
team/file/ah/pbx/ael/ael-test/ref.ael-test19
- copied unchanged from r59236, trunk/pbx/ael/ael-test/ref.ael-test19
team/file/ah/res/res_config_sqlite.c
- copied unchanged from r59236, trunk/res/res_config_sqlite.c
Removed:
team/file/ah/doc/00README.1st
team/file/ah/doc/ael.txt
team/file/ah/doc/ajam.txt
team/file/ah/doc/app-sms.txt
team/file/ah/doc/apps.txt
team/file/ah/doc/asterisk-conf.txt
team/file/ah/doc/billing.txt
team/file/ah/doc/callingpres.txt
team/file/ah/doc/cdrdriver.txt
team/file/ah/doc/chaniax.txt
team/file/ah/doc/channels.txt
team/file/ah/doc/channelvariables.txt
team/file/ah/doc/cliprompt.txt
team/file/ah/doc/configuration.txt
team/file/ah/doc/cygwin.txt
team/file/ah/doc/dundi.txt
team/file/ah/doc/enum.txt
team/file/ah/doc/extconfig.txt
team/file/ah/doc/extensions.txt
team/file/ah/doc/freetds.txt
team/file/ah/doc/h323.txt
team/file/ah/doc/hardware.txt
team/file/ah/doc/iax.txt
team/file/ah/doc/ices.txt
team/file/ah/doc/imapstorage.txt
team/file/ah/doc/ip-tos.txt
team/file/ah/doc/jitterbuffer.txt
team/file/ah/doc/localchannel.txt
team/file/ah/doc/manager.txt
team/file/ah/doc/math.txt
team/file/ah/doc/misdn.txt
team/file/ah/doc/model.txt
team/file/ah/doc/mp3.txt
team/file/ah/doc/musiconhold-fpm.txt
team/file/ah/doc/mysql.txt
team/file/ah/doc/odbcstorage.txt
team/file/ah/doc/privacy.txt
team/file/ah/doc/queuelog.txt
team/file/ah/doc/queues-with-callback-members.txt
team/file/ah/doc/radius.txt
team/file/ah/doc/realtime.txt
team/file/ah/doc/security.txt
team/file/ah/doc/sla.pdf
Modified:
team/file/ah/ (props changed)
team/file/ah/CHANGES
team/file/ah/Makefile
team/file/ah/UPGRADE.txt
team/file/ah/apps/app_followme.c
team/file/ah/apps/app_macro.c
team/file/ah/apps/app_meetme.c
team/file/ah/apps/app_page.c
team/file/ah/apps/app_speech_utils.c
team/file/ah/apps/app_voicemail.c
team/file/ah/build_tools/make_buildopts_h
team/file/ah/build_tools/menuselect-deps.in
team/file/ah/build_tools/prep_tarball
team/file/ah/cdr/cdr_radius.c
team/file/ah/cdr/cdr_sqlite.c
team/file/ah/channels/chan_iax2.c
team/file/ah/channels/chan_misdn.c
team/file/ah/channels/chan_sip.c
team/file/ah/channels/chan_zap.c
team/file/ah/channels/iax2-parser.c
team/file/ah/channels/misdn/Makefile
team/file/ah/channels/misdn/chan_misdn_config.h
team/file/ah/channels/misdn/isdn_lib.c
team/file/ah/channels/misdn/isdn_lib.h
team/file/ah/channels/misdn_config.c
team/file/ah/configs/extconfig.conf.sample
team/file/ah/configs/sip_notify.conf.sample
team/file/ah/configs/sla.conf.sample
team/file/ah/configure
team/file/ah/configure.ac
team/file/ah/doc/PEERING
team/file/ah/doc/modules.txt
team/file/ah/doc/sla.tex
team/file/ah/funcs/func_realtime.c
team/file/ah/funcs/func_strings.c
team/file/ah/include/asterisk/ael_structs.h
team/file/ah/include/asterisk/autoconfig.h.in
team/file/ah/include/asterisk/rtp.h
team/file/ah/main/ast_expr2.fl
team/file/ah/main/ast_expr2f.c
team/file/ah/main/config.c
team/file/ah/main/db.c
team/file/ah/main/http.c
team/file/ah/main/loader.c
team/file/ah/main/logger.c
team/file/ah/main/pbx.c
team/file/ah/main/rtp.c
team/file/ah/makeopts.in
team/file/ah/pbx/ael/ael-test/ref.ael-test7
team/file/ah/pbx/ael/ael-test/ref.ael-vtest13
team/file/ah/pbx/ael/ael-test/ref.ael-vtest17
team/file/ah/pbx/ael/ael.flex
team/file/ah/pbx/ael/ael_lex.c
team/file/ah/pbx/pbx_ael.c
team/file/ah/res/res_monitor.c
team/file/ah/utils/Makefile
Propchange: team/file/ah/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/file/ah/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/file/ah/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 26 19:07:02 2007
@@ -1,1 +1,1 @@
-/trunk:1-58852
+/trunk:1-59244
Modified: team/file/ah/CHANGES
URL: http://svn.digium.com/view/asterisk/team/file/ah/CHANGES?view=diff&rev=59245&r1=59244&r2=59245
==============================================================================
--- team/file/ah/CHANGES (original)
+++ team/file/ah/CHANGES Mon Mar 26 19:07:02 2007
@@ -66,6 +66,8 @@
* 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)
--------------------------------
Modified: team/file/ah/Makefile
URL: http://svn.digium.com/view/asterisk/team/file/ah/Makefile?view=diff&rev=59245&r1=59244&r2=59245
==============================================================================
--- team/file/ah/Makefile (original)
+++ team/file/ah/Makefile Mon Mar 26 19:07:02 2007
@@ -46,6 +46,7 @@
export ASTCONFPATH
export NOISY_BUILD
export MENUSELECT_CFLAGS
+export AST_DEVMODE
export CC
export CXX
export AR
@@ -673,14 +674,42 @@
menuconfig: menuselect
+gmenuconfig: gmenuselect
+
menuselect: menuselect/menuselect menuselect-tree
- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+gmenuselect: menuselect/gmenuselect menuselect-tree
+ - at menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+
menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
@CC="$(HOST_CC)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+
+menuselect/gmenuselect: makeopts menuselect/menuselect.c menuselect/menuselect_gtk.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
+ @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent"
menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
@echo "Generating input for menuselect ..."
@build_tools/prep_moduledeps > $@
+asterisk.pdf: doc/asterisk.pdf
+
+doc/asterisk.pdf: $(wildcard doc/*.tex)
+ifeq ($(findstring rubber,$(RUBBER)),)
+ @echo "**********************************************"
+ @echo "** You must install the \"rubber\" tool ***"
+ @echo "** to generate the Asterisk reference PDF. ***"
+ @echo "**********************************************"
+else
+ @echo "**********************************************"
+ @echo "** The Asterisk reference PDF will now be ***"
+ @echo "** generated. When complete, it will be ***"
+ @echo "** located at doc/asterisk.pdf. ***"
+ @echo "**********************************************"
+ @cp doc/asterisk.tex doc/asterisk.tex.orig
+ @sed -i -e 's/ASTERISKVERSION/$(ASTERISKVERSION)/' doc/asterisk.tex
+ @cd doc && $(RUBBER) --pdf asterisk.tex
+ @mv doc/asterisk.tex.orig doc/asterisk.tex
+endif
+
.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
Modified: team/file/ah/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/file/ah/UPGRADE.txt?view=diff&rev=59245&r1=59244&r2=59245
==============================================================================
--- team/file/ah/UPGRADE.txt (original)
+++ team/file/ah/UPGRADE.txt Mon Mar 26 19:07:02 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/file/ah/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/team/file/ah/apps/app_followme.c?view=diff&rev=59245&r1=59244&r2=59245
==============================================================================
--- team/file/ah/apps/app_followme.c (original)
+++ team/file/ah/apps/app_followme.c Mon Mar 26 19:07:02 2007
@@ -952,7 +952,7 @@
ast_log(LOG_DEBUG, "New profile %s.\n", args.followmeid);
if (!f) {
ast_log(LOG_WARNING, "Profile requested, %s, not found in the configuration.\n", args.followmeid);
- res = -1;
+ res = 0;
} else {
/* XXX TODO: Reinsert the db check value to see whether or not follow-me is on or off */
Modified: team/file/ah/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/file/ah/apps/app_macro.c?view=diff&rev=59245&r1=59244&r2=59245
==============================================================================
--- team/file/ah/apps/app_macro.c (original)
+++ team/file/ah/apps/app_macro.c Mon Mar 26 19:07:02 2007
@@ -61,6 +61,11 @@
"will be returned at the location of the Goto.\n"
"If ${MACRO_OFFSET} is set at termination, Macro will attempt to continue\n"
"at priority MACRO_OFFSET + N + 1 if such a step exists, and N + 1 otherwise.\n"
+"Extensions: While a macro is being executed, it becomes the current context.\n"
+" This means that if a hangup occurs, for instance, that the macro\n"
+" will be searched for an 'h' extension, NOT the context from which\n"
+" the macro was called. So, make sure to define all appropriate\n"
+" extensions in your macro! (Note: AEL does not use macros)\n"
"WARNING: Because of the way Macro is implemented (it executes the priorities\n"
" contained within it via sub-engine), and a fixed per-thread\n"
" memory stack allowance, macros are limited to 7 levels\n"
Modified: team/file/ah/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/file/ah/apps/app_meetme.c?view=diff&rev=59245&r1=59244&r2=59245
==============================================================================
--- team/file/ah/apps/app_meetme.c (original)
+++ team/file/ah/apps/app_meetme.c Mon Mar 26 19:07:02 2007
@@ -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,
};
@@ -3483,6 +3486,8 @@
char *tech, *tech_data;
struct ast_dial *dial;
struct sla_ringing_station *ringing_station;
+ const char *cid_name = NULL, *cid_num = NULL;
[... 5839 lines stripped ...]
More information about the asterisk-commits
mailing list