Fix iax2 video/voice and update queueing
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1161 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
5a4e282ae8
commit
c2ad77b27f
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue