[asterisk-commits] rmudgett: branch 12 r398303 - in /branches/12: ./ channels/iax2/parser.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Sep  4 18:06:01 2013
New Revision: 398303

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

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

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/channels/iax2/parser.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/iax2/parser.c?view=diff&rev=398303&r1=398302&r2=398303
==============================================================================
--- branches/12/channels/iax2/parser.c (original)
+++ branches/12/channels/iax2/parser.c Wed Sep  4 18:06:01 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    ",