From: Richard Mudgett <rmudgett@digium.com>
Date: Wed, 4 Sep 2013 23:06:01 +0000 (+0000)
Subject: chan_iax2: Add missing control frame names to debug frame decode output.
X-Git-Tag: 12.0.0-alpha2~24^2~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4878a6eabc9c200df98714a5bb374819e7e2fd00;p=thirdparty%2Fasterisk.git

chan_iax2: Add missing control frame names to debug frame decode output.
........

Merged revisions 398301 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 398302 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@398303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/iax2/parser.c b/channels/iax2/parser.c
index 5d1a8ca614..e77a9b3cf1 100644
--- a/channels/iax2/parser.c
+++ b/channels/iax2/parser.c
@@ -239,11 +239,12 @@ static void dump_prov(char *output, int maxlen, void *value, int len)
 	dump_prov_ies(output, maxlen, value, len);
 }
 
-static struct iax2_ie {
+struct iax2_ie {
 	int ie;
 	char *name;
 	void (*dump)(char *output, int maxlen, void *value, int len);
-} infoelts[] = {
+};
+static struct iax2_ie infoelts[] = {
 	{ IAX_IE_CALLED_NUMBER, "CALLED NUMBER", dump_string },
 	{ IAX_IE_CALLING_NUMBER, "CALLING NUMBER", dump_string },
 	{ IAX_IE_CALLING_ANI, "ANI", dump_string },
@@ -392,6 +393,7 @@ static void dump_ies(unsigned char *iedata, int len)
 	int found;
 	char interp[1024];
 	char tmp[1024];
+
 	if (len < 2)
 		return;
 	while(len > 2) {
@@ -605,7 +607,7 @@ void iax_showframe(struct iax_frame *f, struct ast_iax2_full_hdr *fhi, int rx, s
 		"CNLINE ",
 		"REDIR  ",
 		"T38PARM",
-		"CONTRCC",
+		"CC ERR!",/* This must never go across an IAX link. */
 		"SRCCHG ",
 		"READACT",
 		"AOC    ",