automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43911 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 891fc3655274d317de914b04c73b10599685c04d..a29289ed86561b58a14dc4a5fb8abfc9c11ec1d3 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -936,6 +936,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
                if (conf->users == 2) { 
                        if (!ast_streamfile(chan,"conf-onlyone",chan->language)) {
                                res = ast_waitstream(chan, AST_DIGIT_ANY);
+                               ast_stopstream(chan);
                                if (res > 0)
                                        keepplaying=0;
                                else if (res == -1)
@@ -944,6 +945,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
                } else { 
                        if (!ast_streamfile(chan, "conf-thereare", chan->language)) {
                                res = ast_waitstream(chan, AST_DIGIT_ANY);
+                               ast_stopstream(chan);
                                if (res > 0)
                                        keepplaying=0;
                                else if (res == -1)
@@ -958,6 +960,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
                        }
                        if (keepplaying && !ast_streamfile(chan, "conf-otherinparty", chan->language)) {
                                res = ast_waitstream(chan, AST_DIGIT_ANY);
+                               ast_stopstream(chan);
                                if (res > 0)
                                        keepplaying=0;
                                else if (res == -1) 
@@ -1986,8 +1989,10 @@ static int conf_exec(struct ast_channel *chan, void *data)
                                                                break;
                                                        } else {
                                                                /* Pin invalid */
-                                                               if (!ast_streamfile(chan, "conf-invalidpin", chan->language))
+                                                               if (!ast_streamfile(chan, "conf-invalidpin", chan->language)) {
                                                                        res = ast_waitstream(chan, AST_DIGIT_ANY);
+                                                                       ast_stopstream(chan);
+                                                               }
                                                                else {
                                                                        ast_log(LOG_WARNING, "Couldn't play invalid pin msg!\n");
                                                                        break;

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 5d46a8df10cb9c256e5d6b506cdded3468cb51ba..1a12bceebee76fa43b8e368a29d725e1be939c09 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -483,7 +483,14 @@ static void *changethread(void *data)
 
        AST_LIST_LOCK(&interfaces);
        AST_LIST_TRAVERSE(&interfaces, curint, list) {
-               if (!strcasecmp(curint->interface, sc->dev))
+               char *interface;
+               char *slash_pos;
+               interface = ast_strdupa(curint->interface);
+               if ((slash_pos = strchr(interface, '/')))
+                       if ((slash_pos = strchr(slash_pos + 1, '/')))
+                               *slash_pos = '\0';
+
+               if (!strcasecmp(interface, sc->dev))
                        break;
        }
        AST_LIST_UNLOCK(&interfaces);
@@ -501,7 +508,14 @@ static void *changethread(void *data)
        for (q = queues; q; q = q->next) {
                ast_mutex_lock(&q->lock);
                for (cur = q->members; cur; cur = cur->next) {
-                       if (strcasecmp(sc->dev, cur->interface))
+                       char *interface;
+                       char *slash_pos;
+                       interface = ast_strdupa(cur->interface);
+                       if ((slash_pos = strchr(interface, '/')))
+                               if ((slash_pos = strchr(slash_pos + 1, '/')))
+                                       *slash_pos = '\0';
+
+                       if (strcasecmp(sc->dev, interface))
                                continue;
 
                        if (cur->status != sc->state) {

diff --git a/cli.c b/cli.c
index e2a646d5b64e1acb00b9451db020f7707d8fd79f..371d73e369863c5b2d52123819831ee3d85d535f 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -784,7 +784,7 @@ static int handle_showchan(int fd, int argc, char *argv[])
                c->fds[0], c->fin & 0x7fffffff, (c->fin & 0x80000000) ? " (DEBUGGED)" : "",
                c->fout & 0x7fffffff, (c->fout & 0x80000000) ? " (DEBUGGED)" : "", (long)c->whentohangup,
                cdrtime, c->_bridge ? c->_bridge->name : "<none>", ast_bridged_channel(c) ? ast_bridged_channel(c)->name : "<none>", 
-               c->context, c->exten, c->priority, c->callgroup, c->pickupgroup, ( c->appl ? c->appl : "(N/A)" ),
+               c->context, c->exten, c->priority, (int) c->callgroup, (int) c->pickupgroup, ( c->appl ? c->appl : "(N/A)" ),
                ( c-> data ? (!ast_strlen_zero(c->data) ? c->data : "(Empty)") : "(None)"),
                (ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)"));