*** empty log message ***

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5631 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index 1cdc02fcdf448365957fca0970e250245002926c..64da79e79f759033c3a141b037b8a270bd8baf85 100755 (executable)
--- a/CHANGES
+++ b/CHANGES
@@ -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

diff --git a/apps/app_cut.c b/apps/app_cut.c
index da397f66eea3627a10867f2be70de0b66bd004b7..afaaf84733e53e71307d4766a6cab1a6820eb5c2 100755 (executable)
--- a/apps/app_cut.c
+++ b/apps/app_cut.c
@@ -31,10 +31,10 @@ static char *tdesc = "Cuts up variables";
 
 static char *app_cut = "Cut";
 
-static char *cut_synopsis = "Cut(newvar=varname|delimiter|fieldspec)";
+static char *cut_synopsis = "Splits a variable's content using the specified delimiter";
 
 static char *cut_descrip =
-"Cut(newvar=varname,delimiter,field)\n"
+"Usage: Cut(newvar=varname,delimiter,fieldspec)\n"
 "  newvar    - new variable created from result string\n"
 "  varname   - variable you want cut\n"
 "  delimiter - defaults to '-'\n"

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 75a6f404d4065765430630676167830188f928ad..0d16d0483d4996fff4e695457fac07d6aa7c4045 100755 (executable)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -364,6 +364,10 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localu
                                                                !(outgoing->ringbackonly || outgoing->musiconhold)) {
                                                if (ast_write(in, f))
                                                        ast_log(LOG_WARNING, "Unable to forward image\n");
+                                       } else if (single && (f->frametype == AST_FRAME_TEXT) && 
+                                                               !(outgoing->ringbackonly || outgoing->musiconhold)) {
+                                               if (ast_write(in, f))
+                                                       ast_log(LOG_WARNING, "Unable to text\n");
                                        } else if (single && (f->frametype == AST_FRAME_HTML) && !outgoing->noforwardhtml) {
                                                ast_channel_sendhtml(in, f->subclass, f->data, f->datalen);
                                        }

diff --git a/apps/app_eval.c b/apps/app_eval.c
index dc61df2f6dadece8b17999f785e9fb0c3dc230ed..de80d9cb65481076acc9cd115b2ba7b9b804ad92 100755 (executable)
--- a/apps/app_eval.c
+++ b/apps/app_eval.c
@@ -31,10 +31,10 @@ static char *tdesc = "Reevaluates strings";
 
 static char *app_eval = "Eval";
 
-static char *eval_synopsis = "Eval(newvar=somestring)";
+static char *eval_synopsis = "Evaluates a string";
 
 static char *eval_descrip =
-"Eval(newvar=somestring)\n"
+"Usage: Eval(newvar=somestring)\n"
 "  Normally Asterisk evaluates variables inline.  But what if you want to\n"
 "store variable offsets in a database, to be evaluated later?  Eval is\n"
 "the answer, by allowing a string to be evaluated twice in the dialplan,\n"

diff --git a/rtp.c b/rtp.c
index 04bedfe754c95b8c5a5e13aff8edba0bf5fa0f11..1d592aa978fe78b1daea1c3896504619eea8ed74 100755 (executable)
--- a/rtp.c
+++ b/rtp.c
@@ -795,6 +795,41 @@ char* ast_rtp_lookup_mime_subtype(int isAstFormat, int code) {
   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;