FS-3548 --resolve

diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c
index 007ee221a38e2ec5f13c49b32e8225d885581a30..9e263056c96ffdf6dcd7f415704fceb6cae77b30 100644 (file)
--- a/src/mod/applications/mod_fifo/mod_fifo.c
+++ b/src/mod/applications/mod_fifo/mod_fifo.c
@@ -1264,8 +1264,9 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void
                if (timeout < h->timeout) timeout = h->timeout;
 
                if (use_ent) {
-                       stream.write_function(&stream, "{ignore_early_media=true,outbound_redirect_fatal=true,leg_timeout=%d,fifo_outbound_uuid=%s,fifo_name=%s}%s:_:",
-                                                                 h->timeout, h->uuid, node->name, parsed ? parsed : h->originate_string);
+                       stream.write_function(&stream, "{ignore_early_media=true,outbound_redirect_fatal=true,leg_timeout=%d,fifo_outbound_uuid=%s,fifo_name=%s}%s%s",
+                                                                 h->timeout, h->uuid, node->name, 
+                                                                 parsed ? parsed : h->originate_string, (i == cbh->rowcount - 1) ? "" : SWITCH_ENT_ORIGINATE_DELIM);
                } else {
                        stream.write_function(&stream, "[leg_timeout=%d,fifo_outbound_uuid=%s,fifo_name=%s]%s,",
                                                                  h->timeout, h->uuid, node->name, parsed ? parsed : h->originate_string);
@@ -1278,10 +1279,6 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void
 
        originate_string = (char *) stream.data;
 
-       if (originate_string) {
-               end_of(originate_string) = '\0';
-       }
-
        uuid_list = (char *) stream2.data;
 
        if (uuid_list) {