[svn-commits] branch oej/t38passthrough r12106 - in /team/oej/t38passthrough: channels/ inc...

[svn-commits at lists.digium.com]

Author: oej
Date: Mon Mar  6 12:12:29 2006
New Revision: 12106

URL: http://svn.digium.com/view/asterisk?rev=12106&view=rev
Log:
Implementing changes from PCadach

Modified:
    team/oej/t38passthrough/channels/chan_sip.c
    team/oej/t38passthrough/include/asterisk/channel.h

Modified: team/oej/t38passthrough/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/channels/chan_sip.c?rev=12106&r1=12105&r2=12106&view=diff
==============================================================================
--- team/oej/t38passthrough/channels/chan_sip.c (original)
+++ team/oej/t38passthrough/channels/chan_sip.c Mon Mar  6 12:12:29 2006
@@ -8274,6 +8274,18 @@
 		ast_cli(fd, FORMAT2, "Name/username", "Host", "Dyn", "Nat", "ACL", "Port", "Status");
 	} 
 	
+#ifdef T38_SUPPORT
+#define T38FMT	"T38pt_support_udptl: %s\r\n" \
+				"T38pt_support_rtp: %s\r\n" \
+				"T38pt_support_tcp: %s\r\n"
+#define T38ARGS	ast_test_flag((&iterator->flags_page2), SIP_PAGE2_T38SUPPORT_UDPTL) ? "yes" : "no", 	/* Dynamic or not? */ \
+				ast_test_flag((&iterator->flags_page2), SIP_PAGE2_T38SUPPORT_RTP) ? "yes" : "no", 	/* Dynamic or not? */ \
+				ast_test_flag((&iterator->flags_page2), SIP_PAGE2_T38SUPPORT_TCP) ? "yes" : "no", 	/* Dynamic or not? */
+#else
+#define T38FMT		""
+#define T38ARGS
+#endif
+
 	ASTOBJ_CONTAINER_TRAVERSE(&peerl, 1, do {
 		char status[20] = "";
 		char srch[2000];
@@ -8333,11 +8345,7 @@
 			"IPport: %d\r\n"
 			"Dynamic: %s\r\n"
 			"Natsupport: %s\r\n"
-#ifdef T38_SUPPORT
-			"T38pt_support_udptl: %s\r\n"
-			"T38pt_support_rtp: %s\r\n"
-			"T38pt_support_tcp: %s\r\n"
-#endif
+			T38FMT
 			"ACL: %s\r\n"
 			"Status: %s\r\n\r\n", 
 			idtext,
@@ -8346,11 +8354,7 @@
 			ntohs(iterator->addr.sin_port), 
 			ast_test_flag((&iterator->flags_page2), SIP_PAGE2_DYNAMIC) ? "yes" : "no", 	/* Dynamic or not? */
 			(ast_test_flag(iterator, SIP_NAT) & SIP_NAT_ROUTE) ? "yes" : "no",	/* NAT=yes? */
-#ifdef T38_SUPPORT
-			ast_test_flag((&iterator->flags_page2), SIP_PAGE2_T38SUPPORT_UDPTL) ? "yes" : "no", 	/* Dynamic or not? */
-			ast_test_flag((&iterator->flags_page2), SIP_PAGE2_T38SUPPORT_RTP) ? "yes" : "no", 	/* Dynamic or not? */
-			ast_test_flag((&iterator->flags_page2), SIP_PAGE2_T38SUPPORT_TCP) ? "yes" : "no", 	/* Dynamic or not? */
-#endif
+			T38ARGS
 			iterator->ha ? "yes" : "no",       /* permit/deny */
 			status);
 		}
@@ -8372,6 +8376,8 @@
 	
 
 	return RESULT_SUCCESS;
+#undef T38FMT
+#undef T38ARGS
 #undef FORMAT
 #undef FORMAT2
 }

Modified: team/oej/t38passthrough/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/include/asterisk/channel.h?rev=12106&r1=12105&r2=12106&view=diff
==============================================================================
--- team/oej/t38passthrough/include/asterisk/channel.h (original)
+++ team/oej/t38passthrough/include/asterisk/channel.h Mon Mar  6 12:12:29 2006
@@ -119,7 +119,7 @@
 
 #define MAX_MUSICCLASS		20
 
-#define AST_MAX_FDS		8
+#define AST_MAX_FDS		16
 /*
  * We have AST_MAX_FDS file descriptors in a channel.
  * Some of them have a fixed use: