[asterisk-commits] rmudgett: trunk r398304 - in /trunk: ./ channels/iax2/parser.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Sep  4 18:07:41 2013
New Revision: 398304

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=398304
Log:
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
........

Merged revisions 398303 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/channels/iax2/parser.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Wed Sep  4 18:07:41 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398198,398206,398215,398226,398237,398283,398286,398299
+/branches/12:1-398198,398206,398215,398226,398237,398283,398286,398299,398303

Modified: trunk/channels/iax2/parser.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/iax2/parser.c?view=diff&rev=398304&r1=398303&r2=398304
==============================================================================
--- trunk/channels/iax2/parser.c (original)
+++ trunk/channels/iax2/parser.c Wed Sep  4 18:07:41 2013
@@ -239,11 +239,12 @@
 	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 @@
 	int found;
 	char interp[1024];
 	char tmp[1024];
+
 	if (len < 2)
 		return;
 	while(len > 2) {
@@ -605,7 +607,7 @@
 		"CNLINE ",
 		"REDIR  ",
 		"T38PARM",
-		"CONTRCC",
+		"CC ERR!",/* This must never go across an IAX link. */
 		"SRCCHG ",
 		"READACT",
 		"AOC    ",