[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r328933 - in /team/irroot/di...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jul 20 10:45:38 CDT 2011
Author: irroot
Date: Wed Jul 20 10:45:29 2011
New Revision: 328933
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=328933
Log:
Merged revisions 327359 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r327359 | may | 2011-07-10 03:37:58 +0200 (Sun, 10 Jul 2011) | 18 lines
Full T.38 handshaking and fax detection
Add full t.38 handshaking for OOH323 that are required for newest T.38
gateway codes.
Add fax detection (cng tone, t38) and dialplan redirection to fax ext on
fax event detected.
Add OOH323() function to set/get t38support and faxdetect parameters.
(closes issue ASTERISK-17754)
Reported by: irroot
Patches:
ooh323_faxdetect.patch uploaded by irroot (license 52)
issue19183-final.patch uploaded by may213 (license 454)
Tested by: may213, irroot
Review: https://reviewboard.asterisk.org/r/1174/
........
Added:
team/irroot/distrotech-customers-trunk/UPGRADE-1.10.txt
- copied unchanged from r328881, trunk/UPGRADE-1.10.txt
Modified:
team/irroot/distrotech-customers-trunk/ (props changed)
team/irroot/distrotech-customers-trunk/bridges/bridge_builtin_features.c
team/irroot/distrotech-customers-trunk/bridges/bridge_multiplexed.c
team/irroot/distrotech-customers-trunk/bridges/bridge_simple.c
team/irroot/distrotech-customers-trunk/bridges/bridge_softmix.c
team/irroot/distrotech-customers-trunk/channels/chan_agent.c
team/irroot/distrotech-customers-trunk/channels/chan_console.c
team/irroot/distrotech-customers-trunk/channels/chan_dahdi.c
team/irroot/distrotech-customers-trunk/channels/chan_h323.c
team/irroot/distrotech-customers-trunk/channels/chan_iax2.c
team/irroot/distrotech-customers-trunk/channels/chan_jingle.c
team/irroot/distrotech-customers-trunk/channels/chan_phone.c
team/irroot/distrotech-customers-trunk/channels/chan_sip.c
team/irroot/distrotech-customers-trunk/channels/chan_usbradio.c
team/irroot/distrotech-customers-trunk/channels/chan_vpb.cc
team/irroot/distrotech-customers-trunk/pbx/pbx_ael.c
team/irroot/distrotech-customers-trunk/pbx/pbx_config.c
team/irroot/distrotech-customers-trunk/pbx/pbx_dundi.c
team/irroot/distrotech-customers-trunk/pbx/pbx_loopback.c
team/irroot/distrotech-customers-trunk/pbx/pbx_lua.c
team/irroot/distrotech-customers-trunk/pbx/pbx_realtime.c
team/irroot/distrotech-customers-trunk/pbx/pbx_spool.c
Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
automerge = *
Propchange: team/irroot/distrotech-customers-trunk/
('svnmerge-integrated' removed)
Modified: team/irroot/distrotech-customers-trunk/bridges/bridge_builtin_features.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/bridges/bridge_builtin_features.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/bridges/bridge_builtin_features.c (original)
+++ team/irroot/distrotech-customers-trunk/bridges/bridge_builtin_features.c Wed Jul 20 10:45:29 2011
@@ -24,6 +24,10 @@
*
* \ingroup bridges
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/bridges/bridge_multiplexed.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/bridges/bridge_multiplexed.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/bridges/bridge_multiplexed.c (original)
+++ team/irroot/distrotech-customers-trunk/bridges/bridge_multiplexed.c Wed Jul 20 10:45:29 2011
@@ -24,6 +24,10 @@
*
* \ingroup bridges
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/bridges/bridge_simple.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/bridges/bridge_simple.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/bridges/bridge_simple.c (original)
+++ team/irroot/distrotech-customers-trunk/bridges/bridge_simple.c Wed Jul 20 10:45:29 2011
@@ -24,6 +24,10 @@
*
* \ingroup bridges
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/bridges/bridge_softmix.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/bridges/bridge_softmix.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/bridges/bridge_softmix.c (original)
+++ team/irroot/distrotech-customers-trunk/bridges/bridge_softmix.c Wed Jul 20 10:45:29 2011
@@ -26,6 +26,10 @@
*
* \ingroup bridges
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/channels/chan_agent.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_agent.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_agent.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_agent.c Wed Jul 20 10:45:29 2011
@@ -33,6 +33,7 @@
/*** MODULEINFO
<depend>chan_local</depend>
<depend>res_monitor</depend>
+ <support_level>core</support_level>
***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/channels/chan_console.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_console.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_console.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_console.c Wed Jul 20 10:45:29 2011
@@ -49,6 +49,7 @@
/*** MODULEINFO
<depend>portaudio</depend>
+ <support_level>extended</support_level>
***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_dahdi.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_dahdi.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_dahdi.c Wed Jul 20 10:45:29 2011
@@ -44,6 +44,7 @@
<use type="external">pri</use>
<use type="external">ss7</use>
<use type="external">openr2</use>
+ <support_level>core</support_level>
***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_h323.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_h323.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_h323.c Wed Jul 20 10:45:29 2011
@@ -36,7 +36,9 @@
/*** MODULEINFO
<depend>openh323</depend>
- <defaultenabled>yes</defaultenabled>
+ <defaultenabled>no</defaultenabled>
+ <support_level>deprecated</support_level>
+ <replacement>chan_ooh323</replacement>
***/
#ifdef __cplusplus
Modified: team/irroot/distrotech-customers-trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_iax2.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_iax2.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_iax2.c Wed Jul 20 10:45:29 2011
@@ -33,6 +33,7 @@
/*** MODULEINFO
<use type="external">crypto</use>
+ <support_level>core</support_level>
***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/channels/chan_jingle.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_jingle.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_jingle.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_jingle.c Wed Jul 20 10:45:29 2011
@@ -31,6 +31,8 @@
<depend>iksemel</depend>
<depend>res_jabber</depend>
<use type="external">openssl</use>
+ <defaultenabled>no</defaultenabled>
+ <support_level>extended</support_level>
***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/channels/chan_phone.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_phone.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_phone.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_phone.c Wed Jul 20 10:45:29 2011
@@ -27,6 +27,7 @@
/*** MODULEINFO
<depend>ixjuser</depend>
+ <support_level>extended</support_level>
***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_sip.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_sip.c Wed Jul 20 10:45:29 2011
@@ -164,6 +164,7 @@
/*** MODULEINFO
<use type="module">res_crypto</use>
<depend>chan_local</depend>
+ <support_level>core</support_level>
***/
/*! \page sip_session_timers SIP Session Timers in Asterisk Chan_sip
@@ -1351,7 +1352,7 @@
static int do_magic_pickup(struct ast_channel *channel, const char *extension, const char *context);
/*--- Device monitoring and Device/extension state/event handling */
-static int cb_extensionstate(char *context, char* exten, int state, void *data);
+static int cb_extensionstate(const char *context, const char *exten, enum ast_extension_states state, void *data);
static int sip_devicestate(void *data);
static int sip_poke_noanswer(const void *data);
static int sip_poke_peer(struct sip_peer *peer, int force);
@@ -4228,10 +4229,11 @@
}
if ((ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_INBAND) ||
- (ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_AUTO)) {
- if (!p->rtp || ast_rtp_instance_dtmf_mode_set(p->rtp, AST_RTP_DTMF_MODE_INBAND)) {
- features |= DSP_FEATURE_DIGIT_DETECT;
- }
+ (ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_AUTO)) {
+ if (p->rtp) {
+ ast_rtp_instance_dtmf_mode_set(p->rtp, AST_RTP_DTMF_MODE_INBAND);
+ }
+ features |= DSP_FEATURE_DIGIT_DETECT;
}
if (ast_test_flag(&p->flags[1], SIP_PAGE2_FAX_DETECT_CNG)) {
@@ -4265,6 +4267,11 @@
{
int res = -1;
struct sip_pvt *p = chan->tech_pvt;
+
+ if (!p) {
+ ast_log(LOG_ERROR, "Attempt to Ref a null pointer. sip private structure is gone!\n");
+ return -1;
+ }
sip_pvt_lock(p);
@@ -6942,8 +6949,8 @@
if ((ast_test_flag(&i->flags[0], SIP_DTMF) == SIP_DTMF_INBAND) ||
(ast_test_flag(&i->flags[0], SIP_DTMF) == SIP_DTMF_AUTO)) {
- if (!i->rtp || ast_rtp_instance_dtmf_mode_set(i->rtp, AST_RTP_DTMF_MODE_INBAND)) {
- enable_dsp_detect(i);
+ if (i->rtp) {
+ ast_rtp_instance_dtmf_mode_set(i->rtp, AST_RTP_DTMF_MODE_INBAND);
}
} else if (ast_test_flag(&i->flags[0], SIP_DTMF) == SIP_DTMF_RFC2833) {
if (i->rtp) {
@@ -14388,7 +14395,7 @@
/*! \brief Callback for the devicestate notification (SUBSCRIBE) support subsystem
\note If you add an "hint" priority to the extension in the dial plan,
you will get notifications on device state changes */
-static int cb_extensionstate(char *context, char* exten, int state, void *data)
+static int cb_extensionstate(const char *context, const char *exten, enum ast_extension_states state, void *data)
{
struct sip_pvt *p = data;
@@ -29132,7 +29139,9 @@
if ((instance || vinstance || tinstance) &&
!ast_bridged_channel(chan) &&
!sip_cfg.directrtpsetup) {
- return 0;
+ sip_pvt_unlock(p);
+ ast_channel_unlock(chan);
+ return 0;
}
if (p->alreadygone) {
Modified: team/irroot/distrotech-customers-trunk/channels/chan_usbradio.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_usbradio.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_usbradio.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_usbradio.c Wed Jul 20 10:45:29 2011
@@ -38,6 +38,7 @@
<depend>alsa</depend>
<depend>usb</depend>
<defaultenabled>no</defaultenabled>
+ <support_level>extended</support_level>
***/
/*** MAKEOPTS
Modified: team/irroot/distrotech-customers-trunk/channels/chan_vpb.cc
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_vpb.cc?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_vpb.cc (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_vpb.cc Wed Jul 20 10:45:29 2011
@@ -31,6 +31,8 @@
/*** MODULEINFO
<depend>vpb</depend>
+ <defaultenabled>no</defaultenabled>
+ <support_level>extended</support_level>
***/
#include <vpbapi.h>
Modified: team/irroot/distrotech-customers-trunk/pbx/pbx_ael.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/pbx/pbx_ael.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/pbx/pbx_ael.c (original)
+++ team/irroot/distrotech-customers-trunk/pbx/pbx_ael.c Wed Jul 20 10:45:29 2011
@@ -24,6 +24,7 @@
/*** MODULEINFO
<depend>res_ael_share</depend>
+ <support_level>extended</support_level>
***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/pbx/pbx_config.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/pbx/pbx_config.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/pbx/pbx_config.c (original)
+++ team/irroot/distrotech-customers-trunk/pbx/pbx_config.c Wed Jul 20 10:45:29 2011
@@ -22,6 +22,10 @@
*
*
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/pbx/pbx_dundi.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/pbx/pbx_dundi.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/pbx/pbx_dundi.c (original)
+++ team/irroot/distrotech-customers-trunk/pbx/pbx_dundi.c Wed Jul 20 10:45:29 2011
@@ -24,6 +24,7 @@
/*** MODULEINFO
<depend>zlib</depend>
<use type="external">crypto</use>
+ <support_level>extended</support_level>
***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/pbx/pbx_loopback.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/pbx/pbx_loopback.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/pbx/pbx_loopback.c (original)
+++ team/irroot/distrotech-customers-trunk/pbx/pbx_loopback.c Wed Jul 20 10:45:29 2011
@@ -21,6 +21,10 @@
* \brief Loopback PBX Module
*
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/pbx/pbx_lua.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/pbx/pbx_lua.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/pbx/pbx_lua.c (original)
+++ team/irroot/distrotech-customers-trunk/pbx/pbx_lua.c Wed Jul 20 10:45:29 2011
@@ -26,6 +26,7 @@
/*** MODULEINFO
<depend>lua</depend>
+ <support_level>extended</support_level>
***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/pbx/pbx_realtime.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/pbx/pbx_realtime.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/pbx/pbx_realtime.c (original)
+++ team/irroot/distrotech-customers-trunk/pbx/pbx_realtime.c Wed Jul 20 10:45:29 2011
@@ -22,6 +22,10 @@
*
* \arg See also: \ref AstARA
*/
+
+/*** MODULEINFO
+ <support_level>extended</support_level>
+ ***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-trunk/pbx/pbx_spool.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/pbx/pbx_spool.c?view=diff&rev=328933&r1=328932&r2=328933
==============================================================================
--- team/irroot/distrotech-customers-trunk/pbx/pbx_spool.c (original)
+++ team/irroot/distrotech-customers-trunk/pbx/pbx_spool.c Wed Jul 20 10:45:29 2011
@@ -21,6 +21,10 @@
* \brief Full-featured outgoing call spool support
*
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
More information about the asterisk-commits
mailing list