2010-09-20 22:16:37 +00:00
|
|
|
/*
|
|
|
|
|
* Asterisk -- An open source telephony toolkit.
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2010, Digium, Inc.
|
|
|
|
|
*
|
|
|
|
|
* David Vossel <dvossel@digium.com>
|
|
|
|
|
*
|
|
|
|
|
* See http://www.asterisk.org for more information about
|
|
|
|
|
* the Asterisk project. Please do not directly contact
|
|
|
|
|
* any of the maintainers of this project for assistance;
|
|
|
|
|
* the project provides a web site, mailing lists and IRC
|
|
|
|
|
* channels for your use.
|
|
|
|
|
*
|
|
|
|
|
* This program is free software, distributed under the terms of
|
|
|
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
|
|
|
* at the top of the source tree.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*! \file
|
|
|
|
|
*
|
|
|
|
|
* \brief Trace internal ast_frames on a channel.
|
|
|
|
|
*
|
|
|
|
|
* \author David Vossel <dvossel@digium.com>
|
|
|
|
|
*
|
|
|
|
|
* \ingroup functions
|
|
|
|
|
*/
|
|
|
|
|
|
2011-07-14 20:28:54 +00:00
|
|
|
/*** MODULEINFO
|
|
|
|
|
<support_level>extended</support_level>
|
|
|
|
|
***/
|
|
|
|
|
|
2010-09-20 22:16:37 +00:00
|
|
|
#include "asterisk.h"
|
|
|
|
|
|
|
|
|
|
#include "asterisk/module.h"
|
|
|
|
|
#include "asterisk/channel.h"
|
|
|
|
|
#include "asterisk/pbx.h"
|
|
|
|
|
#include "asterisk/framehook.h"
|
2024-01-12 16:33:00 +00:00
|
|
|
#include "asterisk/cli.h"
|
2010-09-20 22:16:37 +00:00
|
|
|
|
|
|
|
|
/*** DOCUMENTATION
|
|
|
|
|
<function name="FRAME_TRACE" language="en_US">
|
|
|
|
|
<synopsis>
|
|
|
|
|
View internal ast_frames as they are read and written on a channel.
|
|
|
|
|
</synopsis>
|
|
|
|
|
<syntax>
|
|
|
|
|
<parameter name="filter list type" required="true">
|
|
|
|
|
<para>A filter can be applied to the trace to limit what frames are viewed. This
|
|
|
|
|
filter can either be a <literal>white</literal> or <literal>black</literal> list
|
|
|
|
|
of frame types. When no filter type is present, <literal>white</literal> is
|
|
|
|
|
used. If no arguments are provided at all, all frames will be output.
|
|
|
|
|
</para>
|
|
|
|
|
|
|
|
|
|
<para>Below are the different types of frames that can be filtered.</para>
|
|
|
|
|
<enumlist>
|
|
|
|
|
<enum name = "DTMF_BEGIN" />
|
|
|
|
|
<enum name = "DTMF_END" />
|
|
|
|
|
<enum name = "VOICE" />
|
|
|
|
|
<enum name = "VIDEO" />
|
|
|
|
|
<enum name = "CONTROL" />
|
|
|
|
|
<enum name = "NULL" />
|
|
|
|
|
<enum name = "IAX" />
|
|
|
|
|
<enum name = "TEXT" />
|
bridge_softmix: Forward TEXT frames
Core bridging and, more specifically, bridge_softmix have been
enhanced to relay received frames of type TEXT or TEXT_DATA to all
participants in a softmix bridge. res_pjsip_messaging and
chan_pjsip have been enhanced to take advantage of this so when
res_pjsip_messaging receives an in-dialog MESSAGE message from a
user in a conference call, it's relayed to all other participants
in the call.
res_pjsip_messaging already queues TEXT frames to the channel when
it receives an in-dialog MESSAGE from an endpoint and chan_pjsip
will send an MESSAGE when it gets a TEXT frame. On a normal
point-to-point call, the frames are forwarded between the two
correctly. bridge_softmix was not though so messages weren't
getting forwarded to conference bridge participants. Even if they
were, the bridging code had no way to tell the participants who
sent the message so it would look like it came from the bridge
itself.
* The TEXT frame type doesn't allow storage of any meta data, such
as sender, on the frame so a new TEXT_DATA frame type was added that
uses the new ast_msg_data structure as its payload. A channel
driver can queue a frame of that type when it receives a message
from outside. A channel driver can use it for sending messages
by implementing the new send_text_data channel tech callback and
setting the new AST_CHAN_TP_SEND_TEXT_DATA flag in its tech
properties. If set, the bridging/channel core will use it instead
of the original send_text callback and it will get the ast_msg_data
structure. Channel drivers aren't required to implement this. Even
if a TEXT_DATA enabled driver uses it for incoming messages, an
outgoing channel driver that doesn't will still have it's send_text
callback called with only the message text just as before.
* res_pjsip_messaging now creates a TEXT_DATA frame for incoming
in-dialog messages and sets the "from" to the display name in the
"From" header, or if that's empty, the caller id name from the
channel. This allows the chat client user to set a friendly name
for the chat.
* bridge_softmix now forwards TEXT and TEXT_DATA frames to all
participants (except the sender).
* A new function "ast_sendtext_data" was added to channel which
takes an ast_msg_data structure and calls a channel's
send_text_data callback, or if that's not defined, the original
send_text callback.
* bridge_channel now calls ast_sendtext_data for TEXT_DATA frame
types and ast_sendtext for TEXT frame types.
* chan_pjsip now uses the "from" name in the ast_msg_data structure
(if it exists) to set the "From" header display name on outgoing text
messages.
Change-Id: Idacf5900bfd5f22ab8cd235aa56dfad090d18489
2017-09-27 16:44:53 +00:00
|
|
|
<enum name = "TEXT_DATA" />
|
2010-09-20 22:16:37 +00:00
|
|
|
<enum name = "IMAGE" />
|
|
|
|
|
<enum name = "HTML" />
|
|
|
|
|
<enum name = "CNG" />
|
|
|
|
|
<enum name = "MODEM" />
|
|
|
|
|
</enumlist>
|
|
|
|
|
</parameter>
|
|
|
|
|
</syntax>
|
|
|
|
|
<description>
|
|
|
|
|
<para>Examples:</para>
|
2022-06-01 01:43:52 +00:00
|
|
|
<example title="View only DTMF frames">
|
|
|
|
|
exten => 1,1,Set(FRAME_TRACE(white)=DTMF_BEGIN,DTMF_END)
|
|
|
|
|
</example>
|
|
|
|
|
<example title="View only DTMF frames">
|
|
|
|
|
exten => 1,1,Set(FRAME_TRACE()=DTMF_BEGIN,DTMF_END)
|
|
|
|
|
</example>
|
|
|
|
|
<example title="View everything except DTMF frames">
|
|
|
|
|
exten => 1,1,Set(FRAME_TRACE(black)=DTMF_BEGIN,DTMF_END)
|
|
|
|
|
</example>
|
2010-09-20 22:16:37 +00:00
|
|
|
</description>
|
|
|
|
|
</function>
|
|
|
|
|
***/
|
|
|
|
|
|
|
|
|
|
static void print_frame(struct ast_frame *frame);
|
|
|
|
|
static struct {
|
|
|
|
|
enum ast_frame_type type;
|
|
|
|
|
const char *str;
|
|
|
|
|
} frametype2str[] = {
|
|
|
|
|
{ AST_FRAME_DTMF_BEGIN, "DTMF_BEGIN" },
|
|
|
|
|
{ AST_FRAME_DTMF_END, "DTMF_END" },
|
|
|
|
|
{ AST_FRAME_VOICE, "VOICE" },
|
|
|
|
|
{ AST_FRAME_VIDEO, "VIDEO" },
|
|
|
|
|
{ AST_FRAME_CONTROL, "CONTROL" },
|
|
|
|
|
{ AST_FRAME_NULL, "NULL" },
|
|
|
|
|
{ AST_FRAME_IAX, "IAX" },
|
|
|
|
|
{ AST_FRAME_TEXT, "TEXT" },
|
bridge_softmix: Forward TEXT frames
Core bridging and, more specifically, bridge_softmix have been
enhanced to relay received frames of type TEXT or TEXT_DATA to all
participants in a softmix bridge. res_pjsip_messaging and
chan_pjsip have been enhanced to take advantage of this so when
res_pjsip_messaging receives an in-dialog MESSAGE message from a
user in a conference call, it's relayed to all other participants
in the call.
res_pjsip_messaging already queues TEXT frames to the channel when
it receives an in-dialog MESSAGE from an endpoint and chan_pjsip
will send an MESSAGE when it gets a TEXT frame. On a normal
point-to-point call, the frames are forwarded between the two
correctly. bridge_softmix was not though so messages weren't
getting forwarded to conference bridge participants. Even if they
were, the bridging code had no way to tell the participants who
sent the message so it would look like it came from the bridge
itself.
* The TEXT frame type doesn't allow storage of any meta data, such
as sender, on the frame so a new TEXT_DATA frame type was added that
uses the new ast_msg_data structure as its payload. A channel
driver can queue a frame of that type when it receives a message
from outside. A channel driver can use it for sending messages
by implementing the new send_text_data channel tech callback and
setting the new AST_CHAN_TP_SEND_TEXT_DATA flag in its tech
properties. If set, the bridging/channel core will use it instead
of the original send_text callback and it will get the ast_msg_data
structure. Channel drivers aren't required to implement this. Even
if a TEXT_DATA enabled driver uses it for incoming messages, an
outgoing channel driver that doesn't will still have it's send_text
callback called with only the message text just as before.
* res_pjsip_messaging now creates a TEXT_DATA frame for incoming
in-dialog messages and sets the "from" to the display name in the
"From" header, or if that's empty, the caller id name from the
channel. This allows the chat client user to set a friendly name
for the chat.
* bridge_softmix now forwards TEXT and TEXT_DATA frames to all
participants (except the sender).
* A new function "ast_sendtext_data" was added to channel which
takes an ast_msg_data structure and calls a channel's
send_text_data callback, or if that's not defined, the original
send_text callback.
* bridge_channel now calls ast_sendtext_data for TEXT_DATA frame
types and ast_sendtext for TEXT frame types.
* chan_pjsip now uses the "from" name in the ast_msg_data structure
(if it exists) to set the "From" header display name on outgoing text
messages.
Change-Id: Idacf5900bfd5f22ab8cd235aa56dfad090d18489
2017-09-27 16:44:53 +00:00
|
|
|
{ AST_FRAME_TEXT_DATA, "TEXT_DATA" },
|
2010-09-20 22:16:37 +00:00
|
|
|
{ AST_FRAME_IMAGE, "IMAGE" },
|
|
|
|
|
{ AST_FRAME_HTML, "HTML" },
|
|
|
|
|
{ AST_FRAME_CNG, "CNG" },
|
|
|
|
|
{ AST_FRAME_MODEM, "MODEM" },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct frame_trace_data {
|
|
|
|
|
int list_type; /* 0 = white, 1 = black */
|
|
|
|
|
int values[ARRAY_LEN(frametype2str)];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void datastore_destroy_cb(void *data) {
|
|
|
|
|
ast_free(data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct ast_datastore_info frame_trace_datastore = {
|
|
|
|
|
.type = "frametrace",
|
|
|
|
|
.destroy = datastore_destroy_cb
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void hook_destroy_cb(void *framedata)
|
|
|
|
|
{
|
|
|
|
|
ast_free(framedata);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_frame *frame, enum ast_framehook_event event, void *data)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int show_frame = 0;
|
|
|
|
|
struct frame_trace_data *framedata = data;
|
|
|
|
|
if (!frame) {
|
|
|
|
|
return frame;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((event != AST_FRAMEHOOK_EVENT_WRITE) && (event != AST_FRAMEHOOK_EVENT_READ)) {
|
|
|
|
|
return frame;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_LEN(frametype2str); i++) {
|
|
|
|
|
if (frame->frametype == frametype2str[i].type) {
|
|
|
|
|
if ((framedata->list_type == 0) && (framedata->values[i])) { /* white list */
|
|
|
|
|
show_frame = 1;
|
|
|
|
|
} else if ((framedata->list_type == 1) && (!framedata->values[i])){ /* black list */
|
|
|
|
|
show_frame = 1;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (show_frame) {
|
2012-01-09 22:15:50 +00:00
|
|
|
ast_verbose("%s on Channel %s\n", event == AST_FRAMEHOOK_EVENT_READ ? "<--Read" : "--> Write", ast_channel_name(chan));
|
2010-09-20 22:16:37 +00:00
|
|
|
print_frame(frame);
|
|
|
|
|
}
|
|
|
|
|
return frame;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int frame_trace_helper(struct ast_channel *chan, const char *cmd, char *data, const char *value)
|
|
|
|
|
{
|
|
|
|
|
struct frame_trace_data *framedata;
|
|
|
|
|
struct ast_datastore *datastore = NULL;
|
|
|
|
|
struct ast_framehook_interface interface = {
|
|
|
|
|
.version = AST_FRAMEHOOK_INTERFACE_VERSION,
|
|
|
|
|
.event_cb = hook_event_cb,
|
|
|
|
|
.destroy_cb = hook_destroy_cb,
|
|
|
|
|
};
|
|
|
|
|
int i = 0;
|
|
|
|
|
|
2014-03-27 19:21:44 +00:00
|
|
|
if (!chan) {
|
|
|
|
|
ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2010-09-20 22:16:37 +00:00
|
|
|
if (!(framedata = ast_calloc(1, sizeof(*framedata)))) {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
interface.data = framedata;
|
|
|
|
|
|
|
|
|
|
if (!strcasecmp(data, "black")) {
|
|
|
|
|
framedata->list_type = 1;
|
|
|
|
|
}
|
|
|
|
|
for (i = 0; i < ARRAY_LEN(frametype2str); i++) {
|
|
|
|
|
if (strcasestr(value, frametype2str[i].str)) {
|
|
|
|
|
framedata->values[i] = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ast_channel_lock(chan);
|
|
|
|
|
i = ast_framehook_attach(chan, &interface);
|
|
|
|
|
if (i >= 0) {
|
|
|
|
|
int *id;
|
|
|
|
|
if ((datastore = ast_channel_datastore_find(chan, &frame_trace_datastore, NULL))) {
|
|
|
|
|
id = datastore->data;
|
|
|
|
|
ast_framehook_detach(chan, *id);
|
|
|
|
|
ast_channel_datastore_remove(chan, datastore);
|
2014-07-28 18:58:43 +00:00
|
|
|
ast_datastore_free(datastore);
|
2010-09-20 22:16:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!(datastore = ast_datastore_alloc(&frame_trace_datastore, NULL))) {
|
|
|
|
|
ast_framehook_detach(chan, i);
|
|
|
|
|
ast_channel_unlock(chan);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!(id = ast_calloc(1, sizeof(int)))) {
|
|
|
|
|
ast_datastore_free(datastore);
|
|
|
|
|
ast_framehook_detach(chan, i);
|
|
|
|
|
ast_channel_unlock(chan);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*id = i; /* Store off the id. The channel is still locked so it is safe to access this ptr. */
|
|
|
|
|
datastore->data = id;
|
|
|
|
|
ast_channel_datastore_add(chan, datastore);
|
|
|
|
|
}
|
|
|
|
|
ast_channel_unlock(chan);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void print_frame(struct ast_frame *frame)
|
|
|
|
|
{
|
|
|
|
|
switch (frame->frametype) {
|
|
|
|
|
case AST_FRAME_DTMF_END:
|
|
|
|
|
ast_verbose("FrameType: DTMF END\n");
|
2014-05-09 22:49:26 +00:00
|
|
|
ast_verbose("Digit: 0x%02X '%c'\n", (unsigned)frame->subclass.integer,
|
2013-01-31 18:15:49 +00:00
|
|
|
frame->subclass.integer < ' ' ? ' ' : frame->subclass.integer);
|
2010-09-20 22:16:37 +00:00
|
|
|
break;
|
|
|
|
|
case AST_FRAME_VOICE:
|
|
|
|
|
ast_verbose("FrameType: VOICE\n");
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
ast_verbose("Codec: %s\n", ast_format_get_name(frame->subclass.format));
|
2010-09-20 22:16:37 +00:00
|
|
|
ast_verbose("MS: %ld\n", frame->len);
|
|
|
|
|
ast_verbose("Samples: %d\n", frame->samples);
|
|
|
|
|
ast_verbose("Bytes: %d\n", frame->datalen);
|
|
|
|
|
break;
|
|
|
|
|
case AST_FRAME_VIDEO:
|
|
|
|
|
ast_verbose("FrameType: VIDEO\n");
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
ast_verbose("Codec: %s\n", ast_format_get_name(frame->subclass.format));
|
2010-09-20 22:16:37 +00:00
|
|
|
ast_verbose("MS: %ld\n", frame->len);
|
|
|
|
|
ast_verbose("Samples: %d\n", frame->samples);
|
|
|
|
|
ast_verbose("Bytes: %d\n", frame->datalen);
|
|
|
|
|
break;
|
|
|
|
|
case AST_FRAME_CONTROL:
|
|
|
|
|
ast_verbose("FrameType: CONTROL\n");
|
2011-09-16 22:11:01 +00:00
|
|
|
switch ((enum ast_control_frame_type) frame->subclass.integer) {
|
2010-09-20 22:16:37 +00:00
|
|
|
case AST_CONTROL_HANGUP:
|
|
|
|
|
ast_verbose("SubClass: HANGUP\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_RING:
|
|
|
|
|
ast_verbose("SubClass: RING\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_RINGING:
|
|
|
|
|
ast_verbose("SubClass: RINGING\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_ANSWER:
|
|
|
|
|
ast_verbose("SubClass: ANSWER\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_BUSY:
|
|
|
|
|
ast_verbose("SubClass: BUSY\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_TAKEOFFHOOK:
|
|
|
|
|
ast_verbose("SubClass: TAKEOFFHOOK\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_OFFHOOK:
|
|
|
|
|
ast_verbose("SubClass: OFFHOOK\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_CONGESTION:
|
|
|
|
|
ast_verbose("SubClass: CONGESTION\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_FLASH:
|
|
|
|
|
ast_verbose("SubClass: FLASH\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_WINK:
|
|
|
|
|
ast_verbose("SubClass: WINK\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_OPTION:
|
|
|
|
|
ast_verbose("SubClass: OPTION\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_RADIO_KEY:
|
|
|
|
|
ast_verbose("SubClass: RADIO KEY\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_RADIO_UNKEY:
|
|
|
|
|
ast_verbose("SubClass: RADIO UNKEY\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_PROGRESS:
|
|
|
|
|
ast_verbose("SubClass: PROGRESS\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_PROCEEDING:
|
|
|
|
|
ast_verbose("SubClass: PROCEEDING\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_HOLD:
|
|
|
|
|
ast_verbose("SubClass: HOLD\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_UNHOLD:
|
|
|
|
|
ast_verbose("SubClass: UNHOLD\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_VIDUPDATE:
|
|
|
|
|
ast_verbose("SubClass: VIDUPDATE\n");
|
|
|
|
|
break;
|
|
|
|
|
case _XXX_AST_CONTROL_T38:
|
|
|
|
|
ast_verbose("SubClass: XXX T38\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_SRCUPDATE:
|
|
|
|
|
ast_verbose("SubClass: SRCUPDATE\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_TRANSFER:
|
|
|
|
|
ast_verbose("SubClass: TRANSFER\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_CONNECTED_LINE:
|
|
|
|
|
ast_verbose("SubClass: CONNECTED LINE\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_REDIRECTING:
|
|
|
|
|
ast_verbose("SubClass: REDIRECTING\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_T38_PARAMETERS:
|
|
|
|
|
ast_verbose("SubClass: T38 PARAMETERS\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_CC:
|
|
|
|
|
ast_verbose("SubClass: CC\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_SRCCHANGE:
|
|
|
|
|
ast_verbose("SubClass: SRCCHANGE\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_READ_ACTION:
|
|
|
|
|
ast_verbose("SubClass: READ ACTION\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_AOC:
|
|
|
|
|
ast_verbose("SubClass: AOC\n");
|
|
|
|
|
break;
|
2011-02-07 23:33:44 +00:00
|
|
|
case AST_CONTROL_MCID:
|
|
|
|
|
ast_verbose("SubClass: MCID\n");
|
|
|
|
|
break;
|
2011-09-09 16:28:23 +00:00
|
|
|
case AST_CONTROL_INCOMPLETE:
|
|
|
|
|
ast_verbose("SubClass: INCOMPLETE\n");
|
|
|
|
|
break;
|
2011-09-16 22:12:24 +00:00
|
|
|
case AST_CONTROL_END_OF_Q:
|
2011-09-16 22:11:01 +00:00
|
|
|
ast_verbose("SubClass: END_OF_Q\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_UPDATE_RTP_PEER:
|
|
|
|
|
ast_verbose("SubClass: UPDATE_RTP_PEER\n");
|
|
|
|
|
break;
|
2012-05-14 19:44:27 +00:00
|
|
|
case AST_CONTROL_PVT_CAUSE_CODE:
|
|
|
|
|
ast_verbose("SubClass: PVT_CAUSE_CODE\n");
|
|
|
|
|
break;
|
2014-10-03 17:47:42 +00:00
|
|
|
case AST_CONTROL_MASQUERADE_NOTIFY:
|
2022-09-08 14:12:34 +00:00
|
|
|
ast_verbose("SubClass: MASQUERADE_NOTIFY\n");
|
2014-10-03 17:47:42 +00:00
|
|
|
break;
|
2017-03-07 11:22:18 +00:00
|
|
|
case AST_CONTROL_STREAM_TOPOLOGY_REQUEST_CHANGE:
|
|
|
|
|
ast_verbose("SubClass: STREAM_TOPOLOGY_REQUEST_CHANGE\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_STREAM_TOPOLOGY_CHANGED:
|
|
|
|
|
ast_verbose("SubClass: STREAM_TOPOLOGY_CHANGED\n");
|
|
|
|
|
break;
|
2017-09-16 14:19:59 +00:00
|
|
|
case AST_CONTROL_STREAM_TOPOLOGY_SOURCE_CHANGED:
|
|
|
|
|
ast_verbose("SubClass: STREAM_TOPOLOGY_SOURCE_CHANGED\n");
|
|
|
|
|
break;
|
2013-01-22 15:16:20 +00:00
|
|
|
case AST_CONTROL_STREAM_STOP:
|
|
|
|
|
ast_verbose("SubClass: STREAM_STOP\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_STREAM_SUSPEND:
|
|
|
|
|
ast_verbose("SubClass: STREAM_SUSPEND\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_STREAM_RESTART:
|
|
|
|
|
ast_verbose("SubClass: STREAM_RESTART\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_STREAM_REVERSE:
|
|
|
|
|
ast_verbose("SubClass: STREAM_REVERSE\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_STREAM_FORWARD:
|
|
|
|
|
ast_verbose("SubClass: STREAM_FORWARD\n");
|
|
|
|
|
break;
|
2013-08-06 14:44:45 +00:00
|
|
|
case AST_CONTROL_RECORD_CANCEL:
|
|
|
|
|
ast_verbose("SubClass: RECORD_CANCEL\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_RECORD_STOP:
|
|
|
|
|
ast_verbose("SubClass: RECORD_STOP\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_RECORD_SUSPEND:
|
|
|
|
|
ast_verbose("SubClass: RECORD_SUSPEND\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_CONTROL_RECORD_MUTE:
|
|
|
|
|
ast_verbose("SubClass: RECORD_MUTE\n");
|
|
|
|
|
break;
|
2010-09-20 22:16:37 +00:00
|
|
|
}
|
2013-01-22 15:16:20 +00:00
|
|
|
|
2010-09-20 22:16:37 +00:00
|
|
|
if (frame->subclass.integer == -1) {
|
|
|
|
|
ast_verbose("SubClass: %d\n", frame->subclass.integer);
|
|
|
|
|
}
|
|
|
|
|
ast_verbose("Bytes: %d\n", frame->datalen);
|
|
|
|
|
break;
|
2016-11-29 15:31:21 +00:00
|
|
|
case AST_FRAME_RTCP:
|
|
|
|
|
ast_verbose("FrameType: RTCP\n");
|
|
|
|
|
break;
|
2010-09-20 22:16:37 +00:00
|
|
|
case AST_FRAME_NULL:
|
|
|
|
|
ast_verbose("FrameType: NULL\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_FRAME_IAX:
|
|
|
|
|
ast_verbose("FrameType: IAX\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_FRAME_TEXT:
|
|
|
|
|
ast_verbose("FrameType: TXT\n");
|
2022-12-13 20:35:19 +00:00
|
|
|
ast_verbose("Text: %.*s\n", frame->datalen, (char*) frame->data.ptr);
|
2010-09-20 22:16:37 +00:00
|
|
|
break;
|
bridge_softmix: Forward TEXT frames
Core bridging and, more specifically, bridge_softmix have been
enhanced to relay received frames of type TEXT or TEXT_DATA to all
participants in a softmix bridge. res_pjsip_messaging and
chan_pjsip have been enhanced to take advantage of this so when
res_pjsip_messaging receives an in-dialog MESSAGE message from a
user in a conference call, it's relayed to all other participants
in the call.
res_pjsip_messaging already queues TEXT frames to the channel when
it receives an in-dialog MESSAGE from an endpoint and chan_pjsip
will send an MESSAGE when it gets a TEXT frame. On a normal
point-to-point call, the frames are forwarded between the two
correctly. bridge_softmix was not though so messages weren't
getting forwarded to conference bridge participants. Even if they
were, the bridging code had no way to tell the participants who
sent the message so it would look like it came from the bridge
itself.
* The TEXT frame type doesn't allow storage of any meta data, such
as sender, on the frame so a new TEXT_DATA frame type was added that
uses the new ast_msg_data structure as its payload. A channel
driver can queue a frame of that type when it receives a message
from outside. A channel driver can use it for sending messages
by implementing the new send_text_data channel tech callback and
setting the new AST_CHAN_TP_SEND_TEXT_DATA flag in its tech
properties. If set, the bridging/channel core will use it instead
of the original send_text callback and it will get the ast_msg_data
structure. Channel drivers aren't required to implement this. Even
if a TEXT_DATA enabled driver uses it for incoming messages, an
outgoing channel driver that doesn't will still have it's send_text
callback called with only the message text just as before.
* res_pjsip_messaging now creates a TEXT_DATA frame for incoming
in-dialog messages and sets the "from" to the display name in the
"From" header, or if that's empty, the caller id name from the
channel. This allows the chat client user to set a friendly name
for the chat.
* bridge_softmix now forwards TEXT and TEXT_DATA frames to all
participants (except the sender).
* A new function "ast_sendtext_data" was added to channel which
takes an ast_msg_data structure and calls a channel's
send_text_data callback, or if that's not defined, the original
send_text callback.
* bridge_channel now calls ast_sendtext_data for TEXT_DATA frame
types and ast_sendtext for TEXT frame types.
* chan_pjsip now uses the "from" name in the ast_msg_data structure
(if it exists) to set the "From" header display name on outgoing text
messages.
Change-Id: Idacf5900bfd5f22ab8cd235aa56dfad090d18489
2017-09-27 16:44:53 +00:00
|
|
|
case AST_FRAME_TEXT_DATA:
|
|
|
|
|
ast_verbose("FrameType: TXT_DATA\n");
|
|
|
|
|
break;
|
2010-09-20 22:16:37 +00:00
|
|
|
case AST_FRAME_IMAGE:
|
|
|
|
|
ast_verbose("FrameType: IMAGE\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_FRAME_HTML:
|
|
|
|
|
ast_verbose("FrameType: HTML\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_FRAME_CNG:
|
|
|
|
|
ast_verbose("FrameType: CNG\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_FRAME_MODEM:
|
|
|
|
|
ast_verbose("FrameType: MODEM\n");
|
|
|
|
|
break;
|
|
|
|
|
case AST_FRAME_DTMF_BEGIN:
|
|
|
|
|
ast_verbose("FrameType: DTMF BEGIN\n");
|
2014-05-09 22:49:26 +00:00
|
|
|
ast_verbose("Digit: 0x%02X '%c'\n", (unsigned)frame->subclass.integer,
|
2013-01-31 18:15:49 +00:00
|
|
|
frame->subclass.integer < ' ' ? ' ' : frame->subclass.integer);
|
2010-09-20 22:16:37 +00:00
|
|
|
break;
|
2013-05-21 18:00:22 +00:00
|
|
|
case AST_FRAME_BRIDGE_ACTION:
|
|
|
|
|
ast_verbose("FrameType: Bridge\n");
|
|
|
|
|
ast_verbose("SubClass: %d\n", frame->subclass.integer);
|
|
|
|
|
break;
|
2014-03-17 17:22:12 +00:00
|
|
|
case AST_FRAME_BRIDGE_ACTION_SYNC:
|
|
|
|
|
ast_verbose("Frametype: Synchronous Bridge\n");
|
|
|
|
|
ast_verbose("Subclass: %d\n", frame->subclass.integer);
|
|
|
|
|
break;
|
2010-09-20 22:16:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ast_verbose("Src: %s\n", ast_strlen_zero(frame->src) ? "NOT PRESENT" : frame->src);
|
|
|
|
|
ast_verbose("\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct ast_custom_function frame_trace_function = {
|
|
|
|
|
.name = "FRAME_TRACE",
|
|
|
|
|
.write = frame_trace_helper,
|
|
|
|
|
};
|
|
|
|
|
|
2024-01-12 16:33:00 +00:00
|
|
|
static char *handle_dump_frames(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
|
|
|
|
{
|
|
|
|
|
struct ast_channel *chan;
|
|
|
|
|
struct ast_frame *f;
|
|
|
|
|
int c = 1;
|
|
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
|
case CLI_INIT:
|
|
|
|
|
e->command = "channel dump frames";
|
|
|
|
|
e->usage =
|
|
|
|
|
"Usage: channel dump frames <channel>\n"
|
|
|
|
|
" List all frames queued to a channel.\n";
|
|
|
|
|
return NULL;
|
|
|
|
|
case CLI_GENERATE:
|
|
|
|
|
return ast_complete_channels(a->line, a->word, a->pos, a->n, 3);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (a->argc != 4) {
|
|
|
|
|
return CLI_SHOWUSAGE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
chan = ast_channel_get_by_name(a->argv[3]);
|
|
|
|
|
if (!chan) {
|
|
|
|
|
ast_cli(a->fd, "%s is not a known channel\n", a->argv[3]);
|
|
|
|
|
return CLI_SUCCESS;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ast_channel_lock(chan);
|
|
|
|
|
|
|
|
|
|
ast_cli(a->fd, "== Frame list for %s ==\n", ast_channel_name(chan));
|
|
|
|
|
ast_cli(a->fd, "%5s %6s %6s %-15s (%-20s) - %s\n", "#", "Seqno", "Stream", "Frame Type", "Frame Subclass", "Src");
|
|
|
|
|
AST_LIST_TRAVERSE(ast_channel_readq(chan), f, frame_list) {
|
|
|
|
|
char type[64];
|
|
|
|
|
char subclass[64];
|
|
|
|
|
ast_frame_type2str(f->frametype, type, sizeof(type));
|
|
|
|
|
ast_frame_subclass2str(f, subclass, sizeof(subclass), NULL, 0);
|
|
|
|
|
ast_cli(a->fd, "%5d %6d %6d %-15s (%-20s) - %s\n", c++, f->seqno, f->stream_num, type, subclass, S_OR(f->src, ""));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ast_channel_unlock(chan);
|
|
|
|
|
ast_channel_unref(chan);
|
|
|
|
|
return CLI_SUCCESS;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct ast_cli_entry cli_frames[] = {
|
|
|
|
|
AST_CLI_DEFINE(handle_dump_frames, "Display frames queued on a specific channel")
|
|
|
|
|
};
|
|
|
|
|
|
2010-09-20 22:16:37 +00:00
|
|
|
static int unload_module(void)
|
|
|
|
|
{
|
2024-01-12 16:33:00 +00:00
|
|
|
ast_cli_unregister_multiple(cli_frames, ARRAY_LEN(cli_frames));
|
2010-09-20 22:16:37 +00:00
|
|
|
return ast_custom_function_unregister(&frame_trace_function);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int load_module(void)
|
|
|
|
|
{
|
|
|
|
|
int res = ast_custom_function_register(&frame_trace_function);
|
2024-01-12 16:33:00 +00:00
|
|
|
res |= ast_cli_register_multiple(cli_frames, ARRAY_LEN(cli_frames));
|
2010-09-20 22:16:37 +00:00
|
|
|
return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-25 16:47:17 +00:00
|
|
|
AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Frame Trace for internal ast_frame debugging.");
|
