Fix iax2 video/voice and update queueing

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1161 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 47df6417b4c59ebd41fba36af8ad2c5fcbc31d71..5ba34ee6f853cd83de8b0c74afc7011543da5672 100755 (executable)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -179,8 +179,8 @@ static int join_queue(char *queuename, struct queue_ent *qe)
                                q->count++;
                                res = 0;
                                manager_event(EVENT_FLAG_CALL, "Join", 
-                                                               "Channel: %s\r\nQueue: %s\r\nPosition: %d\r\nCount: %d\r\n",
-                                                               qe->chan->name, q->name, qe->pos, q->count );
+                                                               "Channel: %s\r\nCallerID:%s\r\nQueue: %s\r\nPosition: %d\r\nCount: %d\r\n",
+                                                               qe->chan->name, qe->chan->callerid ? qe->chan->callerid : "", q->name, qe->pos, q->count );
 #if 0
 ast_log(LOG_NOTICE, "Queue '%s' Join, Channel '%s', Position '%d'\n", q->name, qe->chan->name, qe->pos );
 #endif

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index ad493c5c750662eebcc598a980aa52ef7ab23ea9..567cf40f417a4258bc9aaad3b642a9dd10a104eb 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3731,7 +3731,7 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
                        ast_pthread_mutex_unlock(&iaxsl[fr.callno]);
                return 1;
        }
-       if (!inaddrcmp(&sin, &iaxs[fr.callno]->addr))
+       if (!inaddrcmp(&sin, &iaxs[fr.callno]->addr) && !minivid)
                iaxs[fr.callno]->peercallno = (unsigned short)(ntohs(mh->callno) & ~IAX_FLAG_FULL);
        if (ntohs(mh->callno) & IAX_FLAG_FULL) {
                if (option_debug)