- Typo in chan_sip (: missing)

- Only print formats once in dumpchan()


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

apps/app_dumpchan.c

@@ -87,9 +87,9 @@ static int ast_serialize_showchan(struct ast_channel *c, char *buf, size_t size)
 			 "DNIDDigits=         %s\n"
 			 "State=              %s (%d)\n"
 			 "Rings=              %d\n"
-			 "NativeFormat=       %d %s\n"
-			 "WriteFormat=        %d %s\n"
-			 "ReadFormat=         %d %s\n"
+			 "NativeFormat=       %s\n"
+			 "WriteFormat=        %s\n"
+			 "ReadFormat=         %s\n"
 			 "1stFileDescriptor=  %d\n"
 			 "Framesin=           %d %s\n"
 			 "Framesout=          %d %s\n"
@@ -112,11 +112,8 @@ static int ast_serialize_showchan(struct ast_channel *c, char *buf, size_t size)
 			 ast_state2str(c->_state),
 			 c->_state,
 			 c->rings,
-			 c->nativeformats,
 			 ast_getformatname_multiple(formatbuf, sizeof(formatbuf), c->nativeformats),
-			 c->writeformat,
 			 ast_getformatname_multiple(formatbuf, sizeof(formatbuf), c->writeformat),
-			 c->readformat,
 			 ast_getformatname_multiple(formatbuf, sizeof(formatbuf), c->readformat),
 			 c->fds[0], c->fin & ~DEBUGCHAN_FLAG, (c->fin & DEBUGCHAN_FLAG) ? " (DEBUGGED)" : "",
 			 c->fout & ~DEBUGCHAN_FLAG, (c->fout & DEBUGCHAN_FLAG) ? " (DEBUGGED)" : "", (long)c->whentohangup,

channels/chan_sip.c

@@ -9257,7 +9257,7 @@ static int sip_show_channel(int fd, int argc, char *argv[])
 			ast_cli(fd, "  Non-Codec Capability (DTMF):   %d\n", cur->noncodeccapability);
 			ast_cli(fd, "  Their Codec Capability:   %d\n", cur->peercapability);
 			ast_cli(fd, "  Joint Codec Capability:   %d\n", cur->jointcapability);
-			ast_cli(fd, "  Format                  %s\n", ast_getformatname_multiple(formatbuf, sizeof(formatbuf), cur->owner ? cur->owner->nativeformats : 0) );
+			ast_cli(fd, "  Format:                 %s\n", ast_getformatname_multiple(formatbuf, sizeof(formatbuf), cur->owner ? cur->owner->nativeformats : 0) );
 			ast_cli(fd, "  Theoretical Address:    %s:%d\n", ast_inet_ntoa(iabuf, sizeof(iabuf), cur->sa.sin_addr), ntohs(cur->sa.sin_port));
 			ast_cli(fd, "  Received Address:       %s:%d\n", ast_inet_ntoa(iabuf, sizeof(iabuf), cur->recv.sin_addr), ntohs(cur->recv.sin_port));
 			ast_cli(fd, "  SIP Transfer mode:      %s\n", transfermode2str(cur->allowtransfer));