[asterisk-commits] may: branch may/ooh323_ipv6_direct_rtp r306971 - in /team/may/ooh323_ipv6_dir...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Feb 8 13:58:48 CST 2011
Author: may
Date: Tue Feb 8 13:58:41 2011
New Revision: 306971
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306971
Log:
up to trunk
Modified:
team/may/ooh323_ipv6_direct_rtp/ (props changed)
team/may/ooh323_ipv6_direct_rtp/CHANGES
team/may/ooh323_ipv6_direct_rtp/cel/cel_odbc.c (props changed)
team/may/ooh323_ipv6_direct_rtp/channels/chan_dahdi.c
team/may/ooh323_ipv6_direct_rtp/channels/chan_sip.c
team/may/ooh323_ipv6_direct_rtp/channels/sig_pri.c
team/may/ooh323_ipv6_direct_rtp/channels/sig_pri.h
team/may/ooh323_ipv6_direct_rtp/codecs/codec_ilbc.c
team/may/ooh323_ipv6_direct_rtp/codecs/ex_ilbc.h
team/may/ooh323_ipv6_direct_rtp/configs/cel_odbc.conf.sample (props changed)
team/may/ooh323_ipv6_direct_rtp/configs/chan_dahdi.conf.sample
team/may/ooh323_ipv6_direct_rtp/doc/asterisk.sgml
team/may/ooh323_ipv6_direct_rtp/funcs/func_frame_trace.c
team/may/ooh323_ipv6_direct_rtp/include/asterisk/autoconfig.h.in
team/may/ooh323_ipv6_direct_rtp/include/asterisk/channel.h
team/may/ooh323_ipv6_direct_rtp/include/asterisk/frame.h
team/may/ooh323_ipv6_direct_rtp/include/asterisk/sched.h
team/may/ooh323_ipv6_direct_rtp/main/app.c
team/may/ooh323_ipv6_direct_rtp/main/audiohook.c
team/may/ooh323_ipv6_direct_rtp/main/ccss.c
team/may/ooh323_ipv6_direct_rtp/main/channel.c
team/may/ooh323_ipv6_direct_rtp/main/features.c
team/may/ooh323_ipv6_direct_rtp/main/http.c
team/may/ooh323_ipv6_direct_rtp/main/logger.c
team/may/ooh323_ipv6_direct_rtp/main/manager.c
team/may/ooh323_ipv6_direct_rtp/main/pbx.c
team/may/ooh323_ipv6_direct_rtp/main/say.c
team/may/ooh323_ipv6_direct_rtp/main/taskprocessor.c
team/may/ooh323_ipv6_direct_rtp/main/xmldoc.c
team/may/ooh323_ipv6_direct_rtp/res/ais/evt.c
team/may/ooh323_ipv6_direct_rtp/res/res_agi.c
team/may/ooh323_ipv6_direct_rtp/res/res_config_ldap.c
team/may/ooh323_ipv6_direct_rtp/res/res_http_post.c
team/may/ooh323_ipv6_direct_rtp/res/res_jabber.c
team/may/ooh323_ipv6_direct_rtp/res/res_musiconhold.c
team/may/ooh323_ipv6_direct_rtp/res/res_odbc.c
team/may/ooh323_ipv6_direct_rtp/res/res_rtp_asterisk.c
team/may/ooh323_ipv6_direct_rtp/res/res_smdi.c
team/may/ooh323_ipv6_direct_rtp/sounds/Makefile (props changed)
Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 8 13:58:41 2011
@@ -1,1 +1,1 @@
-/team/may/ooh323_ipv6:1-306539
+/trunk:1-306538
Modified: team/may/ooh323_ipv6_direct_rtp/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/CHANGES?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/CHANGES (original)
+++ team/may/ooh323_ipv6_direct_rtp/CHANGES Tue Feb 8 13:58:41 2011
@@ -52,6 +52,7 @@
* Added display_send and display_receive options to control how the display ie
is handled. To send display text from the dialplan use the SendText()
application when the option is enabled.
+ * Added mcid_send option to allow sending a MCID request on a span.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------
Propchange: team/may/ooh323_ipv6_direct_rtp/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 13:58:41 2011
@@ -1,2 +1,3 @@
/be/branches/C.3/cel/cel_adaptive_odbc.c:256426
/team/may/ooh323_ipv6/cel/cel_odbc.c:301110-306539
+/trunk/cel/cel_odbc.c:290061-306867
Modified: team/may/ooh323_ipv6_direct_rtp/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/channels/chan_dahdi.c?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/channels/chan_dahdi.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/channels/chan_dahdi.c Tue Feb 8 13:58:41 2011
@@ -12353,6 +12353,9 @@
pris[span].pri.display_flags_send = conf->pri.pri.display_flags_send;
pris[span].pri.display_flags_receive = conf->pri.pri.display_flags_receive;
#endif /* defined(HAVE_PRI_DISPLAY_TEXT) */
+#if defined(HAVE_PRI_MCID)
+ pris[span].pri.mcid_send = conf->pri.pri.mcid_send;
+#endif /* defined(HAVE_PRI_MCID) */
for (x = 0; x < PRI_MAX_TIMERS; x++) {
pris[span].pri.pritimers[x] = conf->pri.pri.pritimers[x];
@@ -17307,6 +17310,10 @@
} else if (!strcasecmp(v->name, "display_receive")) {
confp->pri.pri.display_flags_receive = dahdi_display_text_option(v->value);
#endif /* defined(HAVE_PRI_DISPLAY_TEXT) */
+#if defined(HAVE_PRI_MCID)
+ } else if (!strcasecmp(v->name, "mcid_send")) {
+ confp->pri.pri.mcid_send = ast_true(v->value);
+#endif /* defined(HAVE_PRI_MCID) */
#endif /* HAVE_PRI */
#if defined(HAVE_SS7)
} else if (!strcasecmp(v->name, "ss7type")) {
Modified: team/may/ooh323_ipv6_direct_rtp/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/channels/chan_sip.c?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/channels/chan_sip.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/channels/chan_sip.c Tue Feb 8 13:58:41 2011
@@ -4887,7 +4887,7 @@
ast_copy_flags(&dialog->flags[0], &peer->flags[0], SIP_FLAGS_TO_COPY);
ast_copy_flags(&dialog->flags[1], &peer->flags[1], SIP_PAGE2_FLAGS_TO_COPY);
ast_copy_flags(&dialog->flags[2], &peer->flags[2], SIP_PAGE3_FLAGS_TO_COPY);
- ast_format_cap_append(dialog->caps, peer->caps);
+ ast_format_cap_copy(dialog->caps, peer->caps);
dialog->prefs = peer->prefs;
if (ast_test_flag(&dialog->flags[1], SIP_PAGE2_T38SUPPORT)) {
/* t38pt_udptl was enabled in the peer and not in [general] */
@@ -7273,7 +7273,7 @@
/* Assign default music on hold class */
ast_string_field_set(p, mohinterpret, default_mohinterpret);
ast_string_field_set(p, mohsuggest, default_mohsuggest);
- ast_format_cap_append(p->caps, sip_cfg.caps);
+ ast_format_cap_copy(p->caps, sip_cfg.caps);
p->allowtransfer = sip_cfg.allowtransfer;
if ((ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_RFC2833) ||
(ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_AUTO))
@@ -14957,6 +14957,14 @@
*to = '\0';
}
ast_copy_string(referdata->replaces_callid_fromtag, ptr, sizeof(referdata->replaces_callid_fromtag));
+ }
+
+ if (!strcmp(referdata->replaces_callid, transferer->callid) &&
+ (!sip_cfg.pedanticsipchecking ||
+ (!strcmp(referdata->replaces_callid_fromtag, transferer->tag) &&
+ !strcmp(referdata->replaces_callid_totag, transferer->theirtag)))) {
+ ast_log(LOG_WARNING, "Got an attempt to replace own Call-ID on %s\n", transferer->callid);
+ return -4;
}
if (!sip_cfg.pedanticsipchecking) {
Modified: team/may/ooh323_ipv6_direct_rtp/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/channels/sig_pri.c?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/channels/sig_pri.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/channels/sig_pri.c Tue Feb 8 13:58:41 2011
@@ -1917,7 +1917,12 @@
}
if (owner) {
- /* The owner channel is present. */
+ /*
+ * The owner channel is present.
+ * Pass the event to the peer as well.
+ */
+ ast_queue_control(owner, AST_CONTROL_MCID);
+
ast_str_append(&msg, 0, "Channel: %s\r\n", owner->name);
ast_str_append(&msg, 0, "UniqueID: %s\r\n", owner->uniqueid);
@@ -7687,6 +7692,15 @@
}
#endif /* defined(HAVE_PRI_AOC_EVENTS) */
break;
+#if defined(HAVE_PRI_MCID)
+ case AST_CONTROL_MCID:
+ if (p->pri && p->pri->pri && p->pri->mcid_send) {
+ pri_grab(p, p->pri);
+ pri_mcid_req_send(p->pri->pri, p->call);
+ pri_rel(p->pri);
+ }
+ break;
+#endif /* defined(HAVE_PRI_MCID) */
}
return res;
Modified: team/may/ooh323_ipv6_direct_rtp/channels/sig_pri.h
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/channels/sig_pri.h?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/channels/sig_pri.h (original)
+++ team/may/ooh323_ipv6_direct_rtp/channels/sig_pri.h Tue Feb 8 13:58:41 2011
@@ -402,6 +402,10 @@
* appended to the initial_user_tag[].
*/
unsigned int append_msn_to_user_tag:1;
+#if defined(HAVE_PRI_CALL_WAITING)
+ /*! \brief TRUE if allow sending MCID request on this span. */
+ unsigned int mcid_send:1;
+#endif /* defined(HAVE_PRI_CALL_WAITING) */
int dialplan; /*!< Dialing plan */
int localdialplan; /*!< Local dialing plan */
int cpndialplan; /*!< Connected party dialing plan */
Modified: team/may/ooh323_ipv6_direct_rtp/codecs/codec_ilbc.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/codecs/codec_ilbc.c?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/codecs/codec_ilbc.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/codecs/codec_ilbc.c Tue Feb 8 13:58:41 2011
@@ -89,7 +89,7 @@
float tmpf[ILBC_SAMPLES];
if (!f->data.ptr && f->datalen) {
- ast_log(LOG_DEBUG, "issue 16070, ILIB ERROR. data = NULL datalen = %d src = %s\n", f->datalen, f->src ? f->src : "no src set");
+ ast_debug(1, "issue 16070, ILIB ERROR. data = NULL datalen = %d src = %s\n", f->datalen, f->src ? f->src : "no src set");
f->datalen = 0;
}
@@ -104,12 +104,12 @@
ast_log(LOG_WARNING, "Huh? An ilbc frame that isn't a multiple of 50 bytes long from %s (%d)?\n", f->src, f->datalen);
return -1;
}
-
+
for (x=0; x < f->datalen ; x += ILBC_FRAME_LEN) {
- if (pvt->samples + ILBC_SAMPLES > BUFFER_SAMPLES) {
+ if (pvt->samples + ILBC_SAMPLES > BUFFER_SAMPLES) {
ast_log(LOG_WARNING, "Out of buffer space\n");
return -1;
- }
+ }
iLBC_decode(tmpf, plc_mode ? f->data.ptr + x : NULL, &tmp->dec, plc_mode);
for ( i=0; i < ILBC_SAMPLES; i++)
dst[pvt->samples + i] = tmpf[i];
@@ -198,8 +198,8 @@
{
int res;
- ast_format_set(&ilibctolin.src_format, AST_FORMAT_ILBC, 0);
- ast_format_set(&ilibctolin.dst_format, AST_FORMAT_SLINEAR, 0);
+ ast_format_set(&ilbctolin.src_format, AST_FORMAT_ILBC, 0);
+ ast_format_set(&ilbctolin.dst_format, AST_FORMAT_SLINEAR, 0);
ast_format_set(&lintoilbc.src_format, AST_FORMAT_SLINEAR, 0);
ast_format_set(&lintoilbc.dst_format, AST_FORMAT_ILBC, 0);
Modified: team/may/ooh323_ipv6_direct_rtp/codecs/ex_ilbc.h
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/codecs/ex_ilbc.h?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/codecs/ex_ilbc.h (original)
+++ team/may/ooh323_ipv6_direct_rtp/codecs/ex_ilbc.h Tue Feb 8 13:58:41 2011
@@ -19,7 +19,6 @@
{
static struct ast_frame f = {
.frametype = AST_FRAME_VOICE,
- .subclass.codec = AST_FORMAT_ILBC,
.datalen = sizeof(ex_ilbc),
/* All frames are 30 ms long */
.samples = ILBC_SAMPLES,
@@ -29,5 +28,6 @@
.data.ptr = ex_ilbc,
};
+ ast_format_set(&f.subclass.format, AST_FORMAT_ILBC, 0);
return &f;
}
Propchange: team/may/ooh323_ipv6_direct_rtp/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 13:58:41 2011
@@ -1,2 +1,3 @@
/be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
/team/may/ooh323_ipv6/configs/cel_odbc.conf.sample:301110-306539
+/trunk/configs/cel_odbc.conf.sample:290061-306867
Modified: team/may/ooh323_ipv6_direct_rtp/configs/chan_dahdi.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/configs/chan_dahdi.conf.sample?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/configs/chan_dahdi.conf.sample (original)
+++ team/may/ooh323_ipv6_direct_rtp/configs/chan_dahdi.conf.sample Tue Feb 8 13:58:41 2011
@@ -205,7 +205,37 @@
; yes or both: both directions
;
;overlapdial=yes
-;
+
+; Send/receive ISDN display IE options. The display options are a comma separated
+; list of the following options:
+;
+; block: Do not pass display text data.
+; Q.SIG: Default for send/receive.
+; ETSI CPE: Default for send.
+; name_initial: Use display text in SETUP/CONNECT messages as the party name.
+; Default for all other modes.
+; name_update: Use display text in other messages (NOTIFY/FACILITY) for COLP name
+; update.
+; name: Combined name_initial and name_update options.
+; text: Pass any unused display text data as an arbitrary display message
+; during a call. Sent text goes out in an INFORMATION message.
+;
+; * Default is an empty string for legacy behavior.
+; * The name options are not recommended for Q.SIG since Q.SIG already
+; supports names.
+; * The send block is the only recommended setting for CPE mode since Q.931 uses
+; the display IE only in the network to user direction.
+;
+; display_send and display_receive cannot be changed on reload.
+;
+;display_send=
+;display_receive=
+
+; Allow sending an ISDN Malicious Caller ID (MCID) request on this span.
+; Default disabled
+;
+;mcid_send=yes
+
; Allow inband audio (progress) when a call is DISCONNECTed by the far end of a PRI
;
;inbanddisconnect=yes
Modified: team/may/ooh323_ipv6_direct_rtp/doc/asterisk.sgml
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/doc/asterisk.sgml?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/doc/asterisk.sgml (original)
+++ team/may/ooh323_ipv6_direct_rtp/doc/asterisk.sgml Tue Feb 8 13:58:41 2011
@@ -1,13 +1,13 @@
<refentry>
<refentryinfo>
- <date>2010-08-03</date>
+ <date>2011-02-08</date>
</refentryinfo>
<refmeta>
<refentrytitle>
<application>asterisk</application>
</refentrytitle>
<manvolnum>8</manvolnum>
- <refmiscinfo>asterisk 1.6</refmiscinfo>
+ <refmiscinfo>asterisk Trunk</refmiscinfo>
</refmeta>
<refnamediv>
<refname>
@@ -39,7 +39,7 @@
</refsynopsisdiv>
<refsect1>
<refsect1info>
- <date>2010-08-03</date>
+ <date>2011-02-08</date>
</refsect1info>
<title>DESCRIPTION</title>
<para>
@@ -412,7 +412,7 @@
http://www.asteriskdocs.org - The Asterisk Documentation Project
</para>
<para>
- http://www.voip-info.org/wiki-Asterisk - The Asterisk Wiki
+ http://wiki.asterisk.org - The Asterisk Wiki
</para>
<para>
http://www.digium.com/ - Asterisk sponsor and hardware supplier
Modified: team/may/ooh323_ipv6_direct_rtp/funcs/func_frame_trace.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/funcs/func_frame_trace.c?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/funcs/func_frame_trace.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/funcs/func_frame_trace.c Tue Feb 8 13:58:41 2011
@@ -308,6 +308,9 @@
case AST_CONTROL_AOC:
ast_verbose("SubClass: AOC\n");
break;
+ case AST_CONTROL_MCID:
+ ast_verbose("SubClass: MCID\n");
+ break;
}
if (frame->subclass.integer == -1) {
ast_verbose("SubClass: %d\n", frame->subclass.integer);
Modified: team/may/ooh323_ipv6_direct_rtp/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/include/asterisk/autoconfig.h.in?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/include/asterisk/autoconfig.h.in (original)
+++ team/may/ooh323_ipv6_direct_rtp/include/asterisk/autoconfig.h.in Tue Feb 8 13:58:41 2011
@@ -576,6 +576,10 @@
library. */
#undef HAVE_PRI_CCSS
+/* Define to 1 if you have the ISDN PRI user display text IE contents during
+ call library. */
+#undef HAVE_PRI_DISPLAY_TEXT
+
/* Define to 1 if you have the ISDN PRI hangup fix library. */
#undef HAVE_PRI_HANGUP_FIX
@@ -819,16 +823,16 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
-/* Define to 1 if `ifr_ifru.ifru_hwaddr' is a member of `struct ifreq'. */
+/* Define to 1 if `ifr_ifru.ifru_hwaddr' is member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR
-/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
-/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
+/* Define to 1 if `cr_uid' is member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_CR_UID
-/* Define to 1 if `uid' is a member of `struct ucred'. */
+/* Define to 1 if `uid' is member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_UID
/* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1105,9 +1109,6 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
Modified: team/may/ooh323_ipv6_direct_rtp/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/include/asterisk/channel.h?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/include/asterisk/channel.h (original)
+++ team/may/ooh323_ipv6_direct_rtp/include/asterisk/channel.h Tue Feb 8 13:58:41 2011
@@ -2389,8 +2389,7 @@
#define CHECK_BLOCKING(c) do { \
if (ast_test_flag(c, AST_FLAG_BLOCKING)) {\
- if (option_debug) \
- ast_log(LOG_DEBUG, "Thread %ld Blocking '%s', already blocked by thread %ld in procedure %s\n", (long) pthread_self(), (c)->name, (long) (c)->blocker, (c)->blockproc); \
+ ast_debug(1, "Thread %ld Blocking '%s', already blocked by thread %ld in procedure %s\n", (long) pthread_self(), (c)->name, (long) (c)->blocker, (c)->blockproc); \
} else { \
(c)->blocker = pthread_self(); \
(c)->blockproc = __PRETTY_FUNCTION__; \
Modified: team/may/ooh323_ipv6_direct_rtp/include/asterisk/frame.h
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/include/asterisk/frame.h?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/include/asterisk/frame.h (original)
+++ team/may/ooh323_ipv6_direct_rtp/include/asterisk/frame.h Tue Feb 8 13:58:41 2011
@@ -263,6 +263,7 @@
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. */
};
enum ast_frame_read_action {
Modified: team/may/ooh323_ipv6_direct_rtp/include/asterisk/sched.h
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/include/asterisk/sched.h?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/include/asterisk/sched.h (original)
+++ team/may/ooh323_ipv6_direct_rtp/include/asterisk/sched.h Tue Feb 8 13:58:41 2011
@@ -49,8 +49,8 @@
int _sched_res = -1; \
while (id > -1 && (_sched_res = ast_sched_del(sched, id)) && ++_count < 10) \
usleep(1); \
- if (_count == 10 && option_debug > 2) { \
- ast_log(LOG_DEBUG, "Unable to cancel schedule ID %d.\n", id); \
+ if (_count == 10) { \
+ ast_debug(3, "Unable to cancel schedule ID %d.\n", id); \
} \
id = -1; \
(_sched_res); \
@@ -87,8 +87,8 @@
usleep(1); \
ast_mutex_lock(lock); \
} \
- if (_count == 10 && option_debug > 2) { \
- ast_log(LOG_DEBUG, "Unable to cancel schedule ID %d.\n", id); \
+ if (_count == 10) { \
+ ast_debug(3, "Unable to cancel schedule ID %d.\n", id); \
} \
id = -1; \
(_sched_res); \
Modified: team/may/ooh323_ipv6_direct_rtp/main/app.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/main/app.c?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/main/app.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/main/app.c Tue Feb 8 13:58:41 2011
@@ -1481,9 +1481,9 @@
snprintf(s, strlen(path) + 19, "%s/lock", path);
unlink(s);
path_lock_destroy(p);
- ast_log(LOG_DEBUG, "Unlocked path '%s'\n", path);
+ ast_debug(1, "Unlocked path '%s'\n", path);
} else {
- ast_log(LOG_DEBUG, "Failed to unlock path '%s': "
+ ast_debug(1, "Failed to unlock path '%s': "
"lock not found\n", path);
}
Modified: team/may/ooh323_ipv6_direct_rtp/main/audiohook.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/main/audiohook.c?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/main/audiohook.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/main/audiohook.c Tue Feb 8 13:58:41 2011
@@ -138,16 +138,13 @@
other_factory_ms = other_factory_samples / 8;
if (ast_test_flag(audiohook, AST_AUDIOHOOK_TRIGGER_SYNC) && other_factory_samples && (our_factory_ms - other_factory_ms > AST_AUDIOHOOK_SYNC_TOLERANCE)) {
- if (option_debug)
- ast_log(LOG_DEBUG, "Flushing audiohook %p so it remains in sync\n", audiohook);
+ ast_debug(1, "Flushing audiohook %p so it remains in sync\n", audiohook);
ast_slinfactory_flush(factory);
ast_slinfactory_flush(other_factory);
}
if (ast_test_flag(audiohook, AST_AUDIOHOOK_SMALL_QUEUE) && (our_factory_samples > 640 || other_factory_samples > 640)) {
- if (option_debug) {
- ast_log(LOG_DEBUG, "Audiohook %p has stale audio in its factories. Flushing them both\n", audiohook);
- }
+ ast_debug(1, "Audiohook %p has stale audio in its factories. Flushing them both\n", audiohook);
ast_slinfactory_flush(factory);
ast_slinfactory_flush(other_factory);
}
@@ -256,8 +253,8 @@
}
}
}
- } else if (option_debug)
- ast_log(LOG_DEBUG, "Failed to get %d samples from read factory %p\n", (int)samples, &audiohook->read_factory);
+ }
+ ast_debug(1, "Failed to get %d samples from read factory %p\n", (int)samples, &audiohook->read_factory);
/* Move on to the write factory... if there are enough samples, read them in */
if (usable_write) {
@@ -275,8 +272,8 @@
}
}
}
- } else if (option_debug)
- ast_log(LOG_DEBUG, "Failed to get %d samples from write factory %p\n", (int)samples, &audiohook->write_factory);
+ }
+ ast_debug(1, "Failed to get %d samples from write factory %p\n", (int)samples, &audiohook->write_factory);
/* Basically we figure out which buffer to use... and if mixing can be done here */
if (!read_buf && !write_buf)
@@ -818,7 +815,7 @@
AST_LIST_TRAVERSE_SAFE_END;
break;
default:
- ast_log(LOG_DEBUG, "Invalid audiohook type supplied, (%d)\n", type);
+ ast_debug(1, "Invalid audiohook type supplied, (%d)\n", type);
return -1;
}
@@ -856,7 +853,7 @@
AST_LIST_TRAVERSE_SAFE_END;
break;
default:
- ast_log(LOG_DEBUG, "Invalid audiohook type supplied, (%d)\n", type);
+ ast_debug(1, "Invalid audiohook type supplied, (%d)\n", type);
return -1;
}
return count;
Modified: team/may/ooh323_ipv6_direct_rtp/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/main/ccss.c?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/main/ccss.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/main/ccss.c Tue Feb 8 13:58:41 2011
@@ -2505,6 +2505,18 @@
return NULL;
}
ast_format_cap_destroy(tmp_cap);
+
+ /* We have a channel. It's time now to set up the datastore of recalled CC interfaces.
+ * This will be a common task for all recall functions. If it were possible, I'd have
+ * the core do it automatically, but alas I cannot. Instead, I will provide a public
+ * function to do so.
+ */
+ ast_setup_cc_recall_datastore(chan, agent->core_id);
+ ast_cc_agent_set_interfaces_chanvar(chan);
+
+ ast_copy_string(chan->exten, generic_pvt->exten, sizeof(chan->exten));
+ ast_copy_string(chan->context, generic_pvt->context, sizeof(chan->context));
+ chan->priority = 1;
if (!ast_strlen_zero(callback_macro)) {
ast_log_dynamic_level(cc_logger_level, "Core %d: There's a callback macro configured for agent %s\n",
@@ -2515,17 +2527,6 @@
return NULL;
}
}
- /* We have a channel. It's time now to set up the datastore of recalled CC interfaces.
- * This will be a common task for all recall functions. If it were possible, I'd have
- * the core do it automatically, but alas I cannot. Instead, I will provide a public
- * function to do so.
- */
- ast_setup_cc_recall_datastore(chan, agent->core_id);
- ast_cc_agent_set_interfaces_chanvar(chan);
-
- ast_copy_string(chan->exten, generic_pvt->exten, sizeof(chan->exten));
- ast_copy_string(chan->context, generic_pvt->context, sizeof(chan->context));
- chan->priority = 1;
ast_cc_agent_recalling(agent->core_id, "Generic agent %s is recalling", agent->device_name);
ast_pbx_start(chan);
return NULL;
Modified: team/may/ooh323_ipv6_direct_rtp/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/main/channel.c?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/main/channel.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/main/channel.c Tue Feb 8 13:58:41 2011
@@ -675,16 +675,16 @@
return 0;
/* If the last saved context does not match the current one
OR we have not saved any context so far, then save the current context */
- if ((!AST_LIST_EMPTY(&traced->trace) && strcasecmp(AST_LIST_FIRST(&traced->trace)->context, chan->context)) ||
+ if ((!AST_LIST_EMPTY(&traced->trace) && strcasecmp(AST_LIST_FIRST(&traced->trace)->context, chan->context)) ||
(AST_LIST_EMPTY(&traced->trace))) {
/* Just do some debug logging */
if (AST_LIST_EMPTY(&traced->trace))
- ast_log(LOG_DEBUG, "Setting initial trace context to %s\n", chan->context);
+ ast_debug(1, "Setting initial trace context to %s\n", chan->context);
else
- ast_log(LOG_DEBUG, "Changing trace context from %s to %s\n", AST_LIST_FIRST(&traced->trace)->context, chan->context);
+ ast_debug(1, "Changing trace context from %s to %s\n", AST_LIST_FIRST(&traced->trace)->context, chan->context);
/* alloc or bail out */
trace = ast_malloc(sizeof(*trace));
- if (!trace)
+ if (!trace)
return -1;
/* save the current location and store it in the trace list */
ast_copy_string(trace->context, chan->context, sizeof(trace->context));
@@ -745,7 +745,7 @@
return 1;
if (ast_tvzero(chan->whentohangup)) /* no if no hangup scheduled */
return 0;
- if (ast_tvdiff_ms(chan->whentohangup, ast_tvnow()) > 0) /* no if hangup time has not come yet. */
+ if (ast_tvdiff_ms(chan->whentohangup, ast_tvnow()) > 0) /* no if hangup time has not come yet. */
return 0;
ast_debug(4, "Hangup time has come: %" PRIi64 "\n", ast_tvdiff_ms(chan->whentohangup, ast_tvnow()));
chan->_softhangup |= AST_SOFTHANGUP_TIMEOUT; /* record event */
@@ -847,7 +847,7 @@
return -1;
}
}
-
+
if (!(chan = ast_calloc(1, sizeof(*chan)))) {
AST_RWLIST_UNLOCK(&backends);
return -1;
@@ -2775,7 +2775,7 @@
} else {
ast_debug(1, "Hanging up zombie '%s'\n", chan->name);
}
-
+
ast_channel_unlock(chan);
ast_cc_offer(chan);
ast_manager_event(chan, EVENT_FLAG_CALL, "Hangup",
@@ -3568,7 +3568,7 @@
} else {
samples = f->samples;
}
-
+
/* This unlock is here based on two assumptions that hold true at this point in the
* code. 1) this function is only called from within __ast_read() and 2) all generators
* call ast_write() in their generate callback.
@@ -4229,6 +4229,7 @@
case AST_CONTROL_READ_ACTION:
case AST_CONTROL_AOC:
case AST_CONTROL_END_OF_Q:
+ case AST_CONTROL_MCID:
break;
case AST_CONTROL_CONGESTION:
@@ -4412,6 +4413,7 @@
case AST_CONTROL_READ_ACTION:
case AST_CONTROL_AOC:
case AST_CONTROL_END_OF_Q:
+ case AST_CONTROL_MCID:
/* Nothing left to do for these. */
res = 0;
break;
@@ -4548,7 +4550,7 @@
if (res && chan->generator)
ast_playtones_stop(chan);
-
+
return 0;
}
@@ -4558,7 +4560,7 @@
ast_senddigit_begin(chan, digit);
ast_safe_sleep(chan, (duration >= AST_DEFAULT_EMULATE_DTMF_DURATION ? duration : AST_DEFAULT_EMULATE_DTMF_DURATION));
}
-
+
return ast_senddigit_end(chan, digit, (duration >= AST_DEFAULT_EMULATE_DTMF_DURATION ? duration : AST_DEFAULT_EMULATE_DTMF_DURATION));
}
@@ -6222,32 +6224,32 @@
struct ast_channel *chan2)
{
if (!ast_strlen_zero(chan1->accountcode) && ast_strlen_zero(chan2->peeraccount)) {
- ast_log(LOG_DEBUG, "setting peeraccount to %s for %s from data on channel %s\n",
+ ast_debug(1, "setting peeraccount to %s for %s from data on channel %s\n",
chan1->accountcode, chan2->name, chan1->name);
ast_string_field_set(chan2, peeraccount, chan1->accountcode);
}
if (!ast_strlen_zero(chan2->accountcode) && ast_strlen_zero(chan1->peeraccount)) {
- ast_log(LOG_DEBUG, "setting peeraccount to %s for %s from data on channel %s\n",
+ ast_debug(1, "setting peeraccount to %s for %s from data on channel %s\n",
chan2->accountcode, chan1->name, chan2->name);
ast_string_field_set(chan1, peeraccount, chan2->accountcode);
}
if (!ast_strlen_zero(chan1->peeraccount) && ast_strlen_zero(chan2->accountcode)) {
- ast_log(LOG_DEBUG, "setting accountcode to %s for %s from data on channel %s\n",
+ ast_debug(1, "setting accountcode to %s for %s from data on channel %s\n",
chan1->peeraccount, chan2->name, chan1->name);
ast_string_field_set(chan2, accountcode, chan1->peeraccount);
}
if (!ast_strlen_zero(chan2->peeraccount) && ast_strlen_zero(chan1->accountcode)) {
- ast_log(LOG_DEBUG, "setting accountcode to %s for %s from data on channel %s\n",
+ ast_debug(1, "setting accountcode to %s for %s from data on channel %s\n",
chan2->peeraccount, chan1->name, chan2->name);
ast_string_field_set(chan1, accountcode, chan2->peeraccount);
}
if (0 != strcmp(chan1->accountcode, chan2->peeraccount)) {
- ast_log(LOG_DEBUG, "changing peeraccount from %s to %s on %s to match channel %s\n",
+ ast_debug(1, "changing peeraccount from %s to %s on %s to match channel %s\n",
chan2->peeraccount, chan1->peeraccount, chan2->name, chan1->name);
ast_string_field_set(chan2, peeraccount, chan1->accountcode);
}
if (0 != strcmp(chan2->accountcode, chan1->peeraccount)) {
- ast_log(LOG_DEBUG, "changing peeraccount from %s to %s on %s to match channel %s\n",
+ ast_debug(1, "changing peeraccount from %s to %s on %s to match channel %s\n",
chan1->peeraccount, chan2->peeraccount, chan1->name, chan2->name);
ast_string_field_set(chan1, peeraccount, chan2->accountcode);
}
@@ -6999,7 +7001,7 @@
if (!f) {
*fo = NULL;
*rc = who;
- ast_debug(1, "Didn't get a frame from channel: %s\n",who->name);
+ ast_debug(1, "Didn't get a frame from channel: %s\n", who->name);
break;
}
@@ -7013,6 +7015,7 @@
switch (f->subclass.integer) {
case AST_CONTROL_AOC:
+ case AST_CONTROL_MCID:
ast_indicate_data(other, f->subclass.integer, f->data.ptr, f->datalen);
break;
case AST_CONTROL_REDIRECTING:
@@ -7062,7 +7065,7 @@
f->frametype == AST_FRAME_DTMF_BEGIN)) {
*fo = f;
*rc = who;
- ast_debug(1, "Got DTMF %s on channel (%s)\n",
+ ast_debug(1, "Got DTMF %s on channel (%s)\n",
f->frametype == AST_FRAME_DTMF_END ? "end" : "begin",
who->name);
@@ -8686,7 +8689,7 @@
break;
/* Connected line party unknown element */
default:
- ast_log(LOG_DEBUG, "Unknown connected line element: %u (%u)\n",
+ ast_debug(1, "Unknown connected line element: %u (%u)\n",
(unsigned) ie_id, (unsigned) ie_len);
break;
}
@@ -8714,7 +8717,7 @@
* The other end is newer than we are.
* We need to assume that they are compatible with us.
*/
- ast_log(LOG_DEBUG, "Connected line frame has newer version: %u\n",
+ ast_debug(1, "Connected line frame has newer version: %u\n",
(unsigned) frame_version);
break;
}
@@ -9185,7 +9188,7 @@
break;
/* Redirecting unknown element */
default:
- ast_log(LOG_DEBUG, "Unknown redirecting element: %u (%u)\n",
+ ast_debug(1, "Unknown redirecting element: %u (%u)\n",
(unsigned) ie_id, (unsigned) ie_len);
break;
}
@@ -9221,7 +9224,7 @@
* The other end is newer than we are.
* We need to assume that they are compatible with us.
*/
- ast_log(LOG_DEBUG, "Redirecting frame has newer version: %u\n",
+ ast_debug(1, "Redirecting frame has newer version: %u\n",
(unsigned) frame_version);
break;
}
Modified: team/may/ooh323_ipv6_direct_rtp/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/main/features.c?view=diff&rev=306971&r1=306970&r2=306971
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/main/features.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/main/features.c Tue Feb 8 13:58:41 2011
@@ -854,7 +854,7 @@
/*! \brief Notify metermaids that we've changed an extension */
static void notify_metermaids(const char *exten, char *context, enum ast_device_state state)
{
- ast_debug(4, "Notification of state change to metermaids %s@%s\n to state '%s'",
+ ast_debug(4, "Notification of state change to metermaids %s@%s\n to state '%s'",
exten, context, ast_devstate2str(state));
ast_devstate_changed(state, "park:%s@%s", exten, context);
@@ -871,7 +871,7 @@
exten = strsep(&context, "@");
if (!context)
return AST_DEVICE_INVALID;
-
+
ast_debug(4, "Checking state of exten %s in context %s\n", exten, context);
if (!ast_exists_extension(NULL, context, exten, 1, NULL))
@@ -1923,12 +1923,12 @@
}
if (transferer->cdr) {
struct ast_cdr *swap = transferer->cdr;
- ast_log(LOG_DEBUG,"transferer=%s; transferee=%s; lastapp=%s; lastdata=%s; chan=%s; dstchan=%s\n",
+ ast_debug(1, "transferer=%s; transferee=%s; lastapp=%s; lastdata=%s; chan=%s; dstchan=%s\n",
transferer->name, transferee->name, transferer->cdr->lastapp, transferer->cdr->lastdata,
transferer->cdr->channel, transferer->cdr->dstchannel);
- ast_log(LOG_DEBUG,"TRANSFEREE; lastapp=%s; lastdata=%s, chan=%s; dstchan=%s\n",
+ ast_debug(1, "TRANSFEREE; lastapp=%s; lastdata=%s, chan=%s; dstchan=%s\n",
transferee->cdr->lastapp, transferee->cdr->lastdata, transferee->cdr->channel, transferee->cdr->dstchannel);
- ast_log(LOG_DEBUG,"transferer_real_context=%s; xferto=%s\n", transferer_real_context, xferto);
+ ast_debug(1, "transferer_real_context=%s; xferto=%s\n", transferer_real_context, xferto);
/* swap cdrs-- it will save us some time & work */
transferer->cdr = transferee->cdr;
transferee->cdr = swap;
@@ -1942,7 +1942,7 @@
} else {
/* Set the channel's new extension, since it exists, using transferer context */
ast_set_flag(transferee, AST_FLAG_BRIDGE_HANGUP_DONT); /* don't let the after-bridge code run the h-exten */
- ast_log(LOG_DEBUG,"ABOUT TO AST_ASYNC_GOTO, have a pbx... set HANGUP_DONT on chan=%s\n", transferee->name);
+ ast_debug(1, "ABOUT TO AST_ASYNC_GOTO, have a pbx... set HANGUP_DONT on chan=%s\n", transferee->name);
if (ast_channel_connected_line_macro(transferee, transferer, &transferer->connected, 1, 0)) {
ast_channel_update_connected_line(transferer, &transferer->connected, NULL);
}
@@ -3534,7 +3534,7 @@
ast_cdr_start(bridge_cdr);
}
}
- ast_debug(4,"bridge answer set, chan answer set\n");
+ ast_debug(4, "bridge answer set, chan answer set\n");
/* peer_cdr->answer will be set when a macro runs on the peer;
in that case, the bridge answer will be delayed while the
macro plays on the peer channel. The peer answered the call
@@ -3662,6 +3662,7 @@
switch (f->subclass.integer) {
case AST_CONTROL_RINGING:
case AST_CONTROL_FLASH:
+ case AST_CONTROL_MCID:
case -1:
ast_indicate(other, f->subclass.integer);
break;
@@ -4665,7 +4666,7 @@
} else if (!strcasecmp(confvar->name, "findslot")) {
parkinglot->parkfindnext = (!strcasecmp(confvar->value, "next"));
} else if (!strcasecmp(confvar->name, "parkedcalltransfers")) {
- ast_log(LOG_DEBUG, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
+ ast_debug(1, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
if (!strcasecmp(confvar->value, "both")) {
parkinglot->parkedcalltransfers = AST_FEATURE_FLAG_BYBOTH;
} else if (!strcasecmp(confvar->value, "caller")) {
@@ -4674,7 +4675,7 @@
parkinglot->parkedcalltransfers = AST_FEATURE_FLAG_BYCALLEE;
}
} else if (!strcasecmp(confvar->name, "parkedcallreparking")) {
- ast_log(LOG_DEBUG, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
+ ast_debug(1, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
if (!strcasecmp(confvar->value, "both")) {
parkinglot->parkedcallreparking = AST_FEATURE_FLAG_BYBOTH;
} else if (!strcasecmp(confvar->value, "caller")) {
@@ -4683,16 +4684,16 @@
parkinglot->parkedcallreparking = AST_FEATURE_FLAG_BYCALLEE;
}
} else if (!strcasecmp(confvar->name, "parkedcallhangup")) {
- ast_log(LOG_DEBUG, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
+ ast_debug(1, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
if (!strcasecmp(confvar->value, "both")) {
parkinglot->parkedcallhangup = AST_FEATURE_FLAG_BYBOTH;
} else if (!strcasecmp(confvar->value, "caller")) {
- parkinglot->parkedcallhangup = AST_FEATURE_FLAG_BYCALLER;
+ parkinglot->parkedcallhangup = AST_FEATURE_FLAG_BYCALLER;
} else if (!strcasecmp(confvar->value, "callee")) {
parkinglot->parkedcallhangup = AST_FEATURE_FLAG_BYCALLEE;
}
} else if (!strcasecmp(confvar->name, "parkedcallrecording")) {
- ast_log(LOG_DEBUG, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
+ ast_debug(1, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
if (!strcasecmp(confvar->value, "both")) {
parkinglot->parkedcallrecording = AST_FEATURE_FLAG_BYBOTH;
} else if (!strcasecmp(confvar->value, "caller")) {
@@ -4762,7 +4763,7 @@
return parkinglot;
}
-static int load_config(void)
+static int load_config(void)
{
int start = 0, end = 0;
int res;
@@ -4793,7 +4794,7 @@
default_parkinglot->parkingtime = DEFAULT_PARK_TIME;
ao2_unlock(default_parkinglot);
}
-
+
if (default_parkinglot) {
ast_debug(1, "Configuration of default parkinglot done.\n");
} else {
@@ -5053,7 +5054,7 @@
[... 1194 lines stripped ...]
More information about the asterisk-commits
mailing list