From c2ad77b27fb0c565a2a2e71b7b6b2592332f4f01 Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Fri, 4 Jul 2003 16:23:44 +0000
Subject: [PATCH] Fix iax2 video/voice and update queueing
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1161 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_queue.c | 4 ++--
channels/chan_iax2.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 47df6417b4..5ba34ee6f8 100755
--- 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 ad493c5c75..567cf40f41 100755
--- 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)
--
GitLab