[asterisk-commits] branch jcollie/bug7063 r28793 - in
/team/jcollie/bug7063: ./ apps/ channels/ ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri May 19 12:37:40 MST 2006
Author: jcollie
Date: Fri May 19 14:37:39 2006
New Revision: 28793
URL: http://svn.digium.com/view/asterisk?rev=28793&view=rev
Log:
Merged revisions 27194,27231,27269-27270,27305-27306,27346,27396,27436-27437,27477-27479,27522-27524,27559,27595,27637,27684,27724,27768,27770,27812,27848,27892,27928,27972,27974-27975,28016-28017,28055-28056,28091,28126,28168,28170,28213-28215,28258,28300,28336,28338,28393-28395,28445,28483-28484,28502,28520,28555,28592,28628-28629,28631,28657,28703-28705,28745,28747,28771,28789,28791 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r27194 | file | 2006-05-15 10:30:21 -0500 (Mon, 15 May 2006) | 2 lines
Make sure that the channel is answered before doing SpeechBackground. (issue #josh-wait-I-dont-have-issue-numbers)
................
r27231 | mogorman | 2006-05-15 14:46:26 -0500 (Mon, 15 May 2006) | 3 lines
allow func_cdr to set amaflags patch provided by
bug 7166
................
r27269 | russell | 2006-05-15 22:18:22 -0500 (Mon, 15 May 2006) | 3 lines
fix bogus patch to allow setting the CDR amaflags. (The original patch in
issue #7166 was fine.)
................
r27270 | russell | 2006-05-15 22:18:57 -0500 (Mon, 15 May 2006) | 2 lines
return the result of the cli command registration
................
r27305 | oej | 2006-05-16 07:42:59 -0500 (Tue, 16 May 2006) | 3 lines
- Format fixes
- Adding if(option_debug) in front of complicated debug messages...
................
r27306 | oej | 2006-05-16 07:44:04 -0500 (Tue, 16 May 2006) | 2 lines
One sipfrag attachment is enough...
................
r27346 | crichter | 2006-05-16 09:34:21 -0500 (Tue, 16 May 2006) | 1 line
fixed very bad memory overwrite which leaded to segfaults on some systems. removed redundant buffer betweend mISDN reading thread and ast_read in favour of the already existing pipe, this clarifies the way a voice frame takes between mISDN and asterisk a lot. centralized debugging of NumberPlan. removed a compiler warning.
................
r27396 | oej | 2006-05-16 13:06:27 -0500 (Tue, 16 May 2006) | 2 lines
Show all formats for an active SIP call
................
r27436 | oej | 2006-05-16 14:20:50 -0500 (Tue, 16 May 2006) | 2 lines
Adding check of option_debug
................
r27437 | oej | 2006-05-16 14:21:20 -0500 (Tue, 16 May 2006) | 2 lines
Typo
................
r27477 | kpfleming | 2006-05-16 15:08:29 -0500 (Tue, 16 May 2006) | 10 lines
Merged revisions 27468 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r27468 | kpfleming | 2006-05-16 15:05:17 -0500 (Tue, 16 May 2006) | 2 lines
don't leak frames when deferring DTMF or dropping duplicate ANSWER frames (issue #7041, slightly different fix, reported/patched by clausf)
........
................
r27478 | kpfleming | 2006-05-16 15:09:30 -0500 (Tue, 16 May 2006) | 2 lines
make this app actually compile
................
r27479 | oej | 2006-05-16 15:13:10 -0500 (Tue, 16 May 2006) | 2 lines
Send a=recvonly when put on hold, otherwise a=sendrecv to indicate that we want two streams.
................
r27522 | tilghman | 2006-05-16 16:14:01 -0500 (Tue, 16 May 2006) | 2 lines
Argument macro janitor for func_odbc, fixes #7171
................
r27523 | mattf | 2006-05-16 16:43:20 -0500 (Tue, 16 May 2006) | 1 line
Add option for enabling and disabling echo cancellation
................
r27524 | kpfleming | 2006-05-16 16:45:15 -0500 (Tue, 16 May 2006) | 2 lines
clean up some compiler warnings (no reason to use signed integers for buffer lengths, ever)
................
r27559 | kpfleming | 2006-05-16 17:11:02 -0500 (Tue, 16 May 2006) | 3 lines
mark RTP sessions that are not carrying DTMF
allow native bridging of RTP sessions that are not carrying DTMF even when the bridge needs to listen to DTMF (when SIP INFO is used for DTMF, for example)
................
r27595 | file | 2006-05-16 18:39:29 -0500 (Tue, 16 May 2006) | 2 lines
Inherit channel variables when call forwarding through chan_local (issue #7095 reported by raarts)
................
r27637 | tilghman | 2006-05-16 21:27:17 -0500 (Tue, 16 May 2006) | 10 lines
Merged revisions 27636 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r27636 | tilghman | 2006-05-16 21:19:50 -0500 (Tue, 16 May 2006) | 2 lines
Bug 7125 - Fix race condition between resequencing and leaving a message
........
................
r27684 | oej | 2006-05-17 01:18:09 -0500 (Wed, 17 May 2006) | 2 lines
Use pointer instead of un-needed buffer. Thanks Kevin!
................
r27724 | oej | 2006-05-17 04:29:55 -0500 (Wed, 17 May 2006) | 2 lines
Block TRANSFER_CONTEXT patch for 1.2 only, since is already implemented in siptransfer
................
r27768 | file | 2006-05-17 10:19:29 -0500 (Wed, 17 May 2006) | 9 lines
Blocked revisions 27767 via svnmerge
........
r27767 | file | 2006-05-17 12:17:04 -0300 (Wed, 17 May 2006) | 2 lines
OSPNext does not handle success/failure correctly (issue #7147 reported and fixed by eborgstrom)
........
................
r27770 | crichter | 2006-05-17 10:29:01 -0500 (Wed, 17 May 2006) | 1 line
fixed bug that we've lost the orginator of the call.. now we can hear to disconnect indications again
................
r27812 | file | 2006-05-17 11:51:47 -0500 (Wed, 17 May 2006) | 2 lines
Add distinctive ring detection with Caller ID for Australia, New Zealand, and other countries. (issue #3596 reported by deon patch by dbowerman with minor mods by moi)
................
r27848 | file | 2006-05-17 12:10:44 -0500 (Wed, 17 May 2006) | 10 lines
Merged revisions 27847 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r27847 | file | 2006-05-17 14:07:52 -0300 (Wed, 17 May 2006) | 2 lines
Priority jumping not working on VoiceMail app with new syntax (issue #7164 reported and fixed by alvaro_palma_aste)
........
................
r27892 | oej | 2006-05-17 13:19:17 -0500 (Wed, 17 May 2006) | 2 lines
Adding a debug line
................
r27928 | oej | 2006-05-17 14:37:51 -0500 (Wed, 17 May 2006) | 5 lines
Issue #7176 - Crash in expire_register (imported from 1.2)
This is a bad fix, since peer should never be 0. Why is it zero
on Royk's system?
................
r27972 | file | 2006-05-17 17:02:15 -0500 (Wed, 17 May 2006) | 2 lines
Only set the RTP DTMF information of an RTP structure does indeed exist.
................
r27974 | file | 2006-05-17 17:35:53 -0500 (Wed, 17 May 2006) | 10 lines
Merged revisions 27973 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r27973 | file | 2006-05-17 19:34:08 -0300 (Wed, 17 May 2006) | 2 lines
Fix codec priority stuff during authentication (issue #6194 reported by jkoopmann)
........
................
r27975 | file | 2006-05-17 17:51:28 -0500 (Wed, 17 May 2006) | 2 lines
Remove needless check for autofill (issue #7180 reported by Marquis)
................
r28016 | file | 2006-05-17 19:00:32 -0500 (Wed, 17 May 2006) | 2 lines
Add SPRINTF dialplan function made by the ever insaneful Corydon (issue #7078 reported by Corydon76)
................
r28017 | file | 2006-05-17 19:12:54 -0500 (Wed, 17 May 2006) | 2 lines
Fix receiving message count information from a remote IAX2 peer. (issue #7163 reported by and fixed by akohlsmith)
................
r28055 | russell | 2006-05-18 01:41:53 -0500 (Thu, 18 May 2006) | 4 lines
fix file dependency generation so that the resulting files in the subdirectories
are not of zero length (issue #7138, reported/patched by casper, fixed by a
different patch)
................
r28056 | russell | 2006-05-18 01:48:58 -0500 (Thu, 18 May 2006) | 3 lines
force a "make clean" because existing .depend files in the subdirectories
may be bogus
................
r28091 | crichter | 2006-05-18 03:45:43 -0500 (Thu, 18 May 2006) | 1 line
this is not a warning, it might happen during call initialization
................
r28126 | oej | 2006-05-18 07:19:00 -0500 (Thu, 18 May 2006) | 3 lines
Remove unsupported, unimplemented, unfunctional "v" option from meetme documentation
(Imported from 1.2)
................
r28168 | file | 2006-05-18 09:07:46 -0500 (Thu, 18 May 2006) | 2 lines
Allow contexts in regexten so that extensions can be added to multiple contexts when peer registers (issue #6869 reported by and created by Marquis)
................
r28170 | file | 2006-05-18 09:40:20 -0500 (Thu, 18 May 2006) | 10 lines
Merged revisions 28169 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r28169 | file | 2006-05-18 11:27:21 -0300 (Thu, 18 May 2006) | 2 lines
Fix endless looping message by checking value of res before doing retries stuff. (issue #7140 reported by tanischen)
........
................
r28213 | file | 2006-05-18 11:32:37 -0500 (Thu, 18 May 2006) | 10 lines
Merged revisions 28212 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r28212 | file | 2006-05-18 13:31:16 -0300 (Thu, 18 May 2006) | 2 lines
Return -1 on error in ODBC messagecount and 0 on success (issue #7133 reported by cfieldmtm)
........
................
r28214 | kpfleming | 2006-05-18 11:38:26 -0500 (Thu, 18 May 2006) | 2 lines
adding new code should require following the formatting guidelines :-)
................
r28215 | kpfleming | 2006-05-18 11:57:59 -0500 (Thu, 18 May 2006) | 3 lines
add another media path reinvite 'flavor', where we will only redirect our media to devices that we know are not behind a NAT (based on the evidence collected when we receive media from them)
also, documented the 'canreinvite=update' option in the sample config file
................
r28258 | tilghman | 2006-05-18 12:29:32 -0500 (Thu, 18 May 2006) | 9 lines
Blocked revisions 28257 via svnmerge
........
r28257 | tilghman | 2006-05-18 12:27:59 -0500 (Thu, 18 May 2006) | 2 lines
Bug 7167 - HasNewVoicemail and VMCOUNT() didn't work when USE_ODBC_STORAGE was defined
........
................
r28300 | tilghman | 2006-05-18 13:28:52 -0500 (Thu, 18 May 2006) | 2 lines
Bug 7167 - Fix VMCOUNT if using USE_ODBC_STORAGE (different fix for trunk than for 1.2)
................
r28336 | kpfleming | 2006-05-18 14:18:08 -0500 (Thu, 18 May 2006) | 2 lines
block this fix from the 1.2 branch; proper fix will go here and is much more complex
................
r28338 | kpfleming | 2006-05-18 14:39:39 -0500 (Thu, 18 May 2006) | 10 lines
Merged revisions 28337 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r28337 | kpfleming | 2006-05-18 14:35:55 -0500 (Thu, 18 May 2006) | 2 lines
use unsigned counters for handling answer/IE lengths while processing DNS results (issue #7174)
........
................
r28393 | oej | 2006-05-18 16:01:38 -0500 (Thu, 18 May 2006) | 2 lines
Add missing argument to ast_carefulwrite
................
r28394 | kpfleming | 2006-05-18 16:02:21 -0500 (Thu, 18 May 2006) | 15 lines
Merged revisions 28380,28384 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r28380 | kpfleming | 2006-05-18 15:24:07 -0500 (Thu, 18 May 2006) | 2 lines
handle incoming multipart/mixed message bodies in SIP and find the SDP, if presnet (issue #7124 reported and patched by eborgstrom, but very different fix)
........
r28384 | kpfleming | 2006-05-18 15:43:42 -0500 (Thu, 18 May 2006) | 2 lines
fix up a few more places to find the SDP properly (fallout from fix for #7124)
........
................
r28395 | kpfleming | 2006-05-18 16:11:43 -0500 (Thu, 18 May 2006) | 2 lines
revert bogus change
................
r28445 | russell | 2006-05-18 22:11:35 -0500 (Thu, 18 May 2006) | 4 lines
when displaying the list of registered music on hold classes, only show
the format if the mode is not "files", because the field has no meaning
in that case
................
r28483 | oej | 2006-05-19 02:52:08 -0500 (Fri, 19 May 2006) | 2 lines
Formatting cleanup
................
r28484 | oej | 2006-05-19 02:56:56 -0500 (Fri, 19 May 2006) | 2 lines
Add simple devicestate for chan_local
................
r28502 | oej | 2006-05-19 03:03:28 -0500 (Fri, 19 May 2006) | 2 lines
First stab at supporting video in chan_local
................
r28520 | oej | 2006-05-19 03:20:01 -0500 (Fri, 19 May 2006) | 2 lines
Adding send_text capability to chan_local
................
r28555 | oej | 2006-05-19 04:28:05 -0500 (Fri, 19 May 2006) | 3 lines
Adding some documentation on Asterisk and video telephony. Thanks to the team
on the asterisk-video mailing list for teaching me :-)
................
r28592 | russell | 2006-05-19 09:51:08 -0500 (Fri, 19 May 2006) | 3 lines
fix up a patch that did not merge properly from 1.2 ... weird
(issue #6866, flefoll)
................
r28628 | file | 2006-05-19 10:40:39 -0500 (Fri, 19 May 2006) | 10 lines
Merged revisions 28627 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r28627 | file | 2006-05-19 12:38:59 -0300 (Fri, 19 May 2006) | 2 lines
Treat paused queue members as unreachable (issue #7127 reported by peterh)
........
................
r28629 | tilghman | 2006-05-19 10:44:33 -0500 (Fri, 19 May 2006) | 2 lines
Missing messagecount2 function
................
r28631 | file | 2006-05-19 10:53:14 -0500 (Fri, 19 May 2006) | 9 lines
Blocked revisions 28630 via svnmerge
........
r28630 | file | 2006-05-19 12:52:09 -0300 (Fri, 19 May 2006) | 2 lines
Backport of fix for issue #6654 that was fixed in trunk but not here
........
................
r28657 | file | 2006-05-19 11:04:35 -0500 (Fri, 19 May 2006) | 10 lines
Merged revisions 28651 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r28651 | file | 2006-05-19 13:03:33 -0300 (Fri, 19 May 2006) | 2 lines
When forwarding messages use the context that the active voicemail user was found in. (issue #7010)
........
................
r28703 | file | 2006-05-19 12:05:22 -0500 (Fri, 19 May 2006) | 10 lines
Merged revisions 28698 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r28698 | file | 2006-05-19 14:04:02 -0300 (Fri, 19 May 2006) | 2 lines
Make the minidle option actually exist as documented (issue #7159 reported by imran)
........
................
r28704 | file | 2006-05-19 12:15:29 -0500 (Fri, 19 May 2006) | 2 lines
Clean up some chan_zap code to make it more readable. (issue #6834 reported by ppyy)
................
r28705 | russell | 2006-05-19 12:25:52 -0500 (Fri, 19 May 2006) | 4 lines
only delete call files if the timestamp on the file is not in the future, so
that a call file can be reused (issue #6750, patch by moy, committed patch is
slightly simplified)
................
r28745 | tilghman | 2006-05-19 13:21:31 -0500 (Fri, 19 May 2006) | 2 lines
As requested by kpfleming, renaming messagecount to inboxcount and messagecount2 to messagecount.
................
r28747 | russell | 2006-05-19 13:54:21 -0500 (Fri, 19 May 2006) | 4 lines
add support for more refined ability to set install paths using the standard
options to configure such as --libdir, --sbindir, etc. All of the default paths
are still the same. (issue #7057, jcollie)
................
r28771 | russell | 2006-05-19 14:04:24 -0500 (Fri, 19 May 2006) | 14 lines
Merged revisions 28754 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r28754 | russell | 2006-05-19 15:01:17 -0400 (Fri, 19 May 2006) | 6 lines
This explicit poll is only needed on mac. In fact, it breaks some systems
such as some versions of Fedora, causing 'asterisk -rx' to never exit. This
has been tested on systems showing the asterisk -rx problem, as well as other
unaffected versions of linux, mac osx 10.4, and FreeBSD 6.
(issue #7071)
........
................
r28789 | russell | 2006-05-19 14:10:06 -0500 (Fri, 19 May 2006) | 3 lines
there is no reason to explicity specify -fomit-frame-pointer when building with
optimization enabled, because it is enabled automatically (issue #7108, casper)
................
r28791 | russell | 2006-05-19 14:19:27 -0500 (Fri, 19 May 2006) | 11 lines
Merged revisions 28790 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r28790 | russell | 2006-05-19 15:18:41 -0400 (Fri, 19 May 2006) | 3 lines
fix the build of smsq with -Werror. I learned something new about format
strings from this patch! (issue #7141, Mithraen)
........
................
Added:
team/jcollie/bug7063/doc/video.txt
- copied unchanged from r28791, trunk/doc/video.txt
Modified:
team/jcollie/bug7063/ (props changed)
team/jcollie/bug7063/.cleancount
team/jcollie/bug7063/Makefile
team/jcollie/bug7063/UPGRADE.txt
team/jcollie/bug7063/acinclude.m4
team/jcollie/bug7063/app.c
team/jcollie/bug7063/apps/app_channelredirect.c
team/jcollie/bug7063/apps/app_dial.c
team/jcollie/bug7063/apps/app_hasnewvoicemail.c
team/jcollie/bug7063/apps/app_meetme.c
team/jcollie/bug7063/apps/app_queue.c
team/jcollie/bug7063/apps/app_settransfercapability.c
team/jcollie/bug7063/apps/app_speech_utils.c
team/jcollie/bug7063/apps/app_voicemail.c
team/jcollie/bug7063/asterisk.c
team/jcollie/bug7063/channel.c
team/jcollie/bug7063/channels/chan_iax2.c
team/jcollie/bug7063/channels/chan_local.c
team/jcollie/bug7063/channels/chan_misdn.c
team/jcollie/bug7063/channels/chan_sip.c
team/jcollie/bug7063/channels/chan_skinny.c
team/jcollie/bug7063/channels/chan_zap.c
team/jcollie/bug7063/channels/misdn/isdn_lib.c
team/jcollie/bug7063/channels/misdn/isdn_lib.h
team/jcollie/bug7063/channels/misdn/isdn_msg_parser.c
team/jcollie/bug7063/configs/sip.conf.sample
team/jcollie/bug7063/configs/zapata.conf.sample
team/jcollie/bug7063/configure
team/jcollie/bug7063/configure.ac
team/jcollie/bug7063/enum.c
team/jcollie/bug7063/funcs/func_cdr.c
team/jcollie/bug7063/funcs/func_odbc.c
team/jcollie/bug7063/funcs/func_strings.c
team/jcollie/bug7063/image.c
team/jcollie/bug7063/include/asterisk/app.h
team/jcollie/bug7063/include/asterisk/frame.h
team/jcollie/bug7063/include/asterisk/rtp.h
team/jcollie/bug7063/makeopts.in
team/jcollie/bug7063/manager.c
team/jcollie/bug7063/pbx/pbx_spool.c
team/jcollie/bug7063/res/res_musiconhold.c
team/jcollie/bug7063/rtp.c
team/jcollie/bug7063/utils/smsq.c
Propchange: team/jcollie/bug7063/
------------------------------------------------------------------------------
automerge = *
Propchange: team/jcollie/bug7063/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/jcollie/bug7063/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/jcollie/bug7063/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 19 14:37:39 2006
@@ -1,1 +1,1 @@
-/trunk:1-27191
+/trunk:1-28791
Modified: team/jcollie/bug7063/.cleancount
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7063/.cleancount?rev=28793&r1=28792&r2=28793&view=diff
==============================================================================
--- team/jcollie/bug7063/.cleancount (original)
+++ team/jcollie/bug7063/.cleancount Fri May 19 14:37:39 2006
@@ -1,1 +1,1 @@
-16
+17
Modified: team/jcollie/bug7063/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7063/Makefile?rev=28793&r1=28792&r2=28793&view=diff
==============================================================================
--- team/jcollie/bug7063/Makefile (original)
+++ team/jcollie/bug7063/Makefile Fri May 19 14:37:39 2006
@@ -82,41 +82,27 @@
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
ifeq ($(OSARCH),SunOS)
- ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
- ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
- ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
- ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
- ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin
- ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin
- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run
- ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man
+ ASTETCDIR=/etc/opt/asterisk
+ ASTLIBDIR=/opt/asterisk/lib
+ ASTVARLIBDIR=/var/opt/asterisk/lib
+ ASTSPOOLDIR=/var/opt/asterisk/spool
+ ASTLOGDIR=/var/opt/asterisk/log
+ ASTHEADERDIR=/opt/asterisk/usr/include/asterisk
+ ASTBINDIR=/opt/asterisk/usr/bin
+ ASTSBINDIR=/opt/asterisk/usr/sbin
+ ASTVARRUNDIR=/var/opt/asterisk/run
+ ASTMANDIR=/opt/asterisk/usr/share/man
else
-ifeq ($(OSARCH),FreeBSD)
- PREFIX?=/usr/local
- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
-else
- ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
-endif
+ ASTETCDIR=$(sysconfdir)/asterisk
+ ASTLIBDIR=$(libdir)/asterisk
+ ASTVARLIBDIR=$(localstatedir)/lib/asterisk
+ ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+ ASTLOGDIR=$(localstatedir)/log/asterisk
+ ASTHEADERDIR=$(includedir)/asterisk
+ ASTBINDIR=$(bindir)
+ ASTSBINDIR=$(sbindir)
+ ASTVARRUNDIR=$(localstatedir)/run
+ ASTMANDIR=$(mandir)
endif
ASTDATADIR?=$(ASTVARLIBDIR)
@@ -279,12 +265,10 @@
endif
ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
-ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
-ASTCFLAGS+=-fomit-frame-pointer
-endif
MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs
-SUBDIRS:=$(MOD_SUBDIRS) utils stdtime agi
+OTHER_SUBDIRS=utils stdtime agi
+SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
translate.o file.o pbx.o cli.o md5.o term.o \
@@ -871,7 +855,8 @@
valgrind: dont-optimize
depend: include/asterisk/version.h include/asterisk/buildopts.h .depend defaults.h
- @for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done
+ @for x in $(MOD_SUBDIRS); do CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $$x depend || exit 1 ; done
+ @for x in $(OTHER_SUBDIRS); do CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $$x depend || exit 1 ; done
.depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h
build_tools/mkdep $(CFLAGS) $(wildcard *.c)
Modified: team/jcollie/bug7063/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7063/UPGRADE.txt?rev=28793&r1=28792&r2=28793&view=diff
==============================================================================
--- team/jcollie/bug7063/UPGRADE.txt (original)
+++ team/jcollie/bug7063/UPGRADE.txt Fri May 19 14:37:39 2006
@@ -107,6 +107,12 @@
to specify which DTMF digits can be used to accept a recording and
which digits can be used to cancel a recording.
+* ast_app_messagecount has been renamed to ast_app_inboxcount. There is now a
+ new ast_app_messagecount function which takes a single context/mailbox/folder
+ mailbox specification and returns the message count for that folder only.
+ This addresses the deficiency of not being able to count the number of
+ messages in folders other than INBOX and Old.
+
Manager:
* After executing the 'status' manager action, the "Status" manager events
Modified: team/jcollie/bug7063/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7063/acinclude.m4?rev=28793&r1=28792&r2=28793&view=diff
==============================================================================
--- team/jcollie/bug7063/acinclude.m4 (original)
+++ team/jcollie/bug7063/acinclude.m4 Fri May 19 14:37:39 2006
@@ -20,17 +20,17 @@
PBX_LIB$1=0
if test "${USE_$1}" != "no"; then
- libdir=""
+ pbxlibdir=""
if test "x${$1_DIR}" != "x"; then
- libdir="-L${$1_DIR}/lib"
+ pbxlibdir="-L${$1_DIR}/lib"
fi
- AC_CHECK_LIB([$1], [$2], [:], [], ${libdir} $6)
+ AC_CHECK_LIB([$1], [$2], [:], [], ${pbxlibdir} $6)
if test "${ac_cv_lib_$1_$2}" = "yes"; then
$1_LIB="-l$1 $6"
$4_HEADER_FOUND="1"
if test "x${$1_DIR}" != "x"; then
- $1_LIB="${libdir} ${$1_LIB}"
+ $1_LIB="${pbxlibdir} ${$1_LIB}"
$1_INCLUDE="-I${$1_DIR}/include"
if test "x$3" != "x" ; then
AC_CHECK_HEADER([${$1_DIR}/include/$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
Modified: team/jcollie/bug7063/app.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7063/app.c?rev=28793&r1=28792&r2=28793&view=diff
==============================================================================
--- team/jcollie/bug7063/app.c (original)
+++ team/jcollie/bug7063/app.c Fri May 19 14:37:39 2006
@@ -145,18 +145,22 @@
}
static int (*ast_has_voicemail_func)(const char *mailbox, const char *folder) = NULL;
-static int (*ast_messagecount_func)(const char *mailbox, int *newmsgs, int *oldmsgs) = NULL;
+static int (*ast_inboxcount_func)(const char *mailbox, int *newmsgs, int *oldmsgs) = NULL;
+static int (*ast_messagecount_func)(const char *context, const char *mailbox, const char *folder) = NULL;
void ast_install_vm_functions(int (*has_voicemail_func)(const char *mailbox, const char *folder),
- int (*messagecount_func)(const char *mailbox, int *newmsgs, int *oldmsgs))
+ int (*inboxcount_func)(const char *mailbox, int *newmsgs, int *oldmsgs),
+ int (*messagecount_func)(const char *context, const char *mailbox, const char *folder))
{
ast_has_voicemail_func = has_voicemail_func;
+ ast_inboxcount_func = inboxcount_func;
ast_messagecount_func = messagecount_func;
}
void ast_uninstall_vm_functions(void)
{
ast_has_voicemail_func = NULL;
+ ast_inboxcount_func = NULL;
ast_messagecount_func = NULL;
}
@@ -174,19 +178,33 @@
}
-int ast_app_messagecount(const char *mailbox, int *newmsgs, int *oldmsgs)
+int ast_app_inboxcount(const char *mailbox, int *newmsgs, int *oldmsgs)
{
static int warned = 0;
if (newmsgs)
*newmsgs = 0;
if (oldmsgs)
*oldmsgs = 0;
- if (ast_messagecount_func)
- return ast_messagecount_func(mailbox, newmsgs, oldmsgs);
+ if (ast_inboxcount_func)
+ return ast_inboxcount_func(mailbox, newmsgs, oldmsgs);
if (!warned && (option_verbose > 2)) {
warned++;
ast_verbose(VERBOSE_PREFIX_3 "Message count requested for mailbox %s but voicemail not loaded.\n", mailbox);
+ }
+
+ return 0;
+}
+
+int ast_app_messagecount(const char *context, const char *mailbox, const char *folder)
+{
+ static int warned = 0;
+ if (ast_messagecount_func)
+ return ast_messagecount_func(context, mailbox, folder);
+
+ if (!warned && (option_verbose > 2)) {
+ warned++;
+ ast_verbose(VERBOSE_PREFIX_3 "Message count requested for mailbox %s@%s/%s but voicemail not loaded.\n", mailbox, context, folder);
}
return 0;
Modified: team/jcollie/bug7063/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7063/apps/app_channelredirect.c?rev=28793&r1=28792&r2=28793&view=diff
==============================================================================
--- team/jcollie/bug7063/apps/app_channelredirect.c (original)
+++ team/jcollie/bug7063/apps/app_channelredirect.c Fri May 19 14:37:39 2006
@@ -40,6 +40,7 @@
#include "asterisk/lock.h"
#include "asterisk/app.h"
#include "asterisk/features.h"
+#include "asterisk/options.h"
static char *app = "ChannelRedirect";
static char *synopsis = "Redirects given channel to a dialplan target.";
@@ -105,7 +106,8 @@
goto chanquit;
}
- ast_log(LOG_DEBUG, "Attempting async goto (%s) to %s|%s|%d\n", args.channel, S_OR(context, chan2->context), S_OR(exten, chan2->exten), prio);
+ if (option_debug > 1)
+ ast_log(LOG_DEBUG, "Attempting async goto (%s) to %s|%s|%d\n", args.channel, S_OR(context, chan2->context), S_OR(exten, chan2->exten), prio);
if (ast_async_goto_if_exists(chan2, S_OR(context, chan2->context), S_OR(exten, chan2->exten), prio))
ast_log(LOG_WARNING, "%s failed for %s\n", app, args.channel);
Modified: team/jcollie/bug7063/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7063/apps/app_dial.c?rev=28793&r1=28792&r2=28793&view=diff
==============================================================================
--- team/jcollie/bug7063/apps/app_dial.c (original)
+++ team/jcollie/bug7063/apps/app_dial.c Fri May 19 14:37:39 2006
@@ -472,6 +472,8 @@
c = o->chan = ast_request(tech, in->nativeformats, stuff, &cause);
if (!c)
ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
+ else
+ ast_channel_inherit_variables(in, o->chan);
} else {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Too many forwards from %s\n", c->name);
@@ -1051,6 +1053,8 @@
tmp->chan = ast_request(tech, chan->nativeformats, stuff, &cause);
if (!tmp->chan)
ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
+ else
+ ast_channel_inherit_variables(chan, tmp->chan);
} else {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Too many forwards from %s\n", tmp->chan->name);
Modified: team/jcollie/bug7063/apps/app_hasnewvoicemail.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7063/apps/app_hasnewvoicemail.c?rev=28793&r1=28792&r2=28793&view=diff
==============================================================================
--- team/jcollie/bug7063/apps/app_hasnewvoicemail.c (original)
+++ team/jcollie/bug7063/apps/app_hasnewvoicemail.c Fri May 19 14:37:39 2006
@@ -78,26 +78,6 @@
" <# of messages in the folder, 0 for NONE>\n";
LOCAL_USER_DECL;
-
-static int hasvoicemail_internal(char *context, char *box, char *folder)
-{
- char vmpath[256];
- DIR *vmdir;
- struct dirent *vment;
- int count=0;
-
- snprintf(vmpath,sizeof(vmpath), "%s/voicemail/%s/%s/%s", (char *)ast_config_AST_SPOOL_DIR, context, box, folder);
- if ((vmdir = opendir(vmpath))) {
- /* No matter what the format of VM, there will always be a .txt file for each message. */
- while ((vment = readdir(vmdir))) {
- if (!strncmp(vment->d_name + 7, ".txt", 4)) {
- count++;
- }
- }
- closedir(vmdir);
- }
- return count;
-}
static int hasvoicemail_exec(struct ast_channel *chan, void *data)
{
@@ -130,11 +110,10 @@
AST_STANDARD_APP_ARGS(args, input);
- if ((vmbox = strsep(&args.vmbox, "@")))
- if (!ast_strlen_zero(args.vmbox))
- context = args.vmbox;
- if (!vmbox)
- vmbox = args.vmbox;
+ vmbox = strsep(&args.vmbox, "@");
+
+ if (!ast_strlen_zero(args.vmbox))
+ context = args.vmbox;
vmfolder = strchr(vmbox, '/');
if (vmfolder) {
@@ -149,7 +128,7 @@
priority_jump = 1;
}
- vmcount = hasvoicemail_internal(context, vmbox, vmfolder);
+ vmcount = ast_app_messagecount(context, vmbox, vmfolder);
/* Set the count in the channel variable */
if (varname) {
snprintf(tmp, sizeof(tmp), "%d", vmcount);
@@ -198,7 +177,7 @@
args.folder = "INBOX";
}
- snprintf(buf, len, "%d", hasvoicemail_internal(context, args.vmbox, args.folder));
+ snprintf(buf, len, "%d", ast_app_messagecount(context, args.vmbox, args.folder));
LOCAL_USER_REMOVE(u);
Modified: team/jcollie/bug7063/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7063/apps/app_meetme.c?rev=28793&r1=28792&r2=28793&view=diff
==============================================================================
--- team/jcollie/bug7063/apps/app_meetme.c (original)
+++ team/jcollie/bug7063/apps/app_meetme.c Fri May 19 14:37:39 2006
@@ -109,7 +109,6 @@
" 's' -- Present menu (user or admin) when '*' is received ('send' to menu)\n"
" 't' -- set talk only mode. (Talk only, no listening)\n"
" 'T' -- set talker detection (sent to manager interface and meetme list)\n"
-" 'v' -- video mode\n"
" 'w' -- wait until the marked user enters the conference\n"
" 'x' -- close the conference when last marked user exits\n"
" 'X' -- allow user to exit the conference by entering a valid single\n"
@@ -233,7 +232,7 @@
#define CONFFLAG_STARMENU (1 << 4) /* If set asterisk will provide a menu to the user when '*' is pressed */
#define CONFFLAG_TALKER (1 << 5) /* If set the use can only send audio to the conference */
#define CONFFLAG_QUIET (1 << 6) /* If set there will be no enter or leave sounds */
-#define CONFFLAG_VIDEO (1 << 7) /* Set to enable video mode */
+#define CONFFLAG_ANNOUNCEUSERCOUNT (1 << 7) /* If set, when user joins the conference, they will be told the number of users that are already in */
#define CONFFLAG_AGI (1 << 8) /* Set to run AGI Script in Background */
#define CONFFLAG_MOH (1 << 9) /* Set to have music on hold when user is alone in conference */
#define CONFFLAG_MARKEDEXIT (1 << 10) /* If set the MeetMe will return if all marked with this flag left */
@@ -248,10 +247,9 @@
#define CONFFLAG_EMPTY (1 << 19)
#define CONFFLAG_EMPTYNOPIN (1 << 20)
#define CONFFLAG_ALWAYSPROMPT (1 << 21)
-#define CONFFLAG_ANNOUNCEUSERCOUNT (1 << 22) /* If set, when user joins the conference, they will be told the number of users that are already in */
-#define CONFFLAG_OPTIMIZETALKER (1 << 23) /* If set, treats talking users as muted users */
-#define CONFFLAG_NOONLYPERSON (1 << 24) /* If set, won't speak the extra prompt when the first person enters the conference */
-#define CONFFLAG_INTROUSERNOREVIEW (1 << 25) /* If set, user will be asked to record name on entry of conference without review */
+#define CONFFLAG_OPTIMIZETALKER (1 << 22) /* If set, treats talking users as muted users */
+#define CONFFLAG_NOONLYPERSON (1 << 23) /* If set, won't speak the extra prompt when the first person enters the conference */
+#define CONFFLAG_INTROUSERNOREVIEW (1 << 24) /* If set, user will be asked to record name on entry of conference without review */
AST_APP_OPTIONS(meetme_opts, {
AST_APP_OPTION('A', CONFFLAG_MARKEDUSER ),
Modified: team/jcollie/bug7063/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7063/apps/app_queue.c?rev=28793&r1=28792&r2=28793&view=diff
==============================================================================
--- team/jcollie/bug7063/apps/app_queue.c (original)
+++ team/jcollie/bug7063/apps/app_queue.c Fri May 19 14:37:39 2006
@@ -454,6 +454,8 @@
for (member = q->members; member; member = member->next) {
if (max_penalty && (member->penalty > max_penalty))
continue;
+
+ if (member->paused) continue;
switch (member->status) {
case AST_DEVICE_INVALID:
@@ -1895,11 +1897,10 @@
int res;
if (!qe->parent->autofill) {
-
/* Atomically read the parent head -- does not need a lock */
ch = qe->parent->head;
/* If we are now at the top of the head, break out */
- if ((ch == qe) || (qe->parent->autofill)) {
+ if (ch == qe) {
if (option_debug)
ast_log(LOG_DEBUG, "It's our turn (%s).\n", qe->chan->name);
res = 1;
Modified: team/jcollie/bug7063/apps/app_settransfercapability.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7063/apps/app_settransfercapability.c?rev=28793&r1=28792&r2=28793&view=diff
==============================================================================
--- team/jcollie/bug7063/apps/app_settransfercapability.c (original)
+++ team/jcollie/bug7063/apps/app_settransfercapability.c Fri May 19 14:37:39 2006
@@ -65,7 +65,7 @@
" RESTRICTED_DIGITAL : 0x09 - Restricted digital information\n"
" 3K1AUDIO : 0x10 - 3.1kHz Audio (fax calls)\n"
" DIGITAL_W_TONES : 0x11 - Unrestricted digital information with tones/announcements\n"
-" VIDEO : 0x18 - Video:\n"
+" VIDEO : 0x18 - Video\n"
"\n"
;
Modified: team/jcollie/bug7063/apps/app_speech_utils.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7063/apps/app_speech_utils.c?rev=28793&r1=28792&r2=28793&view=diff
==============================================================================
--- team/jcollie/bug7063/apps/app_speech_utils.c (original)
+++ team/jcollie/bug7063/apps/app_speech_utils.c Fri May 19 14:37:39 2006
@@ -511,6 +511,12 @@
LOCAL_USER_REMOVE(u);
return -1;
}
+
+ /* If channel is not already answered, then answer it */
+ if (chan->_state != AST_STATE_UP && ast_answer(chan)) {
+ LOCAL_USER_REMOVE(u);
+ return -1;
+ }
/* Record old read format */
oldreadformat = chan->readformat;
Modified: team/jcollie/bug7063/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7063/apps/app_voicemail.c?rev=28793&r1=28792&r2=28793&view=diff
==============================================================================
--- team/jcollie/bug7063/apps/app_voicemail.c (original)
+++ team/jcollie/bug7063/apps/app_voicemail.c Fri May 19 14:37:39 2006
@@ -2012,9 +2012,9 @@
}
#ifdef USE_ODBC_STORAGE
-static int messagecount(const char *mailbox, int *newmsgs, int *oldmsgs)
-{
- int x = 0;
+static int inboxcount(const char *mailbox, int *newmsgs, int *oldmsgs)
+{
+ int x = -1;
int res;
SQLHSTMT stmt;
char sql[256];
@@ -2027,6 +2027,7 @@
*newmsgs = 0;
if (oldmsgs)
*oldmsgs = 0;
+
/* If no mailbox, return immediately */
if (ast_strlen_zero(mailbox))
return 0;
@@ -2118,7 +2119,7 @@
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
odbc_release_obj(obj);
*oldmsgs = atoi(rowdata);
- x = 1;
+ x = 0;
} else
ast_log(LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database);
@@ -2126,136 +2127,132 @@
return x;
}
-static int has_voicemail(const char *mailbox, const char *folder)
-{
- struct odbc_obj *obj;
+static int messagecount(const char *context, const char *mailbox, const char *folder)
+{
+ struct odbc_obj *obj = NULL;
int nummsgs = 0;
- int res;
- SQLHSTMT stmt;
- char sql[256];
- char rowdata[20];
- char tmp[256]="";
- char *context;
- if (!folder)
- folder = "INBOX";
- /* If no mailbox, return immediately */
- if (ast_strlen_zero(mailbox))
- return 0;
-
- ast_copy_string(tmp, mailbox, sizeof(tmp));
-
- context = strchr(tmp, '@');
- if (context) {
- *context = '\0';
- context++;
- } else
- context = "default";
-
- obj = odbc_request_obj(odbc_database, 0);
- if (obj) {
- res = SQLAllocHandle(SQL_HANDLE_STMT, obj->con, &stmt);
- if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
- ast_log(LOG_WARNING, "SQL Alloc Handle failed!\n");
- odbc_release_obj(obj);
- goto yuck;
- }
- snprintf(sql, sizeof(sql), "SELECT COUNT(*) FROM %s WHERE dir = '%s%s/%s/%s'", odbc_table, VM_SPOOL_DIR, context, tmp, "INBOX");
- res = SQLPrepare(stmt, sql, SQL_NTS);
- if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
[... 4219 lines stripped ...]
More information about the asterisk-commits
mailing list