Merged revisions 194557,194685 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r194557 | dvossel | 2009-05-14 17:59:43 -0500 (Thu, 14 May 2009) | 10 lines
  
  IAX2 "Ghost" Channels
  
  There is a bug tracker issue where people are reporting "Ghost" channels in their 'iax2 show channels' output.  The confusion is caused by channels being listed as "(NONE)" with format "unknown".  These are not channels of coarse.  They are usually just pending registration or poke requests, but it is confusing output.  To help make sense of this I have added two columns to 'iax2 show channels'.  One shows the first message which started the transaction, and the second shows the last message sent by either side of the call.  This helps diagnose why the entry exists and why it may not go away.
  
  (closes issue #14207)
  Reported by: clive18
  
  Review: https://reviewboard.asterisk.org/r/246/
........
  r194685 | dvossel | 2009-05-15 10:40:37 -0500 (Fri, 15 May 2009) | 6 lines
  
  Update to previous IAX2 "Ghost" Channels patch.
  
  Fixed some comments made on reviewboard for the previous patch.
  
  (issue #14207)
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@194833 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 130 insertions, 46 deletions

diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c
index 55c1630e7..950fc78dd 100644
--- a/channels/iax2-parser.c
+++ b/channels/iax2-parser.c
@@ -408,6 +408,135 @@ static void dump_ies(unsigned char *iedata, int len)
 	outputf("\n");
 }
 
+void iax_frame_subclass2str(enum iax_frame_subclass subclass, char *str, size_t len)
+{
+	const char *cmd = "Unknown";
+
+	/* if an error occurs here during compile, that means a new iax frame subclass
+	 * has been added to the iax_frame_subclass enum.  Add the new subclass to the
+	 * switch case and make sure to update it with a new string representation. */
+	switch (subclass) {
+	case IAX_COMMAND_NEW:
+		cmd = "NEW    ";
+		break;
+	case IAX_COMMAND_PING:
+		cmd = "PING   ";
+		break;
+	case IAX_COMMAND_PONG:
+		cmd = "PONG   ";
+		break;
+	case IAX_COMMAND_ACK:
+		cmd = "ACK    ";
+		break;
+	case IAX_COMMAND_HANGUP:
+		cmd = "HANGUP ";
+		break;
+	case IAX_COMMAND_REJECT:
+		cmd = "REJECT ";
+		break;
+	case IAX_COMMAND_ACCEPT:
+		cmd = "ACCEPT ";
+		break;
+	case IAX_COMMAND_AUTHREQ:
+		cmd = "AUTHREQ";
+		break;
+	case IAX_COMMAND_AUTHREP:
+		cmd = "AUTHREP";
+		break;
+	case IAX_COMMAND_INVAL:
+		cmd = "INVAL  ";
+		break;
+	case IAX_COMMAND_LAGRQ:
+		cmd = "LAGRQ  ";
+		break;
+	case IAX_COMMAND_LAGRP:
+		cmd = "LAGRP  ";
+		break;
+	case IAX_COMMAND_REGREQ:
+		cmd = "REGREQ ";
+		break;
+	case IAX_COMMAND_REGAUTH:
+		cmd = "REGAUTH";
+		break;
+	case IAX_COMMAND_REGACK:
+		cmd = "REGACK ";
+		break;
+	case IAX_COMMAND_REGREJ:
+		cmd = "REGREJ ";
+		break;
+	case IAX_COMMAND_REGREL:
+		cmd = "REGREL ";
+		break;
+	case IAX_COMMAND_VNAK:
+		cmd = "VNAK   ";
+		break;
+	case IAX_COMMAND_DPREQ:
+		cmd = "DPREQ  ";
+		break;
+	case IAX_COMMAND_DPREP:
+		cmd = "DPREP  ";
+		break;
+	case IAX_COMMAND_DIAL:
+		cmd = "DIAL   ";
+		break;
+	case IAX_COMMAND_TXREQ:
+		cmd = "TXREQ  ";
+		break;
+	case IAX_COMMAND_TXCNT:
+		cmd = "TXCNT  ";
+		break;
+	case IAX_COMMAND_TXACC:
+		cmd = "TXACC  ";
+		break;
+	case IAX_COMMAND_TXREADY:
+		cmd = "TXREADY";
+		break;
+	case IAX_COMMAND_TXREL:
+		cmd = "TXREL  ";
+		break;
+	case IAX_COMMAND_TXREJ:
+		cmd = "TXREJ  ";
+		break;
+	case IAX_COMMAND_QUELCH:
+		cmd = "QUELCH ";
+		break;
+	case IAX_COMMAND_UNQUELCH:
+		cmd = "UNQULCH";
+		break;
+	case IAX_COMMAND_POKE:
+		cmd = "POKE   ";
+		break;
+	case IAX_COMMAND_PAGE:
+		cmd = "PAGE   ";
+		break;
+	case IAX_COMMAND_MWI:
+		cmd = "MWI    ";
+		break;
+	case IAX_COMMAND_UNSUPPORT:
+		cmd = "UNSPRTD";
+		break;
+	case IAX_COMMAND_TRANSFER:
+		cmd = "TRANSFR";
+		break;
+	case IAX_COMMAND_PROVISION:
+		cmd = "PROVISN";
+		break;
+	case IAX_COMMAND_FWDOWNL:
+		cmd = "FWDWNLD";
+		break;
+	case IAX_COMMAND_FWDATA:
+		cmd = "FWDATA ";
+		break;
+	case IAX_COMMAND_TXMEDIA:
+		cmd = "TXMEDIA";
+		break;
+	case IAX_COMMAND_RTKEY:
+		cmd = "RTKEY  ";
+		break;
+	}
+	ast_copy_string(str, cmd, len);
+}
+
 void iax_showframe(struct iax_frame *f, struct ast_iax2_full_hdr *fhi, int rx, struct sockaddr_in *sin, int datalen)
 {
 	const char *framelist[] = {
@@ -425,47 +554,6 @@ void iax_showframe(struct iax_frame *f, struct ast_iax2_full_hdr *fhi, int rx, s
 		"MODEM  ",
 		"DTMF_B ",
 	};
-	const char *iaxs[] = {
-		"(0?)",
-		"NEW    ",
-		"PING   ",
-		"PONG   ",
-		"ACK    ",
-		"HANGUP ",
-		"REJECT ",
-		"ACCEPT ",
-		"AUTHREQ",
-		"AUTHREP",
-		"INVAL  ",
-		"LAGRQ  ",
-		"LAGRP  ",
-		"REGREQ ",
-		"REGAUTH",
-		"REGACK ",
-		"REGREJ ",
-		"REGREL ",
-		"VNAK   ",
-		"DPREQ  ",
-		"DPREP  ",
-		"DIAL   ",
-		"TXREQ  ",
-		"TXCNT  ",
-		"TXACC  ",
-		"TXREADY",
-		"TXREL  ",
-		"TXREJ  ",
-		"QUELCH ",
-		"UNQULCH",
-		"POKE   ",
-		"PAGE   ",
-		"MWI    ",
-		"UNSPRTD",
-		"TRANSFR",
-		"PROVISN",
-		"FWDWNLD",
-		"FWDATA ",
-		"TXMEDIA"
-	};
 	const char *cmds[] = {
 		"(0?)",
 		"HANGUP ",
@@ -533,12 +621,8 @@ void iax_showframe(struct iax_frame *f, struct ast_iax2_full_hdr *fhi, int rx, s
 		sprintf(subclass2, "%c", fh->csub);
 		subclass = subclass2;
 	} else if (fh->type == AST_FRAME_IAX) {
-		if (fh->csub >= ARRAY_LEN(iaxs)) {
-			snprintf(subclass2, sizeof(subclass2), "(%d?)", fh->csub);
+			iax_frame_subclass2str((int)fh->csub, subclass2, sizeof(subclass2));
 			subclass = subclass2;
-		} else {
-			subclass = iaxs[(int)fh->csub];
-		}
 	} else if (fh->type == AST_FRAME_CONTROL) {
 		if (fh->csub >= ARRAY_LEN(cmds)) {
 			snprintf(subclass2, sizeof(subclass2), "(%d?)", fh->csub);