[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r335778 - in /team/irroot/di...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Sep 14 00:59:21 CDT 2011
Author: irroot
Date: Wed Sep 14 00:59:17 2011
New Revision: 335778
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335778
Log:
Re enable automerge and merge changes
Modified:
team/irroot/distrotech-customers-trunk/ (props changed)
team/irroot/distrotech-customers-trunk/CREDITS
team/irroot/distrotech-customers-trunk/UPGRADE.txt
team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c
team/irroot/distrotech-customers-trunk/apps/app_dial.c
team/irroot/distrotech-customers-trunk/apps/app_directed_pickup.c
team/irroot/distrotech-customers-trunk/cdr/cdr_csv.c
team/irroot/distrotech-customers-trunk/channels/sig_pri.c
team/irroot/distrotech-customers-trunk/configs/sip.conf.sample
team/irroot/distrotech-customers-trunk/configure
team/irroot/distrotech-customers-trunk/configure.ac
team/irroot/distrotech-customers-trunk/funcs/func_frame_trace.c
team/irroot/distrotech-customers-trunk/include/asterisk/event.h
team/irroot/distrotech-customers-trunk/include/asterisk/frame.h
team/irroot/distrotech-customers-trunk/include/asterisk/indications.h
team/irroot/distrotech-customers-trunk/main/asterisk.c
team/irroot/distrotech-customers-trunk/main/cdr.c
team/irroot/distrotech-customers-trunk/main/channel.c
team/irroot/distrotech-customers-trunk/main/dial.c
team/irroot/distrotech-customers-trunk/main/dnsmgr.c
team/irroot/distrotech-customers-trunk/main/dsp.c
team/irroot/distrotech-customers-trunk/main/event.c
team/irroot/distrotech-customers-trunk/main/features.c
team/irroot/distrotech-customers-trunk/main/manager.c
team/irroot/distrotech-customers-trunk/main/pbx.c
team/irroot/distrotech-customers-trunk/res/ais/evt.c
Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
automerge = *
Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.
Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
svnmerge-integrated = /trunk:1-335777
Modified: team/irroot/distrotech-customers-trunk/CREDITS
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/CREDITS?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/CREDITS (original)
+++ team/irroot/distrotech-customers-trunk/CREDITS Wed Sep 14 00:59:17 2011
@@ -22,6 +22,8 @@
Omnitor AB, Gunnar Hellström, for funding work with videocaps, T.140 RED,
originate with video/text and many more contributions.
+
+ClearIT AB for work with RTCP, manager and tonezones
=== WISHLIST CONTRIBUTERS ===
Jeremy McNamara - SpeeX support
Modified: team/irroot/distrotech-customers-trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/UPGRADE.txt?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/UPGRADE.txt (original)
+++ team/irroot/distrotech-customers-trunk/UPGRADE.txt Wed Sep 14 00:59:17 2011
@@ -26,6 +26,20 @@
- ENUM query functions now return a count of -1 on lookup error to
differentiate between a failed query and a successful query with 0 results
matching the specified type.
+
+Configuration Files:
+ - Files listed below have been updated to be more consistent with how Asterisk
+ parses configuration files. This makes configuration files more consistent
+ with what is expected across modules.
+
+ - cdr.conf: [general] and [csv] sections
+ - dnsmgr.conf
+ - dsp.conf
+
+SIP
+===
+ - A new option "tonezone" for setting default tonezone for the channel driver
+ or individual devices
From 1.8 to 10:
Modified: team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c (original)
+++ team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c Wed Sep 14 00:59:17 2011
@@ -1243,21 +1243,24 @@
ast_mutex_lock(&p->lock);
switch (condition) {
+ case AST_CONTROL_INCOMPLETE:
+ /* While h323 does support overlapped dialing, this channel driver does not
+ * at this time. Treat a response of Incomplete as if it were congestion.
+ */
case AST_CONTROL_CONGESTION:
if (!ast_test_flag(p, H323_ALREADYGONE)) {
- ooHangCall(callToken, OO_REASON_LOCAL_CONGESTED,
- AST_CAUSE_SWITCH_CONGESTION);
+ ooHangCall(callToken, OO_REASON_LOCAL_CONGESTED, AST_CAUSE_SWITCH_CONGESTION);
ast_set_flag(p, H323_ALREADYGONE);
}
break;
case AST_CONTROL_BUSY:
if (!ast_test_flag(p, H323_ALREADYGONE)) {
- ooHangCall(callToken, OO_REASON_LOCAL_BUSY, AST_CAUSE_USER_BUSY);
+ ooHangCall(callToken, OO_REASON_LOCAL_BUSY, AST_CAUSE_USER_BUSY);
ast_set_flag(p, H323_ALREADYGONE);
}
break;
case AST_CONTROL_HOLD:
- ast_moh_start(ast, data, NULL);
+ ast_moh_start(ast, data, NULL);
break;
case AST_CONTROL_UNHOLD:
ast_moh_stop(ast);
Modified: team/irroot/distrotech-customers-trunk/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/apps/app_dial.c?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/apps/app_dial.c (original)
+++ team/irroot/distrotech-customers-trunk/apps/app_dial.c Wed Sep 14 00:59:17 2011
@@ -1351,7 +1351,7 @@
case AST_FRAME_VOICE:
case AST_FRAME_IMAGE:
case AST_FRAME_TEXT:
- if (ast_write(in, f)) {
+ if (!ast_test_flag64(outgoing, OPT_RINGBACK | OPT_MUSICBACK) && ast_write(in, f)) {
ast_log(LOG_WARNING, "Unable to write frametype: %d\n",
f->frametype);
}
@@ -2423,14 +2423,6 @@
} else { /* Nobody answered, next please? */
res = 0;
}
-
- /* SIP, in particular, sends back this error code to indicate an
- * overlap dialled number needs more digits. */
- if (chan->hangupcause == AST_CAUSE_INVALID_NUMBER_FORMAT) {
- res = AST_PBX_INCOMPLETE;
- }
-
- /* almost done, although the 'else' block is 400 lines */
} else {
const char *number;
Modified: team/irroot/distrotech-customers-trunk/apps/app_directed_pickup.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/apps/app_directed_pickup.c?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/apps/app_directed_pickup.c (original)
+++ team/irroot/distrotech-customers-trunk/apps/app_directed_pickup.c Wed Sep 14 00:59:17 2011
@@ -101,7 +101,6 @@
static const char app[] = "Pickup";
static const char app2[] = "PickupChan";
-/*! \todo This application should return a result code, like PICKUPRESULT */
struct pickup_by_name_args {
const char *name;
Modified: team/irroot/distrotech-customers-trunk/cdr/cdr_csv.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/cdr/cdr_csv.c?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/cdr/cdr_csv.c (original)
+++ team/irroot/distrotech-customers-trunk/cdr/cdr_csv.c Wed Sep 14 00:59:17 2011
@@ -50,7 +50,7 @@
#define DATE_FORMAT "%Y-%m-%d %T"
static int usegmtime = 0;
-static int accountlogs;
+static int accountlogs = 1;
static int loguniqueid = 0;
static int loguserfield = 0;
static int loaded = 0;
@@ -95,52 +95,38 @@
static int load_config(int reload)
{
struct ast_config *cfg;
- struct ast_variable *var;
- const char *tmp;
+ struct ast_variable *v;
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
if (!(cfg = ast_config_load(config, config_flags)) || cfg == CONFIG_STATUS_FILEINVALID) {
ast_log(LOG_WARNING, "unable to load config: %s\n", config);
return 0;
- } else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
+ } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
return 1;
+ }
accountlogs = 1;
usegmtime = 0;
loguniqueid = 0;
loguserfield = 0;
- if (!(var = ast_variable_browse(cfg, "csv"))) {
+ if (!(v = ast_variable_browse(cfg, "csv"))) {
ast_config_destroy(cfg);
return 0;
}
- if ((tmp = ast_variable_retrieve(cfg, "csv", "usegmtime"))) {
- usegmtime = ast_true(tmp);
- if (usegmtime)
- ast_debug(1, "logging time in GMT\n");
- }
-
- /* Turn on/off separate files per accountcode. Default is on (as before) */
- if ((tmp = ast_variable_retrieve(cfg, "csv", "accountlogs"))) {
- accountlogs = ast_true(tmp);
- if (accountlogs) {
- ast_debug(1, "logging in separate files per accountcode\n");
- }
- }
-
- if ((tmp = ast_variable_retrieve(cfg, "csv", "loguniqueid"))) {
- loguniqueid = ast_true(tmp);
- if (loguniqueid)
- ast_debug(1, "logging CDR field UNIQUEID\n");
- }
-
- if ((tmp = ast_variable_retrieve(cfg, "csv", "loguserfield"))) {
- loguserfield = ast_true(tmp);
- if (loguserfield)
- ast_debug(1, "logging CDR user-defined field\n");
- }
-
+ for (; v; v = v->next) {
+ if (!strcasecmp(v->name, "usegmtime")) {
+ usegmtime = ast_true(v->value);
+ } else if (!strcasecmp(v->name, "accountlogs")) {
+ /* Turn on/off separate files per accountcode. Default is on (as before) */
+ accountlogs = ast_true(v->value);
+ } else if (!strcasecmp(v->name, "loguniqueid")) {
+ loguniqueid = ast_true(v->value);
+ } else if (!strcasecmp(v->name, "loguserfield")) {
+ loguserfield = ast_true(v->value);
+ }
+ }
ast_config_destroy(cfg);
return 1;
}
@@ -337,8 +323,9 @@
{
int res;
- if(!load_config(0))
+ if (!load_config(0)) {
return AST_MODULE_LOAD_DECLINE;
+ }
if ((res = ast_cdr_register(name, ast_module_info->description, csv_log))) {
ast_log(LOG_ERROR, "Unable to register CSV CDR handling\n");
Modified: team/irroot/distrotech-customers-trunk/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/sig_pri.c?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/sig_pri.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/sig_pri.c Wed Sep 14 00:59:17 2011
@@ -7825,6 +7825,15 @@
/* don't continue in ast_indicate */
res = 0;
break;
+ case AST_CONTROL_INCOMPLETE:
+ /* If we are connected or if we support overlap dialing, wait for additional digits */
+ if (p->call_level == SIG_PRI_CALL_LEVEL_CONNECT || (p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING)) {
+ res = 0;
+ break;
+ }
+ /* Otherwise, treat as congestion */
+ chan->hangupcause = AST_CAUSE_INVALID_NUMBER_FORMAT;
+ /* Falls through */
case AST_CONTROL_CONGESTION:
if (p->priindication_oob || p->no_b_channel) {
/* There are many cause codes that generate an AST_CONTROL_CONGESTION. */
Modified: team/irroot/distrotech-customers-trunk/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/configs/sip.conf.sample?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/configs/sip.conf.sample (original)
+++ team/irroot/distrotech-customers-trunk/configs/sip.conf.sample Wed Sep 14 00:59:17 2011
@@ -307,6 +307,9 @@
; Parkinglots are configured in features.conf
;language=en ; Default language setting for all users/peers
; This may also be set for individual users/peers
+;tonezone=se ; Default tonezone for all users/peers
+ ; This may also be set for individual users/peers
+
;relaxdtmf=yes ; Relax dtmf handling
;trustrpid = no ; If Remote-Party-ID should be trusted
;sendrpid = yes ; If Remote-Party-ID should be sent (defaults to no)
Modified: team/irroot/distrotech-customers-trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/configure.ac?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/configure.ac (original)
+++ team/irroot/distrotech-customers-trunk/configure.ac Wed Sep 14 00:59:17 2011
@@ -475,6 +475,49 @@
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/event.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h sys/io.h])
+# Any one of these 4 packages support a mandatory requirement, so we want to check on them as early as possible.
+AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], [])
+AST_EXT_LIB_CHECK([TINFO], [tinfo], [tgetent], [])
+AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
+AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])
+
+EDITLINE_LIB=""
+if test "x$TERMCAP_LIB" != "x" ; then
+ EDITLINE_LIB="$TERMCAP_LIB"
+elif test "x$TINFO_LIB" != "x" ; then
+ EDITLINE_LIB="$TINFO_LIB"
+elif test "x$CURSES_LIB" != "x" ; then
+ EDITLINE_LIB="$CURSES_LIB"
+elif test "x$NCURSES_LIB" != "x" ; then
+ EDITLINE_LIB="$NCURSES_LIB"
+else
+ AC_MSG_ERROR([*** termcap support not found (on modern systems, this typically means the ncurses development package is missing)])
+fi
+AC_SUBST(EDITLINE_LIB)
+
+# Another mandatory item (unless it's explicitly disabled)
+AC_ARG_ENABLE([xmldoc],
+ [AS_HELP_STRING([--disable-xmldoc],
+ [Explicity disable XML documentation])],
+ [case "${enableval}" in
+ y|ye|yes) disable_xmldoc=no ;;
+ n|no) disable_xmldoc=yes ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-xmldoc) ;;
+ esac], [disable_xmldoc=no])
+
+if test "${disable_xmldoc}" != "yes"; then
+ AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , ,
+ [#include <libxml/tree.h>
+ #include <libxml/parser.h>],
+ [LIBXML_TEST_VERSION])
+ if test "${PBX_LIBXML2}" != 1; then
+ AC_MSG_NOTICE(*** XML documentation will not be available because the 'libxml2' development package is missing.)
+ AC_MSG_NOTICE(*** Please run the 'configure' script with the '--disable-xmldoc' parameter option)
+ AC_MSG_NOTICE(*** or install the 'libxml2' development package.)
+ exit 1
+ fi
+fi
+
# some embedded systems omit internationalization (locale) support
AC_CHECK_HEADERS([xlocale.h])
@@ -1056,8 +1099,6 @@
AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl])
AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h])
-
-AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
if test "x${OSARCH}" = "xlinux-gnu" ; then
AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
@@ -1692,28 +1733,6 @@
AST_EXT_LIB_CHECK([LDAP], [ldap], [ldap_initialize], [ldap.h])
-AC_ARG_ENABLE([xmldoc],
- [AS_HELP_STRING([--disable-xmldoc],
- [Explicity disable XML documentation])],
- [case "${enableval}" in
- y|ye|yes) disable_xmldoc=no ;;
- n|no) disable_xmldoc=yes ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --disable-xmldoc) ;;
- esac], [disable_xmldoc=no])
-
-if test "${disable_xmldoc}" != "yes"; then
- AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , ,
- [#include <libxml/tree.h>
- #include <libxml/parser.h>],
- [LIBXML_TEST_VERSION])
- if test "${PBX_LIBXML2}" != 1; then
- AC_MSG_NOTICE(*** XML documentation will not be available because the 'libxml2' development package is missing.)
- AC_MSG_NOTICE(*** Please run the 'configure' script with the '--disable-xmldoc' parameter option)
- AC_MSG_NOTICE(*** or install the 'libxml2' development package.)
- exit 1
- fi
-fi
-
AST_EXT_LIB_CHECK([MISDN], [mISDN], [mISDN_open], [mISDNuser/mISDNlib.h])
if test "${PBX_MISDN}" = 1; then
@@ -1728,8 +1747,6 @@
AST_EXT_TOOL_CHECK([MYSQLCLIENT], [mysql_config])
AST_EXT_LIB_CHECK([NBS], [nbs], [nbs_connect], [nbs.h])
-
-AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])
AST_EXT_TOOL_CHECK([NEON], [neon-config])
@@ -2048,10 +2065,6 @@
AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
AST_EXT_LIB_CHECK([FREETDS], [sybdb], [dbinit], [sybdb.h])
-
-AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], [])
-
-AST_EXT_LIB_CHECK([TINFO], [tinfo], [tgetent], [])
AC_CHECK_LIB([tonezone], [tone_zone_find_by_num], tonezone_does_not_need_lm=yes, tonezone_does_not_need_lm=no)
@@ -2117,20 +2130,6 @@
AST_EXT_LIB_CHECK([ZLIB], [z], [compress], [zlib.h])
-EDITLINE_LIB=""
-if test "x$TERMCAP_LIB" != "x" ; then
- EDITLINE_LIB="$TERMCAP_LIB"
-elif test "x$TINFO_LIB" != "x" ; then
- EDITLINE_LIB="$TINFO_LIB"
-elif test "x$CURSES_LIB" != "x" ; then
- EDITLINE_LIB="$CURSES_LIB"
-elif test "x$NCURSES_LIB" != "x" ; then
- EDITLINE_LIB="$NCURSES_LIB"
-else
- AC_MSG_ERROR([*** termcap support not found (on modern systems, this typically means the ncurses development package is missing)])
-fi
-AC_SUBST(EDITLINE_LIB)
-
if test "x${PBX_UNIXODBC}" = "x1" -o "x${PBX_IODBC}" = "x1"; then
# Does ODBC support wide characters?
AC_MSG_CHECKING(whether ODBC has support for Unicode types)
Modified: team/irroot/distrotech-customers-trunk/funcs/func_frame_trace.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/funcs/func_frame_trace.c?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/funcs/func_frame_trace.c (original)
+++ team/irroot/distrotech-customers-trunk/funcs/func_frame_trace.c Wed Sep 14 00:59:17 2011
@@ -315,6 +315,9 @@
case AST_CONTROL_MCID:
ast_verbose("SubClass: MCID\n");
break;
+ case AST_CONTROL_INCOMPLETE:
+ ast_verbose("SubClass: INCOMPLETE\n");
+ break;
}
if (frame->subclass.integer == -1) {
ast_verbose("SubClass: %d\n", frame->subclass.integer);
Modified: team/irroot/distrotech-customers-trunk/include/asterisk/event.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/include/asterisk/event.h?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/include/asterisk/event.h (original)
+++ team/irroot/distrotech-customers-trunk/include/asterisk/event.h Wed Sep 14 00:59:17 2011
@@ -743,6 +743,13 @@
*/
uint16_t ast_event_iterator_get_ie_raw_payload_len(struct ast_event_iterator *iterator);
+/*!
+ * \brief Get the minimum length of an ast_event.
+ *
+ * \return minimum amount of memory that will be consumed by any ast_event.
+ */
+size_t ast_event_minimum_length(void);
+
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif
Modified: team/irroot/distrotech-customers-trunk/include/asterisk/frame.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/include/asterisk/frame.h?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/include/asterisk/frame.h (original)
+++ team/irroot/distrotech-customers-trunk/include/asterisk/frame.h Wed Sep 14 00:59:17 2011
@@ -263,7 +263,8 @@
AST_CONTROL_READ_ACTION = 27, /*!< Tell ast_read to take a specific action */
AST_CONTROL_AOC = 28, /*!< Advice of Charge with encoded generic AOC payload */
AST_CONTROL_END_OF_Q = 29, /*!< Indicate that this position was the end of the channel queue for a softhangup. */
- AST_CONTROL_MCID = 30, /*!< Indicate that the caller is being malicious. */
+ AST_CONTROL_INCOMPLETE = 30, /*!< Indication that the extension dialed is incomplete */
+ AST_CONTROL_MCID = 31, /*!< Indicate that the caller is being malicious. */
};
enum ast_frame_read_action {
Modified: team/irroot/distrotech-customers-trunk/include/asterisk/indications.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/include/asterisk/indications.h?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/include/asterisk/indications.h (original)
+++ team/irroot/distrotech-customers-trunk/include/asterisk/indications.h Wed Sep 14 00:59:17 2011
@@ -62,6 +62,8 @@
};
};
+#define MAX_TONEZONE_COUNTRY 16
+
/*!
* \brief A set of tones for a given locale
*
@@ -72,7 +74,7 @@
*/
struct ast_tone_zone {
/*! \brief Country code that this set of tones is for */
- char country[16];
+ char country[MAX_TONEZONE_COUNTRY];
/*!
* \brief Text description of the given country.
*
Modified: team/irroot/distrotech-customers-trunk/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/asterisk.c?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/asterisk.c (original)
+++ team/irroot/distrotech-customers-trunk/main/asterisk.c Wed Sep 14 00:59:17 2011
@@ -3055,6 +3055,8 @@
}
} else if (!strcasecmp(v->name, "languageprefix")) {
ast_language_is_prefix = ast_true(v->value);
+ } else if (!strcasecmp(v->name, "defaultlanguage")) {
+ ast_copy_string(defaultlanguage, v->value, MAX_LANGUAGE);
} else if (!strcasecmp(v->name, "lockmode")) {
if (!strcasecmp(v->value, "lockfile")) {
ast_set_lock_type(AST_LOCK_TYPE_LOCKFILE);
Modified: team/irroot/distrotech-customers-trunk/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/cdr.c?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/cdr.c (original)
+++ team/irroot/distrotech-customers-trunk/main/cdr.c Wed Sep 14 00:59:17 2011
@@ -1514,21 +1514,12 @@
static int do_reload(int reload)
{
struct ast_config *config;
- const char *enabled_value;
- const char *unanswered_value;
- const char *congestion_value;
- const char *batched_value;
- const char *scheduleronly_value;
- const char *batchsafeshutdown_value;
- const char *size_value;
- const char *time_value;
- const char *end_before_h_value;
- const char *initiatedseconds_value;
+ struct ast_variable *v;
int cfg_size;
int cfg_time;
int was_enabled;
int was_batchmode;
- int res=0;
+ int res = 0;
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
if ((config = ast_config_load2("cdr.conf", "cdr", config_flags)) == CONFIG_STATUS_FILEUNCHANGED) {
@@ -1557,45 +1548,40 @@
/* don't run the next scheduled CDR posting while reloading */
AST_SCHED_DEL(sched, cdr_sched);
- if (config) {
- if ((enabled_value = ast_variable_retrieve(config, "general", "enable"))) {
- enabled = ast_true(enabled_value);
- }
- if ((unanswered_value = ast_variable_retrieve(config, "general", "unanswered"))) {
- unanswered = ast_true(unanswered_value);
- }
- if ((congestion_value = ast_variable_retrieve(config, "general", "congestion"))) {
- congestion = ast_true(congestion_value);
- }
- if ((batched_value = ast_variable_retrieve(config, "general", "batch"))) {
- batchmode = ast_true(batched_value);
- }
- if ((scheduleronly_value = ast_variable_retrieve(config, "general", "scheduleronly"))) {
- batchscheduleronly = ast_true(scheduleronly_value);
- }
- if ((batchsafeshutdown_value = ast_variable_retrieve(config, "general", "safeshutdown"))) {
- batchsafeshutdown = ast_true(batchsafeshutdown_value);
- }
- if ((size_value = ast_variable_retrieve(config, "general", "size"))) {
- if (sscanf(size_value, "%30d", &cfg_size) < 1)
- ast_log(LOG_WARNING, "Unable to convert '%s' to a numeric value.\n", size_value);
- else if (cfg_size < 0)
+ for (v = ast_variable_browse(config, "general"); v; v = v->next) {
+ if (!strcasecmp(v->name, "enable")) {
+ enabled = ast_true(v->value);
+ } else if (!strcasecmp(v->name, "unanswered")) {
+ unanswered = ast_true(v->value);
+ } else if (!strcasecmp(v->name, "congestion")) {
+ congestion = ast_true(v->value);
+ } else if (!strcasecmp(v->name, "batch")) {
+ batchmode = ast_true(v->value);
+ } else if (!strcasecmp(v->name, "scheduleronly")) {
+ batchscheduleronly = ast_true(v->value);
+ } else if (!strcasecmp(v->name, "safeshutdown")) {
+ batchsafeshutdown = ast_true(v->value);
+ } else if (!strcasecmp(v->name, "size")) {
+ if (sscanf(v->value, "%30d", &cfg_size) < 1) {
+ ast_log(LOG_WARNING, "Unable to convert '%s' to a numeric value.\n", v->value);
+ } else if (cfg_size < 0) {
ast_log(LOG_WARNING, "Invalid maximum batch size '%d' specified, using default\n", cfg_size);
- else
+ } else {
batchsize = cfg_size;
- }
- if ((time_value = ast_variable_retrieve(config, "general", "time"))) {
- if (sscanf(time_value, "%30d", &cfg_time) < 1)
- ast_log(LOG_WARNING, "Unable to convert '%s' to a numeric value.\n", time_value);
- else if (cfg_time < 0)
+ }
+ } else if (!strcasecmp(v->name, "time")) {
+ if (sscanf(v->value, "%30d", &cfg_time) < 1) {
+ ast_log(LOG_WARNING, "Unable to convert '%s' to a numeric value.\n", v->value);
+ } else if (cfg_time < 0) {
ast_log(LOG_WARNING, "Invalid maximum batch time '%d' specified, using default\n", cfg_time);
- else
+ } else {
batchtime = cfg_time;
- }
- if ((end_before_h_value = ast_variable_retrieve(config, "general", "endbeforehexten")))
- ast_set2_flag(&ast_options, ast_true(end_before_h_value), AST_OPT_FLAG_END_CDR_BEFORE_H_EXTEN);
- if ((initiatedseconds_value = ast_variable_retrieve(config, "general", "initiatedseconds")))
- ast_set2_flag(&ast_options, ast_true(initiatedseconds_value), AST_OPT_FLAG_INITIATED_SECONDS);
+ }
+ } else if (!strcasecmp(v->name, "endbeforehexten")) {
+ ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_END_CDR_BEFORE_H_EXTEN);
+ } else if (!strcasecmp(v->name, "initiatedseconds")) {
+ ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_INITIATED_SECONDS);
+ }
}
if (enabled && !batchmode) {
Modified: team/irroot/distrotech-customers-trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/channel.c?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/channel.c (original)
+++ team/irroot/distrotech-customers-trunk/main/channel.c Wed Sep 14 00:59:17 2011
@@ -4347,6 +4347,7 @@
case AST_CONTROL_MCID:
break;
+ case AST_CONTROL_INCOMPLETE:
case AST_CONTROL_CONGESTION:
case AST_CONTROL_BUSY:
case AST_CONTROL_RINGING:
@@ -4503,6 +4504,7 @@
case AST_CONTROL_BUSY:
ts = ast_get_indication_tone(chan->zone, "busy");
break;
+ case AST_CONTROL_INCOMPLETE:
case AST_CONTROL_CONGESTION:
ts = ast_get_indication_tone(chan->zone, "congestion");
break;
@@ -5540,6 +5542,12 @@
case AST_CONTROL_BUSY:
ast_cdr_busy(chan->cdr);
*outstate = f->subclass.integer;
+ timeout = 0;
+ break;
+
+ case AST_CONTROL_INCOMPLETE:
+ ast_cdr_failed(chan->cdr);
+ *outstate = AST_CONTROL_CONGESTION;
timeout = 0;
break;
@@ -7453,6 +7461,9 @@
return -1;
}
+ caller_warning = ast_test_flag(&config->features_caller, AST_FEATURE_PLAY_WARNING);
+ callee_warning = ast_test_flag(&config->features_callee, AST_FEATURE_PLAY_WARNING);
+
if (ast_tvzero(config->start_time)) {
config->start_time = ast_tvnow();
if (config->start_sound) {
@@ -7475,8 +7486,6 @@
config->nexteventts = ast_tvadd(config->feature_start_time, ast_samp2tv(config->feature_timer, 1000));
} else if (config->timelimit) {
time_left_ms = config->timelimit - ast_tvdiff_ms(ast_tvnow(), config->start_time);
- caller_warning = ast_test_flag(&config->features_caller, AST_FEATURE_PLAY_WARNING);
- callee_warning = ast_test_flag(&config->features_callee, AST_FEATURE_PLAY_WARNING);
config->nexteventts = ast_tvadd(config->start_time, ast_samp2tv(config->timelimit, 1000));
if ((caller_warning || callee_warning) && config->play_warning) {
long next_warn = config->play_warning;
Modified: team/irroot/distrotech-customers-trunk/main/dial.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/dial.c?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/dial.c (original)
+++ team/irroot/distrotech-customers-trunk/main/dial.c Wed Sep 14 00:59:17 2011
@@ -411,6 +411,10 @@
ast_verb(3, "%s is circuit-busy\n", channel->owner->name);
ast_hangup(channel->owner);
channel->owner = NULL;
+ break;
+ case AST_CONTROL_INCOMPLETE:
+ ast_verb(3, "%s dialed Incomplete extension %s\n", channel->owner->name, channel->owner->exten);
+ ast_indicate(chan, AST_CONTROL_INCOMPLETE);
break;
case AST_CONTROL_RINGING:
ast_verb(3, "%s is ringing\n", channel->owner->name);
Modified: team/irroot/distrotech-customers-trunk/main/dnsmgr.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/dnsmgr.c?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/dnsmgr.c (original)
+++ team/irroot/distrotech-customers-trunk/main/dnsmgr.c Wed Sep 14 00:59:17 2011
@@ -109,8 +109,9 @@
void ast_dnsmgr_release(struct ast_dnsmgr_entry *entry)
{
- if (!entry)
+ if (!entry) {
return;
+ }
AST_RWLIST_WRLOCK(&entry_list);
AST_RWLIST_REMOVE(&entry_list, entry, list);
@@ -143,12 +144,12 @@
/* do a lookup now but add a manager so it will automagically get updated in the background */
ast_get_ip_or_srv(result, name, service);
-
+
/* if dnsmgr is not enable don't bother adding an entry */
if (!enabled) {
return 0;
}
-
+
ast_verb(3, "adding dns manager for '%s'\n", name);
*dnsmgr = ast_dnsmgr_get(name, result, service);
return !*dnsmgr;
@@ -198,7 +199,7 @@
/*
* Check if dnsmgr entry has changed from since last call to this function
*/
-int ast_dnsmgr_changed(struct ast_dnsmgr_entry *entry)
+int ast_dnsmgr_changed(struct ast_dnsmgr_entry *entry)
{
int changed;
@@ -208,7 +209,7 @@
entry->changed = 0;
ast_mutex_unlock(&entry->lock);
-
+
return changed;
}
@@ -230,16 +231,18 @@
/* if a refresh or reload is already in progress, exit now */
if (ast_mutex_trylock(&refresh_lock)) {
- if (info->verbose)
+ if (info->verbose) {
ast_log(LOG_WARNING, "DNS Manager refresh already in progress.\n");
+ }
return -1;
}
ast_verb(3, "Refreshing DNS lookups.\n");
AST_RWLIST_RDLOCK(info->entries);
AST_RWLIST_TRAVERSE(info->entries, entry, list) {
- if (info->regex_present && regexec(&info->filter, entry->name, 0, NULL, 0))
- continue;
+ if (info->regex_present && regexec(&info->filter, entry->name, 0, NULL, 0)) {
+ continue;
+ }
dnsmgr_refresh(entry, info->verbose);
}
@@ -266,15 +269,16 @@
switch (cmd) {
case CLI_INIT:
e->command = "dnsmgr reload";
- e->usage =
+ e->usage =
"Usage: dnsmgr reload\n"
" Reloads the DNS manager configuration.\n";
return NULL;
case CLI_GENERATE:
- return NULL;
- }
- if (a->argc > 2)
+ return NULL;
+ }
+ if (a->argc > 2) {
return CLI_SHOWUSAGE;
+ }
do_reload(0);
return CLI_SUCCESS;
@@ -289,13 +293,13 @@
switch (cmd) {
case CLI_INIT:
e->command = "dnsmgr refresh";
- e->usage =
+ e->usage =
"Usage: dnsmgr refresh [pattern]\n"
" Peforms an immediate refresh of the managed DNS entries.\n"
" Optional regular expression pattern is used to filter the entries to refresh.\n";
return NULL;
case CLI_GENERATE:
- return NULL;
+ return NULL;
}
if (!enabled) {
@@ -331,16 +335,17 @@
switch (cmd) {
case CLI_INIT:
e->command = "dnsmgr status";
- e->usage =
+ e->usage =
"Usage: dnsmgr status\n"
" Displays the DNS manager status.\n";
return NULL;
case CLI_GENERATE:
- return NULL;
- }
-
- if (a->argc > 2)
+ return NULL;
+ }
+
+ if (a->argc > 2) {
return CLI_SHOWUSAGE;
+ }
ast_cli(a->fd, "DNS Manager: %s\n", enabled ? "enabled" : "disabled");
ast_cli(a->fd, "Refresh Interval: %d seconds\n", refresh_interval);
@@ -377,15 +382,12 @@
static int do_reload(int loading)
{
struct ast_config *config;
+ struct ast_variable *v;
struct ast_flags config_flags = { loading ? 0 : CONFIG_FLAG_FILEUNCHANGED };
- const char *interval_value;
- const char *enabled_value;
int interval;
int was_enabled;
- int res = -1;
-
- config = ast_config_load2("dnsmgr.conf", "dnsmgr", config_flags);
- if (config == CONFIG_STATUS_FILEMISSING || config == CONFIG_STATUS_FILEUNCHANGED || config == CONFIG_STATUS_FILEINVALID) {
+
+ if ((config = ast_config_load2("dnsmgr.conf", "dnsmgr", config_flags)) == CONFIG_STATUS_FILEUNCHANGED) {
return 0;
}
@@ -397,25 +399,31 @@
was_enabled = enabled;
enabled = 0;
+ if (config == CONFIG_STATUS_FILEMISSING || config == CONFIG_STATUS_FILEINVALID) {
+ ast_mutex_unlock(&refresh_lock);
+ return 0;
+ }
+
AST_SCHED_DEL(sched, refresh_sched);
- if (config) {
- if ((enabled_value = ast_variable_retrieve(config, "general", "enable"))) {
- enabled = ast_true(enabled_value);
- }
- if ((interval_value = ast_variable_retrieve(config, "general", "refreshinterval"))) {
- if (sscanf(interval_value, "%30d", &interval) < 1)
- ast_log(LOG_WARNING, "Unable to convert '%s' to a numeric value.\n", interval_value);
- else if (interval < 0)
+ for (v = ast_variable_browse(config, "general"); v; v = v->next) {
+ if (!strcasecmp(v->name, "enable")) {
+ enabled = ast_true(v->value);
+ } else if (!strcasecmp(v->name, "refreshinterval")) {
+ if (sscanf(v->value, "%30d", &interval) < 1) {
+ ast_log(LOG_WARNING, "Unable to convert '%s' to a numeric value.\n", v->value);
+ } else if (interval < 0) {
ast_log(LOG_WARNING, "Invalid refresh interval '%d' specified, using default\n", interval);
- else
+ } else {
refresh_interval = interval;
- }
- ast_config_destroy(config);
- }
-
- if (enabled && refresh_interval)
+ }
+ }
+ }
+ ast_config_destroy(config);
+
+ if (enabled && refresh_interval) {
ast_log(LOG_NOTICE, "Managed DNS entries will be refreshed every %d seconds.\n", refresh_interval);
+ }
/* if this reload enabled the manager, create the background thread
if it does not exist */
@@ -427,23 +435,17 @@
}
/* make a background refresh happen right away */
refresh_sched = ast_sched_add_variable(sched, 100, refresh_list, &master_refresh_info, 1);
- res = 0;
- }
- /* if this reload disabled the manager and there is a background thread,
- kill it */
- else if (!enabled && was_enabled && (refresh_thread != AST_PTHREADT_NULL)) {
+ /* if this reload disabled the manager and there is a background thread, kill it */
+ } else if (!enabled && was_enabled && (refresh_thread != AST_PTHREADT_NULL)) {
/* wake up the thread so it will exit */
pthread_cancel(refresh_thread);
pthread_kill(refresh_thread, SIGURG);
pthread_join(refresh_thread, NULL);
refresh_thread = AST_PTHREADT_NULL;
- res = 0;
- }
- else
- res = 0;
+ }
ast_mutex_unlock(&refresh_lock);
manager_event(EVENT_FLAG_SYSTEM, "Reload", "Module: DNSmgr\r\nStatus: %s\r/nMessage: DNSmgr reload Requested\r\n", enabled ? "Enabled" : "Disabled");
- return res;
-}
+ return 0;
+}
Modified: team/irroot/distrotech-customers-trunk/main/dsp.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/dsp.c?view=diff&rev=335778&r1=335777&r2=335778
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/dsp.c (original)
+++ team/irroot/distrotech-customers-trunk/main/dsp.c Wed Sep 14 00:59:17 2011
@@ -59,7 +59,7 @@
enum gsamp_size {
GSAMP_SIZE_NA = 183, /*!< North America - 350, 440, 480, 620, 950, 1400, 1800 Hz */
GSAMP_SIZE_CR = 188, /*!< Costa Rica, Brazil - Only care about 425 Hz */
- GSAMP_SIZE_UK = 160 /*!< UK disconnect goertzel feed - should trigger 400hz */
+ GSAMP_SIZE_UK = 160 /*!< UK disconnect goertzel feed - should trigger 400hz */
};
enum prog_mode {
@@ -68,7 +68,7 @@
PROG_MODE_UK
};
-enum freq_index {
+enum freq_index {
/*! For US modes { */
HZ_350 = 0,
HZ_440,
@@ -103,8 +103,8 @@
int freqs[7];
} modes[] = {
{ GSAMP_SIZE_NA, { 350, 440, 480, 620, 950, 1400, 1800 } }, /*!< North America */
- { GSAMP_SIZE_CR, { 425 } }, /*!< Costa Rica, Brazil */
- { GSAMP_SIZE_UK, { 350, 400, 440 } }, /*!< UK */
+ { GSAMP_SIZE_CR, { 425 } }, /*!< Costa Rica, Brazil */
+ { GSAMP_SIZE_UK, { 350, 400, 440 } }, /*!< UK */
};
/*!\brief This value is the minimum threshold, calculated by averaging all
@@ -117,26 +117,26 @@
#define DEFAULT_THRESHOLD 512
enum busy_detect {
- BUSY_PERCENT = 10, /*!< The percentage difference between the two last silence periods */
+ BUSY_PERCENT = 10, /*!< The percentage difference between the two last silence periods */
BUSY_PAT_PERCENT = 7, /*!< The percentage difference between measured and actual pattern */
BUSY_THRESHOLD = 100, /*!< Max number of ms difference between max and min times in busy */
- BUSY_MIN = 75, /*!< Busy must be at least 80 ms in half-cadence */
- BUSY_MAX =3100 /*!< Busy can't be longer than 3100 ms in half-cadence */
+ BUSY_MIN = 75, /*!< Busy must be at least 80 ms in half-cadence */
+ BUSY_MAX =3100 /*!< Busy can't be longer than 3100 ms in half-cadence */
};
/*! Remember last 15 units */
-#define DSP_HISTORY 15
+#define DSP_HISTORY 15
#define TONE_THRESH 10.0 /*!< How much louder the tone should be than channel energy */
-#define TONE_MIN_THRESH 1e8 /*!< How much tone there should be at least to attempt */
+#define TONE_MIN_THRESH 1e8 /*!< How much tone there should be at least to attempt */
/*! All THRESH_XXX values are in GSAMP_SIZE chunks (us = 22ms) */
enum gsamp_thresh {
- THRESH_RING = 8, /*!< Need at least 150ms ring to accept */
- THRESH_TALK = 2, /*!< Talk detection does not work continuously */
- THRESH_BUSY = 4, /*!< Need at least 80ms to accept */
- THRESH_CONGESTION = 4, /*!< Need at least 80ms to accept */
- THRESH_HANGUP = 60, /*!< Need at least 1300ms to accept hangup */
+ THRESH_RING = 8, /*!< Need at least 150ms ring to accept */
+ THRESH_TALK = 2, /*!< Talk detection does not work continuously */
+ THRESH_BUSY = 4, /*!< Need at least 80ms to accept */
+ THRESH_CONGESTION = 4, /*!< Need at least 80ms to accept */
+ THRESH_HANGUP = 60, /*!< Need at least 1300ms to accept hangup */
THRESH_RING2ANSWER = 300 /*!< Timeout from start of ring to answer (about 6600 ms) */
};
@@ -312,10 +312,10 @@
static inline void goertzel_sample(goertzel_state_t *s, short sample)
{
int v1;
-
+
v1 = s->v2;
s->v2 = s->v3;
-
+
s->v3 = (s->fac * s->v2) >> 15;
s->v3 = s->v3 - v1 + (sample >> s->chunky);
if (abs(s->v3) > 32768) {
@@ -329,7 +329,7 @@
static inline void goertzel_update(goertzel_state_t *s, short *samps, int count)
{
int i;
-
+
for (i = 0; i < count; i++) {
[... 489 lines stripped ...]
More information about the asterisk-commits
mailing list