[asterisk-commits] russell: branch russell/chan_console r66722 - in
/team/russell/chan_console: ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu May 31 07:46:24 MST 2007
Author: russell
Date: Thu May 31 09:46:23 2007
New Revision: 66722
URL: http://svn.digium.com/view/asterisk?view=rev&rev=66722
Log:
Merged revisions 66027-66028,66031,66069,66071-66072,66077,66109,66126,66158,66161,66175,66178,66208,66225,66245,66278,66295,66313-66315,66367,66399,66432-66433,66438,66471,66502,66504-66505,66539-66540,66585,66603-66604,66638,66672,66705 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r66027 | russell | 2007-05-24 15:44:46 -0500 (Thu, 24 May 2007) | 11 lines
Merged revisions 66026 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66026 | russell | 2007-05-24 15:42:53 -0500 (Thu, 24 May 2007) | 3 lines
Checking for the strip application needs to be done with AC_PATH_TOOL
instead of AC_PATH_PROG to properly handle cross compilation environments.
........
................
r66028 | file | 2007-05-24 15:51:47 -0500 (Thu, 24 May 2007) | 2 lines
Add ListAllVoicemailUsers manager command. (issue #8112 reported by Tony Zhao)
................
r66031 | qwell | 2007-05-24 15:55:51 -0500 (Thu, 24 May 2007) | 15 lines
Merged revisions 66029-66030 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66029 | qwell | 2007-05-24 15:53:18 -0500 (Thu, 24 May 2007) | 2 lines
Following moving strip to AC_PATH_TOOL, we need to do something similar for ar.
........
r66030 | qwell | 2007-05-24 15:54:16 -0500 (Thu, 24 May 2007) | 2 lines
Rebuild configure script for previous ar fix.
........
................
r66069 | russell | 2007-05-24 17:06:41 -0500 (Thu, 24 May 2007) | 9 lines
Blocked revisions 66068 via svnmerge
........
r66068 | russell | 2007-05-24 17:06:13 -0500 (Thu, 24 May 2007) | 2 lines
Make 1.4 build on my machine, too..
........
................
r66071 | kpfleming | 2007-05-24 17:07:50 -0500 (Thu, 24 May 2007) | 2 lines
use the OpenSSL AES implementation if it's available (unless configured not to)
................
r66072 | russell | 2007-05-24 17:08:33 -0500 (Thu, 24 May 2007) | 10 lines
Merged revisions 66070 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66070 | russell | 2007-05-24 17:07:39 -0500 (Thu, 24 May 2007) | 2 lines
Check the result of ast_string_field_init() in ast_channel_alloc()
........
................
r66077 | russell | 2007-05-24 17:25:55 -0500 (Thu, 24 May 2007) | 9 lines
Merged revisions 66076 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66076 | russell | 2007-05-24 17:23:59 -0500 (Thu, 24 May 2007) | 1 line
if the string field init fails, clean up the stuff that was allocated already
........
................
r66109 | file | 2007-05-24 20:37:50 -0500 (Thu, 24 May 2007) | 10 lines
Merged revisions 66074 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66074 | file | 2007-05-24 18:16:58 -0400 (Thu, 24 May 2007) | 2 lines
Fix slinfactory logic when dealing with frames coming in that may already be in the signed linear format.
........
................
r66126 | file | 2007-05-25 08:26:52 -0500 (Fri, 25 May 2007) | 2 lines
Minor tweak... drop translation path if one exists when we get an already signed linear frame in. Chances are the stream has then switched to signed linear and we no longer need the path.
................
r66158 | kpfleming | 2007-05-25 09:37:55 -0500 (Fri, 25 May 2007) | 11 lines
Merged revisions 66157 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66157 | kpfleming | 2007-05-25 10:28:46 -0400 (Fri, 25 May 2007) | 3 lines
handle the GNUTLS library properly in the configure script and build system
don't build in OSP support unless we have found and are allowed to use SSL support
........
................
r66161 | tilghman | 2007-05-25 09:49:20 -0500 (Fri, 25 May 2007) | 18 lines
Merged revisions 66159 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r66159 | tilghman | 2007-05-25 09:41:27 -0500 (Fri, 25 May 2007) | 10 lines
Merged revisions 66127 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r66127 | tilghman | 2007-05-25 08:46:35 -0500 (Fri, 25 May 2007) | 2 lines
Issue 9791 - Fix pronunciation of seconds in Dutch
........
................
................
r66175 | kpfleming | 2007-05-25 10:07:26 -0500 (Fri, 25 May 2007) | 2 lines
more minor fixes
................
r66178 | kpfleming | 2007-05-25 10:08:48 -0500 (Fri, 25 May 2007) | 2 lines
block change that is already here
................
r66208 | russell | 2007-05-26 01:07:38 -0500 (Sat, 26 May 2007) | 4 lines
Since this code now uses the API call for creating a detached thread, there
is no reason to keep a thread attribute structure on the conference structure.
(Pointed out by Tony Mountifield on the asterisk-dev list)
................
r66225 | file | 2007-05-26 14:35:33 -0500 (Sat, 26 May 2007) | 2 lines
Unlock the minivmlock when no configuration is found. (issue #9814 reported by eliel)
................
r66245 | qwell | 2007-05-26 23:15:06 -0500 (Sat, 26 May 2007) | 11 lines
Blocked revisions 66244 via svnmerge
........
r66244 | qwell | 2007-05-26 23:12:37 -0500 (Sat, 26 May 2007) | 4 lines
I don't know what this was trying to do, but it's clearly incorrect.
Issues 9808 and 9809.
........
................
r66278 | tilghman | 2007-05-28 10:59:17 -0500 (Mon, 28 May 2007) | 2 lines
Issue 7021 - Add ICONV function for converting between character sets
................
r66295 | oej | 2007-05-28 13:50:18 -0500 (Mon, 28 May 2007) | 3 lines
- Don't re-invent existing headers (some already existed in chan_sip)
- Rename command so taht module name comes first
................
r66313 | file | 2007-05-28 18:20:20 -0500 (Mon, 28 May 2007) | 9 lines
Blocked revisions 66312 via svnmerge
........
r66312 | file | 2007-05-28 19:16:56 -0400 (Mon, 28 May 2007) | 2 lines
Make the usedistinctiveringdetection option work again. (issue #9823 reported by premeau)
........
................
r66314 | file | 2007-05-28 18:24:04 -0500 (Mon, 28 May 2007) | 2 lines
Due to the way stringfields work the value of the url pointer will always be non-NULL so we have to use ast_strlen_zero to make sure it is not empty. (issue #9821 reported by pj)
................
r66315 | file | 2007-05-28 18:28:52 -0500 (Mon, 28 May 2007) | 2 lines
Don't try to unregister a peer using the sip unregister CLI command if they are not registered. (issue #9811 reported by eliel)
................
r66367 | oej | 2007-05-29 05:02:31 -0500 (Tue, 29 May 2007) | 18 lines
Merged revisions 66363 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r66363 | oej | 2007-05-29 11:41:40 +0200 (Tue, 29 May 2007) | 10 lines
Merged revisions 66349 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r66349 | oej | 2007-05-29 09:53:14 +0200 (Tue, 29 May 2007) | 2 lines
Issue #9802 - Change inuse counter on CANCEL
........
................
................
r66399 | file | 2007-05-29 10:44:51 -0500 (Tue, 29 May 2007) | 10 lines
Merged revisions 66398 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66398 | file | 2007-05-29 11:43:16 -0400 (Tue, 29 May 2007) | 2 lines
Update datastores documentation. (issue #9801 reported by mnicholson)
........
................
r66432 | oej | 2007-05-29 11:17:17 -0500 (Tue, 29 May 2007) | 10 lines
Merged revisions 66404 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66404 | oej | 2007-05-29 18:02:50 +0200 (Tue, 29 May 2007) | 2 lines
Tracking down hanging channels, killing them one by one. Issue #9235 and related
........
................
r66433 | oej | 2007-05-29 11:19:53 -0500 (Tue, 29 May 2007) | 10 lines
Merged revisions 66414 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66414 | oej | 2007-05-29 18:07:44 +0200 (Tue, 29 May 2007) | 2 lines
Don't reset hangupcause if we already have one
........
................
r66438 | file | 2007-05-29 11:46:49 -0500 (Tue, 29 May 2007) | 10 lines
Merged revisions 66437 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66437 | file | 2007-05-29 12:44:34 -0400 (Tue, 29 May 2007) | 2 lines
Handle cases where a frame may have no data. (issue #9519 reported by dmb)
........
................
r66471 | dbailey | 2007-05-29 14:00:40 -0500 (Tue, 29 May 2007) | 2 lines
Changed the dtmf detection to integer based goertzel algorithm.
................
r66502 | oej | 2007-05-29 14:17:49 -0500 (Tue, 29 May 2007) | 10 lines
Merged revisions 66474 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66474 | oej | 2007-05-29 21:02:04 +0200 (Tue, 29 May 2007) | 2 lines
Don't issue hangup on hangup on hangup on hangup (for jcmoore)
........
................
r66504 | oej | 2007-05-29 14:35:43 -0500 (Tue, 29 May 2007) | 10 lines
Merged revisions 66503 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66503 | oej | 2007-05-29 21:32:57 +0200 (Tue, 29 May 2007) | 2 lines
Properly handle 408 request timeout - according to the RFC, the dialog dies if a request in a dialog gets this response.
........
................
r66505 | oej | 2007-05-29 14:53:40 -0500 (Tue, 29 May 2007) | 3 lines
oops. Thanks Terry.
................
r66539 | tilghman | 2007-05-29 16:57:50 -0500 (Tue, 29 May 2007) | 2 lines
Shorten description to a much more reasonable length
................
r66540 | tilghman | 2007-05-29 16:59:21 -0500 (Tue, 29 May 2007) | 18 lines
Merged revisions 66538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r66538 | tilghman | 2007-05-29 16:56:07 -0500 (Tue, 29 May 2007) | 10 lines
Merged revisions 66537 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r66537 | tilghman | 2007-05-29 16:49:35 -0500 (Tue, 29 May 2007) | 2 lines
If the value of a variable passed to FIELDQTY is blank, then FIELDQTY should return 0, not 1.
........
................
................
r66585 | tilghman | 2007-05-30 00:17:09 -0500 (Wed, 30 May 2007) | 2 lines
Issue 9477 - Improve menuselect labels
................
r66603 | file | 2007-05-30 11:10:11 -0500 (Wed, 30 May 2007) | 9 lines
Blocked revisions 66602 via svnmerge
........
r66602 | file | 2007-05-30 12:06:37 -0400 (Wed, 30 May 2007) | 2 lines
Change how channel names are generated a bit. (issue #9825 reported by eldadran)
........
................
r66604 | file | 2007-05-30 11:11:57 -0500 (Wed, 30 May 2007) | 2 lines
This concludes my tweaking of things.
................
r66638 | file | 2007-05-30 12:23:15 -0500 (Wed, 30 May 2007) | 9 lines
Blocked revisions 66637 via svnmerge
........
r66637 | file | 2007-05-30 13:21:06 -0400 (Wed, 30 May 2007) | 2 lines
When calling some peer/host that may not exist/reply back... don't keep the dialog in memory for all of eternity.
........
................
r66672 | mmichelson | 2007-05-30 18:44:42 -0500 (Wed, 30 May 2007) | 10 lines
Merged revisions 66671 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66671 | mmichelson | 2007-05-30 18:26:39 -0500 (Wed, 30 May 2007) | 2 lines
Fixed seg-faults when recording greetings in voicemail with IMAP enabled. (Issue No. 9734, reported by xmarksthespot, patched by me)
........
................
r66705 | oej | 2007-05-31 05:26:55 -0500 (Thu, 31 May 2007) | 4 lines
Issue #9842 - Doxygen updates by snuffy. Thanks!
(Committed from Media Plaza in Utrecht, Netherlands - Open Source VoIP conference)
................
Added:
team/russell/chan_console/funcs/func_iconv.c
- copied unchanged from r66705, trunk/funcs/func_iconv.c
team/russell/chan_console/include/asterisk/aes_internal.h
- copied unchanged from r66705, trunk/include/asterisk/aes_internal.h
Modified:
team/russell/chan_console/ (props changed)
team/russell/chan_console/CHANGES
team/russell/chan_console/apps/app_channelredirect.c
team/russell/chan_console/apps/app_meetme.c
team/russell/chan_console/apps/app_minivm.c
team/russell/chan_console/apps/app_osplookup.c
team/russell/chan_console/apps/app_skel.c
team/russell/chan_console/apps/app_stack.c
team/russell/chan_console/apps/app_transfer.c
team/russell/chan_console/apps/app_voicemail.c
team/russell/chan_console/apps/app_zapras.c
team/russell/chan_console/build_tools/menuselect-deps.in
team/russell/chan_console/channels/chan_features.c
team/russell/chan_console/channels/chan_gtalk.c
team/russell/chan_console/channels/chan_iax2.c
team/russell/chan_console/channels/chan_jingle.c
team/russell/chan_console/channels/chan_sip.c
team/russell/chan_console/channels/chan_vpb.cc
team/russell/chan_console/channels/chan_zap.c
team/russell/chan_console/configure
team/russell/chan_console/configure.ac
team/russell/chan_console/doc/datastores.txt
team/russell/chan_console/funcs/func_cdr.c
team/russell/chan_console/funcs/func_devstate.c
team/russell/chan_console/funcs/func_enum.c
team/russell/chan_console/funcs/func_shell.c
team/russell/chan_console/funcs/func_strings.c
team/russell/chan_console/include/asterisk/aes.h (contents, props changed)
team/russell/chan_console/include/asterisk/app.h
team/russell/chan_console/include/asterisk/autoconfig.h.in
team/russell/chan_console/include/asterisk/event.h
team/russell/chan_console/include/asterisk/event_defs.h
team/russell/chan_console/main/aescrypt.c
team/russell/chan_console/main/aeskey.c
team/russell/chan_console/main/aestab.c
team/russell/chan_console/main/channel.c
team/russell/chan_console/main/dsp.c
team/russell/chan_console/main/rtp.c
team/russell/chan_console/main/say.c
team/russell/chan_console/main/slinfactory.c
team/russell/chan_console/makeopts.in
team/russell/chan_console/pbx/pbx_dundi.c
team/russell/chan_console/res/res_config_odbc.c
team/russell/chan_console/res/res_config_sqlite.c
team/russell/chan_console/res/res_indications.c
team/russell/chan_console/res/res_jabber.c
team/russell/chan_console/res/res_odbc.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 Thu May 31 09:46:23 2007
@@ -1,1 +1,1 @@
-/trunk:1-66001
+/trunk:1-66721
Modified: team/russell/chan_console/CHANGES
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/CHANGES?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/CHANGES (original)
+++ team/russell/chan_console/CHANGES Thu May 31 09:46:23 2007
@@ -18,6 +18,8 @@
and "ChannelDriver" headers.
* Added a "Bridge" action which allows you to bridge any two channels that
are currently active on the system.
+ * Added a "ListAllVoicemailUsers" action that allows you to get a list of all
+ the voicemail users setup.
Dialplan functions
------------------
Modified: team/russell/chan_console/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_channelredirect.c?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/apps/app_channelredirect.c (original)
+++ team/russell/chan_console/apps/app_channelredirect.c Thu May 31 09:46:23 2007
@@ -137,4 +137,4 @@
return ast_register_application(app, asyncgoto_exec, synopsis, descrip);
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Channel Redirect");
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Redirects a given channel to a dialplan target");
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=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/apps/app_meetme.c (original)
+++ team/russell/chan_console/apps/app_meetme.c Thu May 31 09:46:23 2007
@@ -323,7 +323,6 @@
unsigned int isdynamic:1; /*!< Created on the fly? */
unsigned int locked:1; /*!< Is the conference locked? */
pthread_t recordthread; /*!< thread for recording */
- pthread_attr_t attr; /*!< thread attribute */
const char *recordingfilename; /*!< Filename to record the Conference into */
const char *recordingformat; /*!< Format to record the Conference in */
char pin[MAX_PIN]; /*!< If protected by a PIN */
@@ -725,6 +724,7 @@
* \param make Make the conf if it doesn't exist
* \param dynamic Mark the newly created conference as dynamic
* \param refcount How many references to mark on the conference
+ * \param chan The asterisk channel
*
* \return A pointer to the conference struct, or NULL if it wasn't found and
* make or dynamic were not set.
@@ -1428,7 +1428,7 @@
ast_hangup(conf->lchan);
conf->lchan = NULL;
} else {
- ast_pthread_create_detached_background(&conf->recordthread, &conf->attr, recordthread, conf);
+ ast_pthread_create_detached_background(&conf->recordthread, NULL, recordthread, conf);
}
}
@@ -3649,7 +3649,7 @@
/*! \brief Calculate the ring delay for a given ringing trunk on a station
* \param station the station
- * \param trunk the trunk. If NULL, the highest priority ringing trunk will be used
+ * \param ringing_trunk the trunk. If NULL, the highest priority ringing trunk will be used
* \return the number of ms left before the delay is complete, or INT_MAX if there is no delay
*/
static int sla_check_station_delay(struct sla_station *station,
Modified: team/russell/chan_console/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_minivm.c?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/apps/app_minivm.c (original)
+++ team/russell/chan_console/apps/app_minivm.c Thu May 31 09:46:23 2007
@@ -1146,6 +1146,7 @@
/*! \brief Checks if directory exists. Does not create directory, but builds string in dest
* \param dest String. base directory.
+ * \param len Int. Length base directory string.
* \param domain String. Ignored if is null or empty string.
* \param username String. Ignored if is null or empty string.
* \param folder String. Ignored if is null or empty string.
@@ -1166,7 +1167,7 @@
* \param len Length of directory string
* \param domain String. Ignored if is null or empty string.
* \param folder String. Ignored if is null or empty string.
- * \param ext String. Ignored if is null or empty string.
+ * \param username String. Ignored if is null or empty string.
* \return -1 on failure, 0 on success.
*/
static int create_dirpath(char *dest, int len, char *domain, char *username, char *folder)
@@ -2515,6 +2516,7 @@
/* Make sure we could load configuration file */
if (!cfg) {
ast_log(LOG_WARNING, "Failed to load configuration file. Module activated with default settings.\n");
+ ast_mutex_unlock(&minivmlock);
return 0;
}
@@ -2897,6 +2899,7 @@
/*! \brief Access counter file, lock directory, read and possibly write it again changed
\param directory Directory to crate file in
+ \param countername filename
\param value If set to zero, we only read the variable
\param operand 0 to read, 1 to set new value, 2 to change
\return -1 on error, otherwise counter value
Modified: team/russell/chan_console/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_osplookup.c?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/apps/app_osplookup.c (original)
+++ team/russell/chan_console/apps/app_osplookup.c Thu May 31 09:46:23 2007
@@ -1115,6 +1115,7 @@
/*!
* \brief OSP Lookup Next function
+ * \param provider OSP provider name
* \param cause Asterisk hangup cuase
* \param result Lookup results, in/output
* \return 1 Found , 0 No route, -1 Error
Modified: team/russell/chan_console/apps/app_skel.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_skel.c?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/apps/app_skel.c (original)
+++ team/russell/chan_console/apps/app_skel.c Thu May 31 09:46:23 2007
@@ -20,7 +20,7 @@
*
* \brief Skeleton application
*
- * \author <Your Name Here> <<Your Email Here>>
+ * \author\verbatim <Your Name Here> <<Your Email Here>> \endvebatim
*
* This is a skeleton for development of an Asterisk application
* \ingroup applications
Modified: team/russell/chan_console/apps/app_stack.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_stack.c?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/apps/app_stack.c (original)
+++ team/russell/chan_console/apps/app_stack.c Thu May 31 09:46:23 2007
@@ -338,4 +338,4 @@
return 0;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Stack Routines");
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Dialplan subroutines (Gosub, Return, etc)");
Modified: team/russell/chan_console/apps/app_transfer.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_transfer.c?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/apps/app_transfer.c (original)
+++ team/russell/chan_console/apps/app_transfer.c Thu May 31 09:46:23 2007
@@ -153,4 +153,4 @@
return ast_register_application(app, transfer_exec, synopsis, descrip);
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Transfer");
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Transfers a caller to another extension");
Modified: team/russell/chan_console/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_voicemail.c?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/apps/app_voicemail.c (original)
+++ team/russell/chan_console/apps/app_voicemail.c Thu May 31 09:46:23 2007
@@ -5981,7 +5981,11 @@
if (ast_test_flag(vmu, VM_FORCENAME)) {
snprintf(prefile,sizeof(prefile), "%s%s/%s/greet", VM_SPOOL_DIR, vmu->context, vms->username);
if (ast_fileexists(prefile, NULL, NULL) < 1) {
+#ifndef IMAP_STORAGE
cmd = play_record_review(chan, "vm-rec-name", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
+#else
+ cmd = play_record_review(chan, "vm-rec-name", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
+#endif
if (cmd < 0 || cmd == 't' || cmd == '#')
return cmd;
}
@@ -5991,14 +5995,22 @@
if (ast_test_flag(vmu, VM_FORCEGREET)) {
snprintf(prefile,sizeof(prefile), "%s%s/%s/unavail", VM_SPOOL_DIR, vmu->context, vms->username);
if (ast_fileexists(prefile, NULL, NULL) < 1) {
+#ifndef IMAP_STORAGE
cmd = play_record_review(chan, "vm-rec-unv", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
+#else
+ cmd = play_record_review(chan, "vm-rec-unv", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
+#endif
if (cmd < 0 || cmd == 't' || cmd == '#')
return cmd;
}
snprintf(prefile,sizeof(prefile), "%s%s/%s/busy", VM_SPOOL_DIR, vmu->context, vms->username);
if (ast_fileexists(prefile, NULL, NULL) < 1) {
+#ifndef IMAP_STORAGE
cmd = play_record_review(chan, "vm-rec-busy", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
+#else
+ cmd = play_record_review(chan, "vm-rec-busy", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
+#endif
if (cmd < 0 || cmd == 't' || cmd == '#')
return cmd;
}
@@ -6033,15 +6045,27 @@
switch (cmd) {
case '1':
snprintf(prefile,sizeof(prefile), "%s%s/%s/unavail", VM_SPOOL_DIR, vmu->context, vms->username);
+#ifndef IMAP_STORAGE
cmd = play_record_review(chan,"vm-rec-unv",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
+#else
+ cmd = play_record_review(chan,"vm-rec-unv",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
+#endif
break;
case '2':
snprintf(prefile,sizeof(prefile), "%s%s/%s/busy", VM_SPOOL_DIR, vmu->context, vms->username);
+#ifndef IMAP_STORAGE
cmd = play_record_review(chan,"vm-rec-busy",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
+#else
+ cmd = play_record_review(chan,"vm-rec-busy",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
+#endif
break;
case '3':
snprintf(prefile,sizeof(prefile), "%s%s/%s/greet", VM_SPOOL_DIR, vmu->context, vms->username);
+#ifndef IMAP_STORAGE
cmd = play_record_review(chan,"vm-rec-name",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
+#else
+ cmd = play_record_review(chan,"vm-rec-name",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
+#endif
break;
case '4':
cmd = vm_tempgreeting(chan, vmu, vms, fmtc, record_gain);
@@ -6136,12 +6160,20 @@
retries = 0;
RETRIEVE(prefile, -1);
if (ast_fileexists(prefile, NULL, NULL) <= 0) {
+#ifndef IMAP_STORAGE
play_record_review(chan, "vm-rec-temp", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
+#else
+ play_record_review(chan, "vm-rec-temp", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
+#endif
cmd = 't';
} else {
switch (cmd) {
case '1':
+#ifndef IMAP_STORAGE
cmd = play_record_review(chan, "vm-rec-temp", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
+#else
+ cmd = play_record_review(chan, "vm-rec-temp", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
+#endif
break;
case '2':
DELETE(prefile, -1, prefile);
@@ -7505,6 +7537,73 @@
poll_thread = AST_PTHREADT_NULL;
}
+/*! \brief Manager list voicemail users command */
+static int manager_list_voicemail_users(struct mansession *s, const struct message *m)
+{
+ struct ast_vm_user *vmu = NULL;
+ const char *id = astman_get_header(m, "ActionID");
+ char actionid[128] = "";
+
+ if (!ast_strlen_zero(id))
+ snprintf(actionid, sizeof(actionid), "ActionID: %s\r\n", id);
+
+ AST_LIST_LOCK(&users);
+
+ if (AST_LIST_EMPTY(&users)) {
+ astman_send_ack(s, m, "There are no voicemail users currently defined.");
+ AST_LIST_UNLOCK(&users);
+ return RESULT_SUCCESS;
+ }
+
+ astman_send_ack(s, m, "Voicemail user list will follow\r\n");
+
+ AST_LIST_TRAVERSE(&users, vmu, list) {
+ char dirname[256];
+
+ make_dir(dirname, sizeof(dirname), vmu->context, vmu->mailbox, "INBOX");
+ astman_append(s,
+ "%s"
+ "Event: VoicemailUserEntry\r\n"
+ "VMContext: %s\r\n"
+ "VoiceMailbox: %s\r\n"
+ "Fullname: %s\r\n"
+ "Email: %s\r\n"
+ "Pager: %s\r\n"
+ "ServerEmail: %s\r\n"
+ "MailCommand: %s\r\n"
+ "Language: %s\r\n"
+ "TimeZone: %s\r\n"
+ "Callback: %s\r\n"
+ "Dialout: %s\r\n"
+ "UniqueID: %s\r\n"
+ "ExitContext: %s\r\n"
+ "SayDurationMinimum: %d\r\n"
+ "AttachmentFormat: %s\r\n"
+ "VolumeGain: %.2lf\r\n"
+ "MaxMessageCount: %d\r\n"
+ "MaxMessageLength: %d\r\n"
+ "NewMessageCount: %d\r\n"
+#ifdef IMAP_STORAGE
+ "IMAPUser: %s\r\n"
+#endif
+ "\r\n",
+ actionid, vmu->context, vmu->mailbox, vmu->fullname, vmu->email,
+ vmu->pager, vmu->serveremail, vmu->mailcmd, vmu->language,
+ vmu->zonetag, vmu->callback, vmu->dialout, vmu->uniqueid,
+ vmu->exit, vmu->saydurationm, vmu->attachfmt, vmu->volgain,
+ vmu->maxmsg, vmu->maxsecs, count_messages(vmu, dirname)
+#ifdef IMAP_STORAGE
+ , vmu->imapuser
+#endif
+ );
+ }
+ astman_append(s, "Event: VoicemailUserEntryComplete\r\n%s\r\n", actionid);
+
+ AST_LIST_UNLOCK(&users);
+
+ return RESULT_SUCCESS;
+}
+
static int load_config(void)
{
struct ast_vm_user *cur;
@@ -8089,6 +8188,7 @@
res |= ast_unregister_application(app3);
res |= ast_unregister_application(app4);
res |= ast_custom_function_unregister(&mailbox_exists_acf);
+ res |= ast_manager_unregister("VoicemailUsersList");
ast_cli_unregister_multiple(cli_voicemail, sizeof(cli_voicemail) / sizeof(struct ast_cli_entry));
ast_uninstall_vm_functions();
@@ -8115,6 +8215,7 @@
res |= ast_register_application(app3, vm_box_exists, synopsis_vm_box_exists, descrip_vm_box_exists);
res |= ast_register_application(app4, vmauthenticate, synopsis_vmauthenticate, descrip_vmauthenticate);
res |= ast_custom_function_register(&mailbox_exists_acf);
+ res |= ast_manager_register("VoicemailUsersList", EVENT_FLAG_CALL, manager_list_voicemail_users, "List All Voicemail User Information");
if (res)
return res;
Modified: team/russell/chan_console/apps/app_zapras.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_zapras.c?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/apps/app_zapras.c (original)
+++ team/russell/chan_console/apps/app_zapras.c Thu May 31 09:46:23 2007
@@ -256,5 +256,5 @@
return ast_register_application(app, zapras_exec, synopsis, descrip);
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Zap RAS Application");
-
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Zaptel ISDN Remote Access Server");
+
Modified: team/russell/chan_console/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/build_tools/menuselect-deps.in?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/build_tools/menuselect-deps.in (original)
+++ team/russell/chan_console/build_tools/menuselect-deps.in Thu May 31 09:46:23 2007
@@ -26,6 +26,7 @@
SQLITE=@PBX_SQLITE@
SQLITE3=@PBX_SQLITE3@
SSL=@PBX_OPENSSL@
+CRYPTO=@PBX_CRYPTO@
TONEZONE=@PBX_TONEZONE@
UNIXODBC=@PBX_UNIXODBC@
VORBIS=@PBX_VORBIS@
Modified: team/russell/chan_console/channels/chan_features.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_features.c?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/channels/chan_features.c (original)
+++ team/russell/chan_console/channels/chan_features.c Thu May 31 09:46:23 2007
@@ -462,7 +462,7 @@
for (x=1;x<4;x++) {
if (b2)
free(b2);
- asprintf(&b2, "Feature/%s/%s-%d", p->tech, p->dest, x);
+ asprintf(&b2, "%s/%s-%d", p->tech, p->dest, x);
for (y=0;y<3;y++) {
if (y == index)
continue;
@@ -472,7 +472,7 @@
if (y >= 3)
break;
}
- tmp = ast_channel_alloc(0, state, 0,0, "", "", "", 0, b2);
+ tmp = ast_channel_alloc(0, state, 0,0, "", "", "", 0, "Feature/%s", b2);
/* free up the name, it was copied into the channel name */
if (b2)
free(b2);
Modified: team/russell/chan_console/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_gtalk.c?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/channels/chan_gtalk.c (original)
+++ team/russell/chan_console/channels/chan_gtalk.c Thu May 31 09:46:23 2007
@@ -28,6 +28,7 @@
/*** MODULEINFO
<depend>iksemel</depend>
<depend>res_jabber</depend>
+ <use>gnutls</use>
***/
#include "asterisk.h"
Modified: team/russell/chan_console/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_iax2.c?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/channels/chan_iax2.c (original)
+++ team/russell/chan_console/channels/chan_iax2.c Thu May 31 09:46:23 2007
@@ -30,6 +30,7 @@
/*** MODULEINFO
<use>zaptel</use>
+ <use>crypto</use>
***/
#include "asterisk.h"
@@ -594,9 +595,9 @@
/*! permitted encryption methods */
int encmethods;
/*! Encryption AES-128 Key */
- aes_encrypt_ctx ecx;
+ ast_aes_encrypt_key ecx;
/*! Decryption AES-128 Key */
- aes_decrypt_ctx dcx;
+ ast_aes_decrypt_key dcx;
/*! 32 bytes of semi-random data */
unsigned char semirand[32];
/*! Associated registry */
@@ -615,8 +616,8 @@
struct sockaddr_in transfer;
/*! What's the new call number for the transfer */
unsigned short transfercallno;
- /*! Transfer decrypt AES-128 Key */
- aes_encrypt_ctx tdcx;
+ /*! Transfer encrypt AES-128 Key */
+ ast_aes_encrypt_key tdcx;
/*! Status of knowledge of peer ADSI capability */
int peeradsicpe;
@@ -3804,13 +3805,13 @@
return 0;
}
-static void build_enc_keys(const unsigned char *digest, aes_encrypt_ctx *ecx, aes_decrypt_ctx *dcx)
-{
- aes_encrypt_key128(digest, ecx);
- aes_decrypt_key128(digest, dcx);
-}
-
-static void memcpy_decrypt(unsigned char *dst, const unsigned char *src, int len, aes_decrypt_ctx *dcx)
+static void build_enc_keys(const unsigned char *digest, ast_aes_encrypt_key *ecx, ast_aes_decrypt_key *dcx)
+{
+ ast_aes_encrypt_key(digest, ecx);
+ ast_aes_decrypt_key(digest, dcx);
+}
+
+static void memcpy_decrypt(unsigned char *dst, const unsigned char *src, int len, ast_aes_decrypt_key *dcx)
{
#if 0
/* Debug with "fake encryption" */
@@ -3823,7 +3824,7 @@
unsigned char lastblock[16] = { 0 };
int x;
while(len > 0) {
- aes_decrypt(src, dst, dcx);
+ ast_aes_decrypt(src, dst, dcx);
for (x=0;x<16;x++)
dst[x] ^= lastblock[x];
memcpy(lastblock, src, sizeof(lastblock));
@@ -3834,7 +3835,7 @@
#endif
}
-static void memcpy_encrypt(unsigned char *dst, const unsigned char *src, int len, aes_encrypt_ctx *ecx)
+static void memcpy_encrypt(unsigned char *dst, const unsigned char *src, int len, ast_aes_encrypt_key *ecx)
{
#if 0
/* Debug with "fake encryption" */
@@ -3849,7 +3850,7 @@
while(len > 0) {
for (x=0;x<16;x++)
curblock[x] ^= src[x];
- aes_encrypt(curblock, dst, ecx);
+ ast_aes_encrypt(curblock, dst, ecx);
memcpy(curblock, dst, sizeof(curblock));
dst += 16;
src += 16;
@@ -3858,7 +3859,7 @@
#endif
}
-static int decode_frame(aes_decrypt_ctx *dcx, struct ast_iax2_full_hdr *fh, struct ast_frame *f, int *datalen)
+static int decode_frame(ast_aes_decrypt_key *dcx, struct ast_iax2_full_hdr *fh, struct ast_frame *f, int *datalen)
{
int padding;
unsigned char *workspace;
@@ -3903,7 +3904,7 @@
return 0;
}
-static int encrypt_frame(aes_encrypt_ctx *ecx, struct ast_iax2_full_hdr *fh, unsigned char *poo, int *datalen)
+static int encrypt_frame(ast_aes_encrypt_key *ecx, struct ast_iax2_full_hdr *fh, unsigned char *poo, int *datalen)
{
int padding;
unsigned char *workspace;
@@ -5262,7 +5263,7 @@
}
-static int authenticate(const char *challenge, const char *secret, const char *keyn, int authmethods, struct iax_ie_data *ied, struct sockaddr_in *sin, aes_encrypt_ctx *ecx, aes_decrypt_ctx *dcx)
+static int authenticate(const char *challenge, const char *secret, const char *keyn, int authmethods, struct iax_ie_data *ied, struct sockaddr_in *sin, ast_aes_encrypt_key *ecx, ast_aes_decrypt_key *dcx)
{
int res = -1;
int x;
Modified: team/russell/chan_console/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_jingle.c?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/channels/chan_jingle.c (original)
+++ team/russell/chan_console/channels/chan_jingle.c Thu May 31 09:46:23 2007
@@ -30,6 +30,7 @@
/*** MODULEINFO
<depend>iksemel</depend>
<depend>res_jabber</depend>
+ <use>gnutls</use>
***/
#include "asterisk.h"
@@ -49,6 +50,12 @@
#include <arpa/inet.h>
#include <sys/signal.h>
#include <iksemel.h>
+#include <pthread.h>
+
+#ifdef HAVE_GNUTLS
+#include <gcrypt.h>
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif /* HAVE_GNUTLS */
#include "asterisk/lock.h"
#include "asterisk/channel.h"
@@ -1673,6 +1680,10 @@
/*! \brief Load module into PBX, register channel */
static int load_module(void)
{
+#ifdef HAVE_GNUTLS
+ gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#endif /* HAVE_GNUTLS */
+
ASTOBJ_CONTAINER_INIT(&jingles);
if (!jingle_load_config()) {
ast_log(LOG_ERROR, "Unable to read config file %s. Not loading module.\n", JINGLE_CONFIG);
Modified: team/russell/chan_console/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_sip.c?view=diff&rev=66722&r1=66721&r2=66722
==============================================================================
--- team/russell/chan_console/channels/chan_sip.c (original)
+++ team/russell/chan_console/channels/chan_sip.c Thu May 31 09:46:23 2007
@@ -1585,7 +1585,7 @@
static struct ast_frame *sip_rtp_read(struct ast_channel *ast, struct sip_pvt *p, int *faxdetect);
/*------ T38 Support --------- */
-static int sip_handle_t38_reinvite(struct ast_channel *chan, struct sip_pvt *pvt, int reinvite); /*!< T38 negotiation helper function */
+static int sip_handle_t38_reinvite(struct ast_channel *chan, struct sip_pvt *pvt, int reinvite);
static int transmit_response_with_t38_sdp(struct sip_pvt *p, char *msg, struct sip_request *req, int retrans);
static struct ast_udptl *sip_get_udptl_peer(struct ast_channel *chan);
static int sip_set_udptl_peer(struct ast_channel *chan, struct ast_udptl *udptl);
@@ -2096,14 +2096,16 @@
usleep(1);
sip_pvt_lock(pkt->owner);
}
+ if (pkt->owner->owner && !pkt->owner->owner->hangupcause)
+ pkt->owner->owner->hangupcause = AST_CAUSE_NO_USER_RESPONSE;
if (pkt->method == SIP_BYE) {
/* Ok, we're not getting answers on SIP BYE's. Who cares?
let's take the call down anyway. */
- if (pkt->owner->owner)
+ if (pkt->owner->owner)
ast_channel_unlock(pkt->owner->owner);
append_history(pkt->owner, "ByeFailure", "Remote peer doesn't respond to bye. Destroying call anyway.");
ast_set_flag(&pkt->owner->flags[0], SIP_NEEDDESTROY);
- } if (pkt->owner->owner) {
+ } else if (pkt->owner->owner) {
sip_alreadygone(pkt->owner);
ast_log(LOG_WARNING, "Hanging up call %s - no reply to our critical packet.\n", pkt->owner->callid);
ast_queue_hangup(pkt->owner->owner);
@@ -2112,8 +2114,12 @@
/* If no channel owner, destroy now */
/* Let the peerpoke system expire packets when the timer expires for poke_noanswer */
- if (pkt->method != SIP_OPTIONS && pkt->method != SIP_REGISTER)
+ if (pkt->method != SIP_OPTIONS && pkt->method != SIP_REGISTER) {
ast_set_flag(&pkt->owner->flags[0], SIP_NEEDDESTROY);
+ sip_alreadygone(pkt->owner);
+ if (option_debug)
[... 3313 lines stripped ...]
More information about the asterisk-commits
mailing list