[asterisk-commits] ast format cap get names: To display all formats, the buffer... (asterisk[13])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Nov 10 14:58:25 CST 2015
Joshua Colp has submitted this change and it was merged.
Change subject: ast_format_cap_get_names: To display all formats, the buffer was increased.
......................................................................
ast_format_cap_get_names: To display all formats, the buffer was increased.
ASTERISK-25533 #close
Change-Id: Ie1a9d1a6511b3f1a56b93d04475fbf8a4e40010a
---
M addons/chan_mobile.c
M addons/chan_ooh323.c
M apps/app_dumpchan.c
M bridges/bridge_native_rtp.c
M channels/chan_alsa.c
M channels/chan_console.c
M channels/chan_iax2.c
M channels/chan_mgcp.c
M channels/chan_motif.c
M channels/chan_nbs.c
M channels/chan_oss.c
M channels/chan_phone.c
M channels/chan_pjsip.c
M channels/chan_sip.c
M channels/chan_skinny.c
M channels/chan_unistim.c
M channels/chan_vpb.cc
M funcs/func_channel.c
M include/asterisk/format_cap.h
M main/channel.c
M main/cli.c
M main/file.c
M main/manager.c
M main/sorcery.c
M res/res_pjsip_sdp_rtp.c
M tests/test_config.c
M tests/test_format_cap.c
27 files changed, 101 insertions(+), 96 deletions(-)
Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
Anonymous Coward #1000019: Verified
Joshua Colp: Looks good to me, approved
Corey Farrell: Looks good to me, but someone else must approve
diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c
index 3304702..f748f79 100644
--- a/addons/chan_mobile.c
+++ b/addons/chan_mobile.c
@@ -902,7 +902,7 @@
}
if (ast_format_cap_iscompatible_format(cap, DEVICE_FRAME_FORMAT) == AST_FORMAT_CMP_NOT_EQUAL) {
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_WARNING, "Asked to get a channel of unsupported format '%s'\n", ast_format_cap_get_names(cap, &codec_buf));
*cause = AST_CAUSE_FACILITY_NOT_IMPLEMENTED;
return NULL;
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index ef67b78..b530697 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -576,7 +576,7 @@
const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *data, int *cause)
{
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
struct ast_channel *chan = NULL;
struct ooh323_pvt *p = NULL;
struct ooh323_peer *peer = NULL;
@@ -1192,7 +1192,7 @@
if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), f->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
if (ast_format_cap_count(ast_channel_nativeformats(ast))) {
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_WARNING,
"Asked to transmit frame type %s, while native formats is %s (read/write = %s/%s)\n",
ast_format_get_name(f->subclass.format),
@@ -1545,7 +1545,7 @@
return;
}
if (gH323Debug) {
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_verb(0, "Writeformat before update %s/%s\n",
ast_format_get_name(ast_channel_writeformat(p->owner)),
ast_format_cap_get_names(ast_channel_nativeformats(p->owner), &codec_buf));
@@ -2114,7 +2114,7 @@
}
if (gH323Debug) {
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_verb(0, " Outgoing call %s(%s) - Codec prefs - %s\n",
p->username?p->username:"NULL", call->callToken,
@@ -3231,7 +3231,7 @@
static char *handle_cli_ooh323_show_peers(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
struct ooh323_peer *prev = NULL, *peer = NULL;
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
char ip_port[30];
#define FORMAT "%-15.15s %-15.15s %-23.23s %-s\n"
@@ -3370,7 +3370,7 @@
static char *handle_cli_ooh323_show_users(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
struct ooh323_user *prev = NULL, *user = NULL;
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
#define FORMAT1 "%-15.15s %-15.15s %-15.15s %-s\n"
switch (cmd) {
@@ -3504,7 +3504,7 @@
static char *handle_cli_ooh323_show_config(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
char value[FORMAT_STRING_SIZE];
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ooAliases *pAlias = NULL, *pAliasNext = NULL;;
switch (cmd) {
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index 1794c25..1a5a446 100644
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -72,7 +72,7 @@
{
long elapsed_seconds = 0;
int hour = 0, min = 0, sec = 0;
- struct ast_str *format_buf = ast_str_alloca(64);
+ struct ast_str *format_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
char cgrp[256];
char pgrp[256];
struct ast_str *write_transpath = ast_str_alloca(256);
diff --git a/bridges/bridge_native_rtp.c b/bridges/bridge_native_rtp.c
index c226dbd..7eacc9d 100644
--- a/bridges/bridge_native_rtp.c
+++ b/bridges/bridge_native_rtp.c
@@ -387,8 +387,8 @@
glue1->get_codec(bc1->chan, cap1);
}
if (ast_format_cap_count(cap0) != 0 && ast_format_cap_count(cap1) != 0 && !ast_format_cap_iscompatible(cap0, cap1)) {
- struct ast_str *codec_buf0 = ast_str_alloca(64);
- struct ast_str *codec_buf1 = ast_str_alloca(64);
+ struct ast_str *codec_buf0 = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *codec_buf1 = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_debug(1, "Channel codec0 = %s is not codec1 = %s, cannot native bridge in RTP.\n",
ast_format_cap_get_names(cap0, &codec_buf0), ast_format_cap_get_names(cap1, &codec_buf1));
return 0;
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 74a6139..6508a1e 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -620,7 +620,7 @@
struct ast_channel *tmp = NULL;
if (ast_format_cap_iscompatible_format(cap, ast_format_slin) == AST_FORMAT_CMP_NOT_EQUAL) {
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_NOTICE, "Asked to get a channel of format '%s'\n", ast_format_cap_get_names(cap, &codec_buf));
return NULL;
}
diff --git a/channels/chan_console.c b/channels/chan_console.c
index 74f2922..02d6887 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -479,7 +479,7 @@
}
if (!(ast_format_cap_iscompatible(cap, console_tech.capabilities))) {
- struct ast_str *cap_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_NOTICE, "Channel requested with unsupported format(s): '%s'\n",
ast_format_cap_get_names(cap, &cap_buf));
goto return_unref;
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index efe1bd3..5af0bfe 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3816,7 +3816,7 @@
char status[30];
char cbuf[256];
struct iax2_peer *peer;
- struct ast_str *codec_buf = ast_str_alloca(256);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
struct ast_str *encmethods = ast_str_alloca(256);
int load_realtime = 0;
@@ -5589,8 +5589,8 @@
return AST_BRIDGE_FAILED_NOWARN;
}
if (!(ast_format_cap_identical(ast_channel_nativeformats(c0), ast_channel_nativeformats(c1)))) {
- struct ast_str *c0_buf = ast_str_alloca(64);
- struct ast_str *c1_buf = ast_str_alloca(64);
+ struct ast_str *c0_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *c1_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_verb(3, "Operating with different codecs [%s] [%s] , can't native bridge...\n",
ast_format_cap_get_names(ast_channel_nativeformats(c0), &c0_buf),
@@ -10815,9 +10815,9 @@
break;
}
if (authdebug) {
- struct ast_str *peer_buf = ast_str_alloca(64);
- struct ast_str *cap_buf = ast_str_alloca(64);
- struct ast_str *peer_form_buf = ast_str_alloca(64);
+ struct ast_str *peer_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *peer_form_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
if (ast_test_flag64(iaxs[fr->callno], IAX_CODEC_NOCAP)) {
ast_log(LOG_NOTICE, "Rejected connect attempt from %s, requested '%s' incompatible with our capability '%s'.\n",
@@ -10862,9 +10862,9 @@
}
if (!format) {
- struct ast_str *peer_buf = ast_str_alloca(64);
- struct ast_str *cap_buf = ast_str_alloca(64);
- struct ast_str *peer_form_buf = ast_str_alloca(64);
+ struct ast_str *peer_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *peer_form_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
memset(&ied0, 0, sizeof(ied0));
iax_ie_append_str(&ied0, IAX_IE_CAUSE, "Unable to negotiate codec");
@@ -11042,8 +11042,8 @@
break;
}
if (authdebug) {
- struct ast_str *peer_buf = ast_str_alloca(64);
- struct ast_str *cap_buf = ast_str_alloca(64);
+ struct ast_str *peer_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_NOTICE, "Rejected call to %s, format %s incompatible with our capability %s.\n",
ast_sockaddr_stringify(&addr),
@@ -11056,7 +11056,7 @@
ast_set_flag(&iaxs[fr->callno]->state, IAX_STATE_STARTED);
iax2_lock_owner(fr->callno);
if (iaxs[fr->callno] && iaxs[fr->callno]->owner && native) {
- struct ast_str *cap_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
/* Switch us to use a compatible format */
iax2_codec_pref_best_bitfield2cap(
@@ -11260,9 +11260,9 @@
iax2_codec_pref_string(&iaxs[fr->callno]->prefs, host_pref_buf, sizeof(host_pref_buf) - 1);
}
if (!format) {
- struct ast_str *cap_buf = ast_str_alloca(64);
- struct ast_str *peer_buf = ast_str_alloca(64);
- struct ast_str *peer_form_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *peer_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *peer_form_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
if(!ast_test_flag64(iaxs[fr->callno], IAX_CODEC_NOCAP)) {
ast_debug(1, "We don't do requested format %s, falling back to peer capability '%s'\n",
@@ -11323,9 +11323,9 @@
}
}
if (!format) {
- struct ast_str *cap_buf = ast_str_alloca(64);
- struct ast_str *peer_buf = ast_str_alloca(64);
- struct ast_str *peer_form_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *peer_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *peer_form_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_ERROR, "No best format in %s???\n",
iax2_getformatname_multiple(iaxs[fr->callno]->peercapability & iaxs[fr->callno]->capability, &cap_buf));
@@ -11449,7 +11449,7 @@
break;
}
} else {
- struct ast_str *cap_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_set_flag(&iaxs[fr->callno]->state, IAX_STATE_STARTED);
ast_verb(3, "Accepting DIAL from %s, formats = %s\n",
ast_sockaddr_stringify(&addr),
@@ -12530,8 +12530,8 @@
res = ast_translator_best_choice(cap, ast_channel_nativeformats(c), &best_fmt_cap, &best_fmt_native);
if (res < 0) {
- struct ast_str *native_cap_buf = ast_str_alloca(256);
- struct ast_str *cap_buf = ast_str_alloca(256);
+ struct ast_str *native_cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_WARNING, "Unable to create translator path for %s to %s on %s\n",
ast_format_cap_get_names(ast_channel_nativeformats(c), &native_cap_buf),
@@ -14384,7 +14384,7 @@
} else if (!strcasecmp(colname, "callerid_num")) {
ast_copy_string(buf, peer->cid_num, len);
} else if (!strcasecmp(colname, "codecs")) {
- struct ast_str *codec_buf = ast_str_alloca(256);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
iax2_getformatname_multiple(peer->capability, &codec_buf);
ast_copy_string(buf, ast_str_buffer(codec_buf), len);
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 030df89..16ba7ec 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -1253,7 +1253,7 @@
}
} else {
if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), frame->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
- struct ast_str *cap_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_WARNING, "Asked to transmit frame type %s, while native formats is %s (read/write = %s/%s)\n",
ast_format_get_name(frame->subclass.format),
@@ -1986,9 +1986,9 @@
int codec, codec_count=0;
int iterator;
struct mgcp_endpoint *p = sub->parent;
- struct ast_str *global_buf = ast_str_alloca(64);
- struct ast_str *peer_buf = ast_str_alloca(64);
- struct ast_str *pvt_buf = ast_str_alloca(64);
+ struct ast_str *global_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *peer_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *pvt_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
/* Get codec and RTP info from SDP */
m = get_sdp(req, "m");
@@ -3972,7 +3972,7 @@
char tmp[256];
if (!(ast_format_cap_iscompatible(cap, global_capability))) {
- struct ast_str *cap_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%s'\n",
ast_format_cap_get_names(cap, &cap_buf));
/*return NULL;*/
diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index 48f1b1f..24575fa 100644
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -1706,7 +1706,7 @@
switch (frame->frametype) {
case AST_FRAME_VOICE:
if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), frame->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_WARNING,
"Asked to transmit frame type %s, while native formats is %s (read/write = %s/%s)\n",
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index 36c3435..2abde61 100644
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -232,7 +232,7 @@
struct ast_channel *tmp = NULL;
if (ast_format_cap_iscompatible_format(cap, ast_format_slin) == AST_FORMAT_CMP_NOT_EQUAL) {
- struct ast_str *cap_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%s'\n",
ast_format_cap_get_names(cap, &cap_buf));
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 51fce44..912a5eb 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -863,7 +863,7 @@
return NULL;
}
if (ast_format_cap_iscompatible_format(cap, ast_format_slin) == AST_FORMAT_CMP_NOT_EQUAL) {
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_NOTICE, "Format %s unsupported\n", ast_format_cap_get_names(cap, &codec_buf));
return NULL;
}
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index 2bf7bdd..451d9f2 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -1282,7 +1282,7 @@
restart_monitor();
if (tmp == NULL) {
if (!(ast_format_cap_iscompatible(cap, phone_tech.capabilities))) {
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%s'\n",
ast_format_cap_get_names(cap, &codec_buf));
return NULL;
diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c
index 6195d10..1319094 100644
--- a/channels/chan_pjsip.c
+++ b/channels/chan_pjsip.c
@@ -673,7 +673,7 @@
return 0;
}
if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), frame->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
- struct ast_str *cap_buf = ast_str_alloca(128);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
struct ast_str *write_transpath = ast_str_alloca(256);
struct ast_str *read_transpath = ast_str_alloca(256);
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index acb7d53..cda4370 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7209,7 +7209,7 @@
switch (frame->frametype) {
case AST_FRAME_VOICE:
if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), frame->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_WARNING, "Asked to transmit frame type %s, while native formats is %s read/write = %s/%s\n",
ast_format_get_name(frame->subclass.format),
ast_format_cap_get_names(ast_channel_nativeformats(ast), &codec_buf),
@@ -7846,7 +7846,7 @@
struct ast_variable *v = NULL;
struct ast_format *fmt;
struct ast_format_cap *what = NULL; /* SHALLOW COPY DO NOT DESTROY! */
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
int needvideo = 0;
int needtext = 0;
char *exten;
@@ -9921,7 +9921,7 @@
int debug = sip_debug_test_pvt(p);
/* START UNKNOWN */
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
struct ast_format *tmp_fmt;
/* END UNKNOWN */
@@ -10570,11 +10570,11 @@
if (debug) {
/* shame on whoever coded this.... */
- struct ast_str *cap_buf = ast_str_alloca(64);
- struct ast_str *peer_buf = ast_str_alloca(64);
- struct ast_str *vpeer_buf = ast_str_alloca(64);
- struct ast_str *tpeer_buf = ast_str_alloca(64);
- struct ast_str *joint_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *peer_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *vpeer_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *tpeer_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *joint_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_verbose("Capabilities: us - %s, peer - audio=%s/video=%s/text=%s, combined - %s\n",
ast_format_cap_get_names(p->caps, &cap_buf),
@@ -10781,8 +10781,8 @@
unsigned int framing;
if (debug) {
- struct ast_str *cap_buf = ast_str_alloca(64);
- struct ast_str *joint_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *joint_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_debug(1, "Setting native formats after processing SDP. peer joint formats %s, old nativeformats %s\n",
ast_format_cap_get_names(p->jointcaps, &joint_buf),
@@ -13116,7 +13116,7 @@
int min_video_packet_size = 0;
int min_text_packet_size = 0;
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
/* Set the SDP session name */
snprintf(subject, sizeof(subject), "s=%s\r\n", ast_strlen_zero(global_sdpsession) ? "-" : global_sdpsession);
@@ -20298,7 +20298,7 @@
char status[30] = "";
char cbuf[256];
struct sip_peer *peer;
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
struct ast_variable *v;
int x = 0, load_realtime;
int realtimepeers;
@@ -20944,7 +20944,7 @@
{
int realtimepeers;
int realtimeregs;
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
const char *msg; /* temporary msg pointer */
struct sip_auth_container *credentials;
@@ -21261,7 +21261,7 @@
if (cur->subscribed == NONE && !arg->subscriptions) {
/* set if SIP transfer in progress */
const char *referstatus = cur->refer ? referstatus2str(cur->refer->status) : "";
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_cli(arg->fd, FORMAT, ast_sockaddr_stringify_addr(dst),
S_OR(cur->username, S_OR(cur->cid_num, "(None)")),
@@ -21507,7 +21507,7 @@
if (!strncasecmp(cur->callid, a->argv[3], len)) {
struct ast_str *strbuf;
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_cli(a->fd, "\n");
if (cur->subscribed != NONE) {
@@ -22466,7 +22466,7 @@
} else if (!strcasecmp(colname, "callerid_num")) {
ast_copy_string(buf, peer->cid_num, len);
} else if (!strcasecmp(colname, "codecs")) {
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_format_cap_get_names(peer->caps, &codec_buf);
ast_copy_string(buf, ast_str_buffer(codec_buf), len);
} else if (!strcasecmp(colname, "encryption")) {
@@ -29609,8 +29609,8 @@
struct ast_channel *tmpc = NULL;
char *ext = NULL, *host;
char tmp[256];
- struct ast_str *codec_buf = ast_str_alloca(64);
- struct ast_str *cap_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
char *dnid;
char *secret = NULL;
char *md5secret = NULL;
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 23a4835..b6d269d 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -4176,7 +4176,7 @@
struct skinny_speeddial *sd;
struct skinny_addon *sa;
struct skinny_serviceurl *surl;
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
if (argc < 4) {
return CLI_SHOWUSAGE;
@@ -4425,7 +4425,7 @@
struct skinny_device *d;
struct skinny_line *l;
struct skinny_subline *subline;
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
char group_buf[256];
char cbuf[256];
@@ -5075,7 +5075,7 @@
}
} else {
if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), frame->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_WARNING, "Asked to transmit frame type %s, while native formats is %s (read/write = %s/%s)\n",
ast_format_get_name(frame->subclass.format),
ast_format_cap_get_names(ast_channel_nativeformats(ast), &codec_buf),
@@ -5351,7 +5351,7 @@
struct ast_format *tmpfmt;
struct ast_format_cap *caps;
#ifdef AST_DEVMODE
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
#endif
if (!l->device || !l->device->session) {
@@ -6638,7 +6638,7 @@
struct ast_format_cap *codecs = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
int i;
#ifdef AST_DEVMODE
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
#endif
@@ -7681,7 +7681,7 @@
char tmp[256];
if (!(ast_format_cap_has_type(cap, AST_MEDIA_TYPE_AUDIO))) {
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%s'\n", ast_format_cap_get_names(cap, &codec_buf));
return NULL;
}
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index f429617..db4720d 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -2889,7 +2889,7 @@
ast_rtp_instance_set_remote_address(sub->rtp, &sin_tmp);
if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(sub->owner), ast_channel_readformat(sub->owner)) == AST_FORMAT_CMP_NOT_EQUAL) {
struct ast_format *tmpfmt;
- struct ast_str *cap_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
tmpfmt = ast_format_cap_get_format(ast_channel_nativeformats(sub->owner), 0);
ast_log(LOG_WARNING,
@@ -5142,7 +5142,7 @@
/* We already hold the channel lock */
if (f->frametype == AST_FRAME_VOICE) {
if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(sub->owner), f->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
- struct ast_str *cap_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
struct ast_format_cap *caps;
ast_debug(1,
@@ -5192,7 +5192,7 @@
}
} else {
if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), frame->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
- struct ast_str *cap_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_WARNING,
"Asked to transmit frame type %s, while native formats is %s (read/write = (%s/%s)\n",
@@ -5723,9 +5723,9 @@
tmpfmt = ast_format_cap_get_format(ast_channel_nativeformats(tmp), 0);
if (unistimdebug) {
- struct ast_str *native_buf = ast_str_alloca(64);
- struct ast_str *cap_buf = ast_str_alloca(64);
- struct ast_str *global_buf = ast_str_alloca(64);
+ struct ast_str *native_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *global_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_verb(0, "Best codec = %s from nativeformats %s (line cap=%s global=%s)\n",
ast_format_get_name(tmpfmt),
@@ -5938,8 +5938,8 @@
char tmp[256];
if (!(ast_format_cap_iscompatible(cap, global_cap))) {
- struct ast_str *cap_buf = ast_str_alloca(64);
- struct ast_str *global_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *global_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_NOTICE,
"Asked to get a channel of unsupported format %s while capability is %s\n",
ast_format_cap_get_names(cap, &cap_buf),
@@ -6014,7 +6014,7 @@
struct unistim_line *line;
struct unistim_subchannel *sub;
struct unistimsession *s;
- struct ast_str *cap_buf = ast_str_alloca(64);
+ struct ast_str *cap_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
switch (cmd) {
case CLI_INIT:
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index f1ed392..0f050a8 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -2508,7 +2508,7 @@
if (!(ast_format_cap_iscompatible_format(cap, ast_format_slin))) {
struct ast_str *buf;
- buf = ast_str_create(256);
+ buf = ast_str_create(AST_FORMAT_CAP_NAMES_LEN);
if (!buf) {
return NULL;
}
diff --git a/funcs/func_channel.c b/funcs/func_channel.c
index 7f87f45..0f59bb5 100644
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -443,7 +443,7 @@
if (!strcasecmp(data, "audionativeformat")) {
tmpcap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
if (tmpcap) {
- struct ast_str *codec_buf = ast_str_alloca(128);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_channel_lock(chan);
ast_format_cap_append_from_cap(tmpcap, ast_channel_nativeformats(chan), AST_MEDIA_TYPE_AUDIO);
@@ -454,7 +454,7 @@
} else if (!strcasecmp(data, "videonativeformat")) {
tmpcap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
if (tmpcap) {
- struct ast_str *codec_buf = ast_str_alloca(128);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_channel_lock(chan);
ast_format_cap_append_from_cap(tmpcap, ast_channel_nativeformats(chan), AST_MEDIA_TYPE_VIDEO);
diff --git a/include/asterisk/format_cap.h b/include/asterisk/format_cap.h
index 94e81f8..a86fd21 100644
--- a/include/asterisk/format_cap.h
+++ b/include/asterisk/format_cap.h
@@ -321,6 +321,11 @@
*/
const char *ast_format_cap_get_names(struct ast_format_cap *cap, struct ast_str **buf);
+#ifndef AST_FORMAT_CAP_NAMES_LEN
+/*! Buffer size for callers of ast_format_cap_get_names to allocate. */
+#define AST_FORMAT_CAP_NAMES_LEN 384
+#endif
+
/*!
* \brief Determine if a format cap has no formats in it.
*
diff --git a/main/channel.c b/main/channel.c
index 9aeae5f..67f0da8 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -339,7 +339,7 @@
static char *handle_cli_core_show_channeltype(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
struct chanlist *cl = NULL;
- struct ast_str *codec_buf = ast_str_alloca(256);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
switch (cmd) {
case CLI_INIT:
@@ -5094,7 +5094,7 @@
f = fr;
} else {
if (ast_format_cmp(ast_channel_writeformat(chan), fr->subclass.format) != AST_FORMAT_CMP_EQUAL) {
- struct ast_str *codec_buf = ast_str_alloca(256);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
/*
* We are not setup to write this frame. Things may have changed
@@ -5435,8 +5435,8 @@
res = ast_translator_best_choice(cap_native, cap_set, &best_native_fmt, &best_set_fmt);
}
if (res < 0) {
- struct ast_str *codec_native = ast_str_alloca(256);
- struct ast_str *codec_set = ast_str_alloca(256);
+ struct ast_str *codec_native = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *codec_set = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_format_cap_get_names(cap_native, &codec_native);
ast_channel_unlock(chan);
@@ -5978,8 +5978,8 @@
res = ast_translator_best_choice(tmp_cap, chan->tech->capabilities, &tmp_fmt, &best_audio_fmt);
ao2_ref(tmp_cap, -1);
if (res < 0) {
- struct ast_str *tech_codecs = ast_str_alloca(64);
- struct ast_str *request_codecs = ast_str_alloca(64);
+ struct ast_str *tech_codecs = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *request_codecs = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_WARNING, "No translator path exists for channel type %s (native %s) to %s\n", type,
ast_format_cap_get_names(chan->tech->capabilities, &tech_codecs),
diff --git a/main/cli.c b/main/cli.c
index 47c48d6..0d66f3e 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -1528,7 +1528,7 @@
struct ast_var_t *var;
struct ast_str *write_transpath = ast_str_alloca(256);
struct ast_str *read_transpath = ast_str_alloca(256);
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
struct ast_bridge *bridge;
struct ast_callid *callid;
char callid_buf[32];
diff --git a/main/file.c b/main/file.c
index 64406bf..7ce0213 100644
--- a/main/file.c
+++ b/main/file.c
@@ -1096,7 +1096,7 @@
fs = ast_openstream(chan, filename, preflang);
if (!fs) {
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_log(LOG_WARNING, "Unable to open %s (format %s): %s\n",
filename, ast_format_cap_get_names(ast_channel_nativeformats(chan), &codec_buf), strerror(errno));
return -1;
diff --git a/main/manager.c b/main/manager.c
index 8295303..99c5502 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -4339,7 +4339,7 @@
struct ast_str *write_transpath = ast_str_alloca(256);
struct ast_str *read_transpath = ast_str_alloca(256);
struct ast_channel *chan;
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
int channels = 0;
int all = ast_strlen_zero(name); /* set if we want all channels */
char id_text[256];
diff --git a/main/sorcery.c b/main/sorcery.c
index 43a395a..b75eb8b 100644
--- a/main/sorcery.c
+++ b/main/sorcery.c
@@ -304,7 +304,7 @@
static int codec_handler_fn(const void *obj, const intptr_t *args, char **buf)
{
- struct ast_str *codec_buf = ast_str_alloca(64);
+ struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
struct ast_format_cap **cap = (struct ast_format_cap **)(obj + args[0]);
return !(*buf = ast_strdup(ast_format_cap_get_names(*cap, &codec_buf)));
}
diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
index df28204..14b1e4e 100644
--- a/res/res_pjsip_sdp_rtp.c
+++ b/res/res_pjsip_sdp_rtp.c
@@ -321,8 +321,8 @@
/* get the joint capabilities between peer and endpoint */
ast_format_cap_get_compatible(caps, peer, joint);
if (!ast_format_cap_count(joint)) {
- struct ast_str *usbuf = ast_str_alloca(256);
- struct ast_str *thembuf = ast_str_alloca(256);
+ struct ast_str *usbuf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *thembuf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_rtp_codecs_payloads_destroy(&codecs);
ast_log(LOG_NOTICE, "No joint capabilities for '%s' media stream between our configuration(%s) and incoming SDP(%s)\n",
diff --git a/tests/test_config.c b/tests/test_config.c
index b9935dc..3ad5772 100644
--- a/tests/test_config.c
+++ b/tests/test_config.c
@@ -1492,8 +1492,8 @@
res = AST_TEST_FAIL;
}
if (!ast_format_cap_identical(arr[x]->codeccapopt, control->codeccapopt)) {
- struct ast_str *codec_buf1 = ast_str_alloca(64);
- struct ast_str *codec_buf2 = ast_str_alloca(64);
+ struct ast_str *codec_buf1 = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+ struct ast_str *codec_buf2 = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
ast_test_status_update(test, "format did not match: '%s' vs '%s' on loop %d\n",
ast_format_cap_get_names(arr[x]->codeccapopt, &codec_buf1),
diff --git a/tests/test_format_cap.c b/tests/test_format_cap.c
index 9e8eac4..e1ae553 100644
--- a/tests/test_format_cap.c
+++ b/tests/test_format_cap.c
@@ -1079,7 +1079,7 @@
RAII_VAR(struct ast_format *, ulaw_format, NULL, ao2_cleanup);
RAII_VAR(struct ast_codec *, alaw, NULL, ao2_cleanup);
RAII_VAR(struct ast_format *, alaw_format, NULL, ao2_cleanup);
- struct ast_str *buffer = ast_str_alloca(128);
+ struct ast_str *buffer = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
switch (cmd) {
case TEST_INIT:
--
To view, visit https://gerrit.asterisk.org/1591
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1a9d1a6511b3f1a56b93d04475fbf8a4e40010a
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
More information about the asterisk-commits
mailing list