[Asterisk-cvs] asterisk ChangeLog, 1.74.2.49, 1.74.2.50 rtp.c, 1.92.2.10, 1.92.2.11

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv13414

Modified Files:
      Tag: v1-0
	ChangeLog rtp.c 
Log Message:


Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.74.2.49
retrieving revision 1.74.2.50
diff -u -d -r1.74.2.49 -r1.74.2.50
--- ChangeLog	10 May 2005 01:39:50 -0000	1.74.2.49
+++ ChangeLog	12 May 2005 01:43:36 -0000	1.74.2.50
@@ -31,6 +31,9 @@
        GET DATA command.
     -- When calling SAY NUMBER with a number like 09, we will now say "nine" instead
        of "zero"
+ -- app_dial
+    -- There was a problem where text frames would not be forwarded before the channel
+       has been answered. 
  -- app_disa
     -- Fixed the timeout used when no password is set
  -- rtp

Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.92.2.10
retrieving revision 1.92.2.11
diff -u -d -r1.92.2.10 -r1.92.2.11
--- rtp.c	5 Apr 2005 07:10:06 -0000	1.92.2.10
+++ rtp.c	12 May 2005 01:43:36 -0000	1.92.2.11
@@ -795,6 +795,41 @@
   return "";
 }
 
+char *ast_rtp_lookup_mime_multiple(char *buf, int size, const int capability, const int isAstFormat)
+{
+	int format;
+	unsigned len;
+	char *end = buf;
+	char *start = buf;
+
+	if (!buf || !size)
+		return NULL;
+
+	snprintf(end, size, "0x%x (", capability);
+
+	len = strlen(end);
+	end += len;
+	size -= len;
+	start = end;
+
+	for (format = 1; format < AST_RTP_MAX; format <<= 1) {
+		if (capability & format) {
+			const char *name = ast_rtp_lookup_mime_subtype(isAstFormat, format);
+			snprintf(end, size, "%s|", name);
+			len = strlen(end);
+			end += len;
+			size -= len;
+		}
+	}
+
+	if (start == end)
+		snprintf(start, size, "nothing)"); 
+	else if (size > 1)
+		*(end -1) = ')';
+	
+	return buf;
+}
+
 static int rtp_socket(void)
 {
 	int s;