[asterisk-commits] russell: branch russell/chan_console r51414 - in
/team/russell/chan_console: ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Jan 22 12:44:39 MST 2007
Author: russell
Date: Mon Jan 22 13:44:38 2007
New Revision: 51414
URL: http://svn.digium.com/view/asterisk?view=rev&rev=51414
Log:
Merged revisions 51144,51147,51149,51151-51152,51155,51160,51163,51166,51168,51171,51173,51177,51183,51189,51193,51196,51199,51206-51207,51212,51214-51215,51221,51234,51237,51242,51244,51246-51247,51249,51252,51257,51263,51266,51273,51275,51285-51299,51301,51303-51305,51308-51310,51312,51314,51327,51329,51332,51340,51342,51344,51349,51351-51353,51405,51408,51413 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r51144 | file | 2007-01-16 11:23:31 -0600 (Tue, 16 Jan 2007) | 2 lines
Add support for G729 passthrough with Sigma Designs boards. (issue #8829 reported by ywalther)
................
r51147 | qwell | 2007-01-16 11:39:39 -0600 (Tue, 16 Jan 2007) | 14 lines
Merged revisions 51146 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51146 | qwell | 2007-01-16 11:36:53 -0600 (Tue, 16 Jan 2007) | 6 lines
Display more useful output when streaming files.
Include the channel name to which the file is being played.
Issue 8828, patch by junky.
........
................
r51149 | file | 2007-01-16 11:42:47 -0600 (Tue, 16 Jan 2007) | 18 lines
Merged revisions 51148 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51148 | file | 2007-01-16 12:39:50 -0500 (Tue, 16 Jan 2007) | 10 lines
Merged revisions 51145 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51145 | file | 2007-01-16 12:36:50 -0500 (Tue, 16 Jan 2007) | 2 lines
Return previous behavior. ParkedCalls will be able to do DTMF based transfers again. trunk however will get an option to allow this to be set on/off. (issue #8804 reported by nortex)
........
................
................
r51151 | mogorman | 2007-01-16 11:47:26 -0600 (Tue, 16 Jan 2007) | 10 lines
Merged revisions 51150 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.4
........
r51150 | mogorman | 2007-01-16 11:46:12 -0600 (Tue, 16 Jan 2007) | 2 lines
minor things i missed before i get jumped on
........
................
r51152 | file | 2007-01-16 11:50:25 -0600 (Tue, 16 Jan 2007) | 2 lines
Add parkedcalltransfers option for res_features. This basically enables/disables DTMF based transfers. If you want to get former behavior you will have to make sure it is enabled.
................
r51155 | kpfleming | 2007-01-16 13:01:42 -0600 (Tue, 16 Jan 2007) | 2 lines
remove pointless DEBUG message (watch those patch merges, people!)
................
r51160 | tilghman | 2007-01-16 15:33:57 -0600 (Tue, 16 Jan 2007) | 18 lines
Merged revisions 51159 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51159 | tilghman | 2007-01-16 15:28:39 -0600 (Tue, 16 Jan 2007) | 10 lines
Merged revisions 51158 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51158 | tilghman | 2007-01-16 15:26:06 -0600 (Tue, 16 Jan 2007) | 2 lines
Postgres driver doesn't like a NULL pointer when retrieving the length (Bug 8513)
........
................
................
r51163 | tilghman | 2007-01-16 15:52:10 -0600 (Tue, 16 Jan 2007) | 18 lines
Merged revisions 51162 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51162 | tilghman | 2007-01-16 15:51:15 -0600 (Tue, 16 Jan 2007) | 10 lines
Merged revisions 51161 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51161 | tilghman | 2007-01-16 15:50:04 -0600 (Tue, 16 Jan 2007) | 2 lines
Add documentation walkthrough on getting Postgres to work with voicemail (from Issue 8513)
........
................
................
r51166 | qwell | 2007-01-16 16:08:54 -0600 (Tue, 16 Jan 2007) | 10 lines
Merged revisions 51165 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51165 | qwell | 2007-01-16 16:07:53 -0600 (Tue, 16 Jan 2007) | 2 lines
change documentation to reflect new procedure in 1.4/trunk
........
................
r51168 | qwell | 2007-01-16 16:53:13 -0600 (Tue, 16 Jan 2007) | 14 lines
Merged revisions 51167 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51167 | qwell | 2007-01-16 16:50:19 -0600 (Tue, 16 Jan 2007) | 6 lines
Fix an issue with IMAP storage and realtime voicemail.
Also update the vmdb sql script for IMAP specific options.
Issue 8819, initial patches by bsmithurst (slightly modified by me)
........
................
r51171 | qwell | 2007-01-16 18:22:20 -0600 (Tue, 16 Jan 2007) | 12 lines
Merged revisions 51170 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51170 | qwell | 2007-01-16 18:20:56 -0600 (Tue, 16 Jan 2007) | 4 lines
Fix issue with dtmf continuation packets when the dtmf digit is 0...
Issue 8831
........
................
r51173 | file | 2007-01-16 18:50:59 -0600 (Tue, 16 Jan 2007) | 10 lines
Merged revisions 51172 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51172 | file | 2007-01-16 19:46:29 -0500 (Tue, 16 Jan 2007) | 2 lines
Move rescheduling of lagrq/pings into the scheduler callback.
........
................
r51177 | kpfleming | 2007-01-16 19:30:04 -0600 (Tue, 16 Jan 2007) | 10 lines
Merged revisions 51176 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51176 | kpfleming | 2007-01-16 19:29:12 -0600 (Tue, 16 Jan 2007) | 2 lines
a few more coding style cleanups and one bug fix (from AnthonyL)
........
................
r51183 | file | 2007-01-17 00:37:47 -0600 (Wed, 17 Jan 2007) | 10 lines
Merged revisions 51182 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51182 | file | 2007-01-17 01:36:41 -0500 (Wed, 17 Jan 2007) | 2 lines
Return the correct result when directly writing out a packet so that the core doesn't then decide to handle it the regular way again. (issue #8833 reported by rcourtna)
........
................
r51189 | qwell | 2007-01-17 11:37:56 -0600 (Wed, 17 Jan 2007) | 10 lines
Merged revisions 51186 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51186 | qwell | 2007-01-17 11:36:53 -0600 (Wed, 17 Jan 2007) | 2 lines
re-add "password" for realtime voicemail
........
................
r51193 | file | 2007-01-17 13:43:13 -0600 (Wed, 17 Jan 2007) | 2 lines
Don't hold channel lock while sleeping/waiting for audio stream to get setup. (issue #8834 reported by phsultan)
................
r51196 | tilghman | 2007-01-17 14:57:51 -0600 (Wed, 17 Jan 2007) | 20 lines
Merged revisions 51195 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51195 | tilghman | 2007-01-17 14:56:15 -0600 (Wed, 17 Jan 2007) | 12 lines
Merged revisions 51194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51194 | tilghman | 2007-01-17 14:52:21 -0600 (Wed, 17 Jan 2007) | 4 lines
When ast_strip_quoted was called with a zero-length string, it would treat a
NULL as if it were the quoting character (and would thus return the string
in memory immediately following the passed-in string).
........
................
................
r51199 | russell | 2007-01-17 15:20:22 -0600 (Wed, 17 Jan 2007) | 19 lines
Merged revisions 51198 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51198 | russell | 2007-01-17 15:18:35 -0600 (Wed, 17 Jan 2007) | 11 lines
Merged revisions 51197 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51197 | russell | 2007-01-17 15:17:21 -0600 (Wed, 17 Jan 2007) | 3 lines
Move the check for a failure of ast_channel_alloc() to before locking the
pvt structure again. Otherwise, on a failure, this will cause a deadlock.
........
................
................
r51206 | russell | 2007-01-17 17:31:40 -0600 (Wed, 17 Jan 2007) | 12 lines
Merged revisions 51204 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51204 | russell | 2007-01-17 16:09:52 -0600 (Wed, 17 Jan 2007) | 4 lines
Instead of dividing the offset by 2 directly, make it more clear that the
offset is being scaled by the size of the elements in the buffer.
(Inspired by a discussing on the asterisk-dev list about this code)
........
................
r51207 | russell | 2007-01-17 17:35:43 -0600 (Wed, 17 Jan 2007) | 13 lines
Merged revisions 51205 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51205 | russell | 2007-01-17 17:31:11 -0600 (Wed, 17 Jan 2007) | 5 lines
Fix some instances where when loading func_odbc, a double-free could occur.
Also, remove an unneeded error message. If the failure condition is
actually a memory allocation failure, a log message will already be
generated automatically.
........
................
r51212 | file | 2007-01-17 18:20:50 -0600 (Wed, 17 Jan 2007) | 10 lines
Merged revisions 51211 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51211 | file | 2007-01-17 19:18:44 -0500 (Wed, 17 Jan 2007) | 2 lines
Pass data as well for hold/unhold/vidupdate frames. (issue #8840 reported by mdu113)
........
................
r51214 | file | 2007-01-17 18:49:58 -0600 (Wed, 17 Jan 2007) | 10 lines
Merged revisions 51213 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51213 | file | 2007-01-17 19:48:55 -0500 (Wed, 17 Jan 2007) | 2 lines
Build the IMAP remote directory string better and properly. Fix an issue with encoding the GSM voicemail when attaching to the voicemail. (issue #8808 reported by akohlsmith)
........
................
r51215 | file | 2007-01-17 23:24:08 -0600 (Wed, 17 Jan 2007) | 2 lines
Add 's' option to Page application which checks devicestate before dialing. (issue #8673 reported by sunder)
................
r51221 | pcadach | 2007-01-18 00:59:22 -0600 (Thu, 18 Jan 2007) | 1 line
Update ast_append_ha() usage
................
r51234 | russell | 2007-01-18 11:33:33 -0600 (Thu, 18 Jan 2007) | 11 lines
Merged revisions 51233 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51233 | russell | 2007-01-18 11:18:43 -0600 (Thu, 18 Jan 2007) | 3 lines
Make the "hasmanager" option in users.conf actually have an effect.
(issue #8740, LnxPrgr3)
........
................
r51237 | tilghman | 2007-01-18 11:52:56 -0600 (Thu, 18 Jan 2007) | 18 lines
Merged revisions 51236 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51236 | tilghman | 2007-01-18 11:49:41 -0600 (Thu, 18 Jan 2007) | 10 lines
Merged revisions 51235 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51235 | tilghman | 2007-01-18 11:42:17 -0600 (Thu, 18 Jan 2007) | 2 lines
Document all the fields, including the indication that "uniqueid" should not be renamed.
........
................
................
r51242 | qwell | 2007-01-18 12:36:17 -0600 (Thu, 18 Jan 2007) | 10 lines
Merged revisions 51241 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51241 | qwell | 2007-01-18 12:28:29 -0600 (Thu, 18 Jan 2007) | 2 lines
Fix an issue with deprecated commands
........
................
r51244 | file | 2007-01-18 12:39:21 -0600 (Thu, 18 Jan 2007) | 10 lines
Merged revisions 51243 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51243 | file | 2007-01-18 13:36:35 -0500 (Thu, 18 Jan 2007) | 2 lines
Copy MOH settings when calling a peer so that if they put someone on hold or get put on hold themselves they get the right music class. (issue #8840 reported by mdu113)
........
................
r51246 | qwell | 2007-01-18 12:50:43 -0600 (Thu, 18 Jan 2007) | 11 lines
Blocked revisions 51245 via svnmerge
........
r51245 | qwell | 2007-01-18 12:42:00 -0600 (Thu, 18 Jan 2007) | 4 lines
Fix an issue with file name completion in "module load" and "load".
Issue 8846
........
................
r51247 | russell | 2007-01-18 12:54:51 -0600 (Thu, 18 Jan 2007) | 5 lines
Fix trunk version of manager support for users.conf. Now it actually pays
attention to the "hasmanager" option.
(Thanks to Anthony L. for pointing out that this was broken!)
................
r51249 | qwell | 2007-01-18 13:03:25 -0600 (Thu, 18 Jan 2007) | 4 lines
Fix filename completion for "module load" and "load" CLI commands.
Issue 8846
................
r51252 | file | 2007-01-18 13:19:24 -0600 (Thu, 18 Jan 2007) | 10 lines
Merged revisions 51251 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51251 | file | 2007-01-18 14:17:34 -0500 (Thu, 18 Jan 2007) | 2 lines
Only start timeout once we reach the end of the files to play back.
........
................
r51257 | tilghman | 2007-01-18 15:15:59 -0600 (Thu, 18 Jan 2007) | 18 lines
Merged revisions 51256 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51256 | tilghman | 2007-01-18 15:14:24 -0600 (Thu, 18 Jan 2007) | 10 lines
Merged revisions 51255 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51255 | tilghman | 2007-01-18 15:11:34 -0600 (Thu, 18 Jan 2007) | 2 lines
If a timezone is not specified, assume localtime (instead of gmtime) (Issue #7748)
........
................
................
r51263 | russell | 2007-01-18 15:57:55 -0600 (Thu, 18 Jan 2007) | 13 lines
Merged revisions 51262 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51262 | russell | 2007-01-18 15:54:23 -0600 (Thu, 18 Jan 2007) | 5 lines
Ensure that the locations given to the Asterisk configure script for ncurses,
curses, termcap, or tinfo are further passed along to the editline configure
script. This fixes some cross-compilation environments.
(issue #8637, reported by ovi, patch by me)
........
................
r51266 | qwell | 2007-01-18 16:56:35 -0600 (Thu, 18 Jan 2007) | 12 lines
Merged revisions 51265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51265 | qwell | 2007-01-18 16:50:23 -0600 (Thu, 18 Jan 2007) | 4 lines
Add some more checks for option_debug before ast_log(LOG_DEBUG, ...) calls.
Issue 8832, patch(es) by tgrman
........
................
r51273 | dhubbard | 2007-01-18 18:06:35 -0600 (Thu, 18 Jan 2007) | 19 lines
Merged revisions 51272 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51272 | dhubbard | 2007-01-18 17:56:49 -0600 (Thu, 18 Jan 2007) | 11 lines
Merged revisions 51271 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51271 | dhubbard | 2007-01-18 17:47:10 -0600 (Thu, 18 Jan 2007) | 3 lines
issue 7877: chan_zap module reload does not use default/initialized values on subsequent loads. Reset configuration variables to default values prior to parsing configuration file.
........
................
................
r51275 | dhubbard | 2007-01-18 18:28:25 -0600 (Thu, 18 Jan 2007) | 11 lines
Merged revisions 51274 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51274 | dhubbard | 2007-01-18 18:17:32 -0600 (Thu, 18 Jan 2007) | 3 lines
chan_zap compiles without libpri after committing 7877 patch
........
................
r51285 | rizzo | 2007-01-19 03:32:13 -0600 (Fri, 19 Jan 2007) | 10 lines
simplify checking for zaptel version and location
(for linux, this is functionally equivalent to the previous
method; for FreeBSD, it re-adds inspection in $PREFIX/zaptel.h).
Please wait to regenerate the "configure" file as i have
another few pending changes to configure.ac
Not applicable to 1.4 until acinclude.m4 is also updated.
................
r51286 | rizzo | 2007-01-19 03:36:27 -0600 (Fri, 19 Jan 2007) | 7 lines
remove a useless (and harmful on some platforms) -lnsl
from IKSEMEL_LIB.
Actually i am not even sure whether
-lgcrypt -lgpg-error are needed.
................
r51287 | rizzo | 2007-01-19 03:39:02 -0600 (Fri, 19 Jan 2007) | 6 lines
Add check for backtrace support on platforms that do not have
it natively.
Part of it leaked in in a previous commit.
................
r51288 | rizzo | 2007-01-19 03:44:55 -0600 (Fri, 19 Jan 2007) | 13 lines
add comments that AC_USE_SYSTEM_EXTENSIONS and AST_PROG_LD
do not work on FreeBSD - presumably they depend on some
auto* feature that is not installed by default.
I am not sure on what is a proper fix. In my local copy
i simply comment them out.
The AST_PROG_LD is a long standing isse, there were attempts
to fix it in the past but probably not enough has been copied
to acinclude.m4, and i had forgotten about it because i
commented out this call in configure.ac long ago
................
r51289 | rizzo | 2007-01-19 09:32:17 -0600 (Fri, 19 Jan 2007) | 3 lines
forgot to add BKTR_INCLUDE and BKTR_LIB in makeopts.in
................
r51290 | rizzo | 2007-01-19 09:48:13 -0600 (Fri, 19 Jan 2007) | 10 lines
Add a stub file to find the zaptel headers in the right
place, rather than repeating the check on every single file.
Changes to the individual files are coming.
The header file name has been suggested by kevin.
Approved by: kpfleming
................
r51291 | rizzo | 2007-01-19 09:59:05 -0600 (Fri, 19 Jan 2007) | 3 lines
another freebsd-specific check for zaptel compatibility
................
r51292 | rizzo | 2007-01-19 10:16:19 -0600 (Fri, 19 Jan 2007) | 4 lines
include "asterisk/zapata.h" instead of looking
directly for the zaptel.h and tonezone.h
................
r51293 | rizzo | 2007-01-19 10:21:24 -0600 (Fri, 19 Jan 2007) | 7 lines
include "asterisk/zapata.h" instead of testing for
the location of the header files.
On passing, add a cast to insure -Werror clean compilation
on FreeBSD 6.x, where time_t does not match %ld
................
r51294 | rizzo | 2007-01-19 10:24:11 -0600 (Fri, 19 Jan 2007) | 3 lines
include "asterisk/zapata.h" to get the zaptel headers
................
r51295 | rizzo | 2007-01-19 10:28:24 -0600 (Fri, 19 Jan 2007) | 3 lines
include "asterisk/zapata.h" to get the zaptel headers.
................
r51296 | russell | 2007-01-19 10:30:00 -0600 (Fri, 19 Jan 2007) | 4 lines
Break out of the config processing loop for manager.conf once the correct user
has been found so that 'cat' is non-NULL. This way, users.conf is only checked
when necessary. (issue #8852, akohlsmith, committed patch a bit different)
................
r51297 | rizzo | 2007-01-19 10:32:05 -0600 (Fri, 19 Jan 2007) | 4 lines
slight change to the initialization of a structure,
also using '\0' to make it clear we need a (char)0
................
r51298 | rizzo | 2007-01-19 10:35:37 -0600 (Fri, 19 Jan 2007) | 3 lines
whoops, fix a cut&paste error...
................
r51299 | rizzo | 2007-01-19 10:40:25 -0600 (Fri, 19 Jan 2007) | 5 lines
include "asterisk/zapata.h" to get the zaptel headers.
this should be the last one left around...
................
r51301 | rizzo | 2007-01-19 10:51:31 -0600 (Fri, 19 Jan 2007) | 3 lines
forgot to add AST_LIBS += $(BKTR_LIB)
................
r51303 | russell | 2007-01-19 11:02:36 -0600 (Fri, 19 Jan 2007) | 20 lines
Merged revisions 51302 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51302 | russell | 2007-01-19 10:56:17 -0600 (Fri, 19 Jan 2007) | 12 lines
Merged revisions 51300 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51300 | russell | 2007-01-19 10:44:09 -0600 (Fri, 19 Jan 2007) | 4 lines
Fix a memory leak on command line tab completion. The container for the
matches was freed, but the individual matches themselves were not.
(issue #8851, arkadia)
........
................
................
r51304 | russell | 2007-01-19 11:19:45 -0600 (Fri, 19 Jan 2007) | 2 lines
Include tonezone.h for linux, too
................
r51305 | russell | 2007-01-19 11:19:59 -0600 (Fri, 19 Jan 2007) | 2 lines
Regenerate configure script to reflect recent zaptel changes
................
r51308 | rizzo | 2007-01-19 11:38:28 -0600 (Fri, 19 Jan 2007) | 3 lines
remove variable declaration in the middle of a block
................
r51309 | rizzo | 2007-01-19 11:45:46 -0600 (Fri, 19 Jan 2007) | 4 lines
sizeof() is compatible with format %d so don't be too
picky on printf formats.
................
r51310 | rizzo | 2007-01-19 11:48:48 -0600 (Fri, 19 Jan 2007) | 4 lines
in the interest of portability, avoid using %zd when all
we need is to print is an integer that fits in 16 bits.
................
r51312 | rizzo | 2007-01-19 12:00:00 -0600 (Fri, 19 Jan 2007) | 10 lines
As the comment in the diff says:
AST_INLINE_API() is a macro that takes a block of code as an argument.
Using preprocessor #directives in the argument is not supported by all
compilers, and it is a bit of an obfuscation anyways, so avoid it.
As a workaround, define a macro that produces either its argument
or nothing, and use that instead of #ifdef/#endif within the
argument to AST_INLINE_API().
................
r51314 | russell | 2007-01-19 12:06:03 -0600 (Fri, 19 Jan 2007) | 31 lines
Merged revisions 51311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51311 | russell | 2007-01-19 11:49:38 -0600 (Fri, 19 Jan 2007) | 23 lines
Merge the changes from the /team/group/vldtmf_fixup branch.
The main bug being addressed here is a problem introduced when two SIP
channels using SIP INFO dtmf have their media directly bridged. So, when a
DTMF END frame comes into Asterisk from an incoming INFO message, Asterisk
would try to emulate a digit of some length by first sending a DTMF BEGIN
frame and sending a DTMF END later timed off of incoming audio. However,
since there was no audio coming in, the DTMF_END was never generated. This
caused DTMF based features to no longer work.
To fix this, the core now knows when a channel doesn't care about DTMF BEGIN
frames (such as a SIP channel sending INFO dtmf). If this is the case, then
Asterisk will not emulate a digit of some length, and will instead just pass
through the single DTMF END event.
Channel drivers also now get passed the length of the digit to their digit_end
callback. This improves SIP INFO support even further by enabling us to put
the real digit duration in the INFO message instead of a hard coded 250ms.
Also, for an incoming INFO message, the duration is read from the frame and
passed into the core instead of just getting ignored.
(issue #8597, maybe others...)
........
................
r51327 | russell | 2007-01-19 13:03:43 -0600 (Fri, 19 Jan 2007) | 10 lines
Merged revisions 51326 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51326 | russell | 2007-01-19 13:02:55 -0600 (Fri, 19 Jan 2007) | 2 lines
Bump the cleancount since my last commit changed the channel structure.
........
................
r51329 | russell | 2007-01-19 13:09:04 -0600 (Fri, 19 Jan 2007) | 13 lines
Merged revisions 51328 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51328 | russell | 2007-01-19 13:08:25 -0600 (Fri, 19 Jan 2007) | 5 lines
Fix VLDTMF support in chan_gtalk. AST_FRAME_DTMF and AST_FRAME_DTMF_END are
actually the same thing. So, a digit would have been interpreted incorrectly
here. Since the channel driver will always have the begin and end callbacks
called for a digit, only support the button-down and button-up messages.
........
................
r51332 | russell | 2007-01-19 13:31:54 -0600 (Fri, 19 Jan 2007) | 11 lines
Merged revisions 51331 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51331 | russell | 2007-01-19 13:30:54 -0600 (Fri, 19 Jan 2007) | 3 lines
Add a couple more processors that need optimizations excluded.
(issue #8637)
........
................
r51340 | russell | 2007-01-19 15:21:03 -0600 (Fri, 19 Jan 2007) | 10 lines
Merged revisions 51339 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51339 | russell | 2007-01-19 15:20:20 -0600 (Fri, 19 Jan 2007) | 2 lines
Remove a variable that was declared twice.
........
................
r51342 | russell | 2007-01-19 16:34:13 -0600 (Fri, 19 Jan 2007) | 10 lines
Merged revisions 51341 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51341 | russell | 2007-01-19 16:19:10 -0600 (Fri, 19 Jan 2007) | 2 lines
Remove another duplicated definition
........
................
r51344 | russell | 2007-01-19 18:13:52 -0600 (Fri, 19 Jan 2007) | 10 lines
Merged revisions 51343 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51343 | russell | 2007-01-19 18:13:06 -0600 (Fri, 19 Jan 2007) | 2 lines
Remove an unused instance of an unnamed enum.
........
................
r51349 | qwell | 2007-01-20 00:18:09 -0600 (Sat, 20 Jan 2007) | 16 lines
Merged revisions 51348 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51348 | qwell | 2007-01-20 00:16:06 -0600 (Sat, 20 Jan 2007) | 8 lines
Fix German language support in say.conf
Properly support 21, 31, 41, 51, 61, 71, 81, and 91.
einundzwanzig has the same format as zweiundzwanzig (as do all other "_ZX" spoken numerals)
Fix support for numbers in the 10,000,000 to 99,999,999 range.
Add support for numbers in the 100,000,000 to 999,999,999 range.
........
................
r51351 | qwell | 2007-01-20 00:54:45 -0600 (Sat, 20 Jan 2007) | 13 lines
Merged revisions 51350 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51350 | qwell | 2007-01-20 00:53:49 -0600 (Sat, 20 Jan 2007) | 5 lines
Fix Italian numeral support in say.conf for "_[2-9]00" case.
"2131" would've translated to something along the lines of (pardon my..Italian {or lack thereof})
"duecentocentotrentuno", which makes no sense at all.
........
................
r51352 | russell | 2007-01-20 12:27:35 -0600 (Sat, 20 Jan 2007) | 2 lines
Add a comment that the frame type constants are transmitted directly over IAX2.
................
r51353 | tilghman | 2007-01-20 21:25:57 -0600 (Sat, 20 Jan 2007) | 2 lines
Fix bug introduced during constification (reported by tzanger via IRC)
................
r51405 | oej | 2007-01-22 13:00:25 -0600 (Mon, 22 Jan 2007) | 2 lines
Remove (to quote Rizzo) "useless" variable.
................
r51408 | file | 2007-01-22 13:22:07 -0600 (Mon, 22 Jan 2007) | 18 lines
Merged revisions 51407 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51407 | file | 2007-01-22 14:13:44 -0500 (Mon, 22 Jan 2007) | 10 lines
Merged revisions 51406 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51406 | file | 2007-01-22 14:08:52 -0500 (Mon, 22 Jan 2007) | 2 lines
Move filestream creation to Mixmonitor loop. This will prevent a blank file from being created if no frames ever pass through to be recorded. (issue #7589 reported by steve_mcneil)
........
................
................
r51413 | murf | 2007-01-22 13:42:28 -0600 (Mon, 22 Jan 2007) | 9 lines
Merged revisions 51409 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51409 | murf | 2007-01-22 12:28:51 -0700 (Mon, 22 Jan 2007) | 1 line
This fixes 8836, according to dnatural
........
................
Added:
team/russell/chan_console/doc/voicemail_odbc_postgresql.txt
- copied unchanged from r51413, trunk/doc/voicemail_odbc_postgresql.txt
team/russell/chan_console/include/asterisk/zapata.h
- copied unchanged from r51413, trunk/include/asterisk/zapata.h
Modified:
team/russell/chan_console/ (props changed)
team/russell/chan_console/.cleancount
team/russell/chan_console/CHANGES
team/russell/chan_console/Makefile
team/russell/chan_console/acinclude.m4
team/russell/chan_console/apps/app_flash.c
team/russell/chan_console/apps/app_meetme.c
team/russell/chan_console/apps/app_mixmonitor.c
team/russell/chan_console/apps/app_page.c
team/russell/chan_console/apps/app_rpt.c
team/russell/chan_console/apps/app_speech_utils.c
team/russell/chan_console/apps/app_voicemail.c
team/russell/chan_console/apps/app_zapbarge.c
team/russell/chan_console/apps/app_zapras.c
team/russell/chan_console/apps/app_zapscan.c
team/russell/chan_console/channels/chan_agent.c
team/russell/chan_console/channels/chan_alsa.c
team/russell/chan_console/channels/chan_features.c
team/russell/chan_console/channels/chan_gtalk.c
team/russell/chan_console/channels/chan_h323.c
team/russell/chan_console/channels/chan_iax2.c
team/russell/chan_console/channels/chan_jingle.c
team/russell/chan_console/channels/chan_local.c
team/russell/chan_console/channels/chan_mgcp.c
team/russell/chan_console/channels/chan_misdn.c
team/russell/chan_console/channels/chan_oss.c
team/russell/chan_console/channels/chan_phone.c
team/russell/chan_console/channels/chan_sip.c
team/russell/chan_console/channels/chan_skinny.c
team/russell/chan_console/channels/chan_zap.c
team/russell/chan_console/codecs/codec_zap.c
team/russell/chan_console/codecs/gsm/Makefile
team/russell/chan_console/configs/features.conf.sample
team/russell/chan_console/configs/phone.conf.sample
team/russell/chan_console/configs/say.conf.sample
team/russell/chan_console/configure
team/russell/chan_console/configure.ac
team/russell/chan_console/contrib/scripts/vmdb.sql
team/russell/chan_console/funcs/func_odbc.c
team/russell/chan_console/funcs/func_strings.c
team/russell/chan_console/include/asterisk/autoconfig.h.in
team/russell/chan_console/include/asterisk/channel.h
team/russell/chan_console/include/asterisk/frame.h
team/russell/chan_console/include/asterisk/strings.h
team/russell/chan_console/main/Makefile
team/russell/chan_console/main/asterisk.c
team/russell/chan_console/main/channel.c
team/russell/chan_console/main/cli.c
team/russell/chan_console/main/file.c
team/russell/chan_console/main/frame.c
team/russell/chan_console/main/manager.c
team/russell/chan_console/main/pbx.c
team/russell/chan_console/main/rtp.c
team/russell/chan_console/main/stdtime/localtime.c
team/russell/chan_console/main/utils.c
team/russell/chan_console/makeopts.in
team/russell/chan_console/pbx/pbx_ael.c
team/russell/chan_console/res/res_features.c
team/russell/chan_console/res/res_musiconhold.c
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
automerge = *
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 22 13:44:38 2007
@@ -1,1 +1,1 @@
-/trunk:1-51137
+/trunk:1-51413
Modified: team/russell/chan_console/.cleancount
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/.cleancount?view=diff&rev=51414&r1=51413&r2=51414
==============================================================================
--- team/russell/chan_console/.cleancount (original)
+++ team/russell/chan_console/.cleancount Mon Jan 22 13:44:38 2007
@@ -1,1 +1,1 @@
-27
+28
Modified: team/russell/chan_console/CHANGES
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/CHANGES?view=diff&rev=51414&r1=51413&r2=51414
==============================================================================
--- team/russell/chan_console/CHANGES (original)
+++ team/russell/chan_console/CHANGES Mon Jan 22 13:44:38 2007
@@ -61,6 +61,9 @@
* Added the jittertargetextra configuration option.
* Added the URI redirect option for the built-in HTTP server
* Added the trunkmaxsize configuration option to chan_iax2.
+ * Added G729 passthrough support to chan_phone for Sigma Designs boards.
+ * Added the parkedcalltransfers option to features.conf
+ * Added 's' option to Page application.
SIP changes
-----------
Modified: team/russell/chan_console/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/Makefile?view=diff&rev=51414&r1=51413&r2=51414
==============================================================================
--- team/russell/chan_console/Makefile (original)
+++ team/russell/chan_console/Makefile Mon Jan 22 13:44:38 2007
@@ -59,6 +59,10 @@
export STRIP
export DOWNLOAD
export OSARCH
+export CURSES_DIR
+export NCURSES_DIR
+export TERMCAP_DIR
+export TINFO_DIR
# even though we could use '-include makeopts' here, use a wildcard
# lookup anyway, so that make won't try to build makeopts if it doesn't
Modified: team/russell/chan_console/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/acinclude.m4?view=diff&rev=51414&r1=51413&r2=51414
==============================================================================
--- team/russell/chan_console/acinclude.m4 (original)
+++ team/russell/chan_console/acinclude.m4 Mon Jan 22 13:44:38 2007
@@ -34,6 +34,7 @@
PBX_$1=0
AC_SUBST([$1_LIB])
AC_SUBST([$1_INCLUDE])
+AC_SUBST([$1_DIR])
AC_SUBST([PBX_$1])
])
Modified: team/russell/chan_console/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_flash.c?view=diff&rev=51414&r1=51413&r2=51414
==============================================================================
--- team/russell/chan_console/apps/app_flash.c (original)
+++ team/russell/chan_console/apps/app_flash.c Mon Jan 22 13:44:38 2007
@@ -37,8 +37,7 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
+#include "asterisk/zapata.h"
#include "asterisk/lock.h"
#include "asterisk/file.h"
Modified: team/russell/chan_console/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_meetme.c?view=diff&rev=51414&r1=51413&r2=51414
==============================================================================
--- team/russell/chan_console/apps/app_meetme.c (original)
+++ team/russell/chan_console/apps/app_meetme.c Mon Jan 22 13:44:38 2007
@@ -38,8 +38,8 @@
#include <string.h>
#include <unistd.h>
#include <errno.h>
-#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
+
+#include "asterisk/zapata.h"
#include "asterisk/lock.h"
#include "asterisk/file.h"
@@ -161,7 +161,7 @@
enum {
OPT_ARG_WAITMARKED = 0,
OPT_ARG_ARRAY_SIZE = 1,
-} meetme_option_args;
+};
AST_APP_OPTIONS(meetme_opts, {
AST_APP_OPTION('A', CONFFLAG_MARKEDUSER ),
@@ -297,7 +297,6 @@
"other participants in the conference, all member stations are invited into\n"
"the bridge.\n";
-#define CONFIG_FILE_NAME "meetme.conf"
#define CONFIG_FILE_NAME_SLA "sla.conf"
/*! \brief The MeetMe Conference object */
@@ -379,9 +378,6 @@
ASTOBJ_CONTAINER_COMPONENTS(struct ast_sla);
} slas;
-static int audio_buffers; /*!< The number of audio buffers to be allocated on pseudo channels
- when in a conference
- */
/*! The number of audio buffers to be allocated on pseudo channels
* when in a conference */
static int audio_buffers;
@@ -1933,7 +1929,7 @@
user->user_no,
S_OR(user->chan->cid.cid_num, "<unknown>"),
S_OR(user->chan->cid.cid_name, "<unknown>"),
- (now - user->jointime));
+ (long)(now - user->jointime));
}
conf->users--;
Modified: team/russell/chan_console/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_mixmonitor.c?view=diff&rev=51414&r1=51413&r2=51414
==============================================================================
--- team/russell/chan_console/apps/app_mixmonitor.c (original)
+++ team/russell/chan_console/apps/app_mixmonitor.c Mon Jan 22 13:44:38 2007
@@ -93,7 +93,7 @@
struct mixmonitor {
struct ast_channel_spy spy;
- struct ast_filestream *fs;
+ char *filename;
char *post_process;
char *name;
unsigned int flags;
@@ -146,8 +146,11 @@
{
struct mixmonitor *mixmonitor = obj;
struct ast_frame *f = NULL;
-
-
+ struct ast_filestream *fs = NULL;
+ unsigned int oflags;
+ char *ext;
+ int errflag = 0;
+
if (option_verbose > 1)
ast_verbose(VERBOSE_PREFIX_2 "Begin MixMonitor Recording %s\n", mixmonitor->name);
@@ -174,8 +177,27 @@
*/
for (; f; f = next) {
next = AST_LIST_NEXT(f, frame_list);
- if (write)
- ast_writestream(mixmonitor->fs, f);
+ if (write && errflag == 0) {
+ if (!fs) {
+ /* Determine creation flags and filename plus extension for filestream */
+ oflags = O_CREAT | O_WRONLY;
+ oflags |= ast_test_flag(mixmonitor, MUXFLAG_APPEND) ? O_APPEND : O_TRUNC;
+
+ if ((ext = strrchr(mixmonitor->filename, '.')))
+ *(ext++) = '\0';
+ else
+ ext = "raw";
+
+ /* Move onto actually creating the filestream */
+ if (!(fs = ast_writefile(mixmonitor->filename, ext, NULL, oflags, 0, 0644))) {
+ ast_log(LOG_ERROR, "Cannot open %s.%s\n", mixmonitor->filename, ext);
+ errflag = 1;
+ }
+
+ }
+ if (fs)
+ ast_writestream(fs, f);
+ }
ast_frame_free(f, 0);
}
}
@@ -194,7 +216,8 @@
ast_safe_system(mixmonitor->post_process);
}
- ast_closestream(mixmonitor->fs);
+ if (fs)
+ ast_closestream(fs);
free(mixmonitor);
@@ -208,12 +231,10 @@
pthread_attr_t attr;
pthread_t thread;
struct mixmonitor *mixmonitor;
- char *file_name, *ext;
char postprocess2[1024] = "";
- unsigned int oflags;
size_t len;
- len = sizeof(*mixmonitor) + strlen(chan->name) + 1;
+ len = sizeof(*mixmonitor) + strlen(chan->name) + strlen(filename) + 2;
/* If a post process system command is given attach it to the structure */
if (!ast_strlen_zero(post_process)) {
@@ -245,23 +266,8 @@
strcpy(mixmonitor->post_process, postprocess2);
}
- /* Determine creation flags and filename plus extension for filestream */
- oflags = O_CREAT | O_WRONLY;
- oflags |= ast_test_flag(mixmonitor, MUXFLAG_APPEND) ? O_APPEND : O_TRUNC;
- file_name = ast_strdupa(filename);
- if ((ext = strrchr(file_name, '.'))) {
- *(ext++) = '\0';
- } else {
- ext = "raw";
- }
-
- /* Move onto actually creating the filestream */
- mixmonitor->fs = ast_writefile(file_name, ext, NULL, oflags, 0, AST_FILE_MODE);
- if (!mixmonitor->fs) {
- ast_log(LOG_ERROR, "Cannot open %s.%s\n", file_name, ext);
- free(mixmonitor);
- return;
- }
+ mixmonitor->filename = (char *) mixmonitor + sizeof(*mixmonitor) + strlen(chan->name) + 1;
+ strcpy(mixmonitor->filename, filename);
/* Setup the actual spy before creating our thread */
ast_set_flag(&mixmonitor->spy, CHANSPY_FORMAT_AUDIO);
@@ -285,7 +291,6 @@
mixmonitor->spy.type, chan->name);
/* Since we couldn't add ourselves - bail out! */
ast_mutex_destroy(&mixmonitor->spy.lock);
- ast_closestream(mixmonitor->fs);
free(mixmonitor);
return;
}
Modified: team/russell/chan_console/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_page.c?view=diff&rev=51414&r1=51413&r2=51414
==============================================================================
--- team/russell/chan_console/apps/app_page.c (original)
+++ team/russell/chan_console/apps/app_page.c Mon Jan 22 13:44:38 2007
@@ -48,6 +48,7 @@
#include "asterisk/app.h"
#include "asterisk/chanvars.h"
#include "asterisk/utils.h"
+#include "asterisk/devicestate.h"
static const char *app_page= "Page";
[... 7638 lines stripped ...]
More information about the asterisk-commits
mailing list