kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 73555 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r73555 | russell | 2007-07-05 18:05:33 -0500 (Thu, 05 Jul 2007) | 3 lines

copy from the correct buffer when deferring a full frame
(related to issue #9937)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-07-05 23:06:01 +00:00
parent a526627d8f
commit 04de82d61c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
channels/chan_iax2.c
View File

@@ -6556,32 +6556,32 @@ static void handle_deferred_full_frames(struct iax2_thread *thread)
* If there are already any full frames queued, they are sorted * If there are already any full frames queued, they are sorted
* by sequence number. * by sequence number.
*/ */
static void defer_full_frame(struct iax2_thread *thread) static void defer_full_frame(struct iax2_thread *from_here, struct iax2_thread *to_here)
{ {
struct iax2_pkt_buf *pkt_buf, *cur_pkt_buf; struct iax2_pkt_buf *pkt_buf, *cur_pkt_buf;
struct ast_iax2_full_hdr *fh, *cur_fh; struct ast_iax2_full_hdr *fh, *cur_fh;
if (!(pkt_buf = ast_calloc(1, sizeof(*pkt_buf) + thread->buf_len))) if (!(pkt_buf = ast_calloc(1, sizeof(*pkt_buf) + from_here->buf_len)))
return; return;
pkt_buf->len = thread->buf_len; pkt_buf->len = from_here->buf_len;
memcpy(pkt_buf->buf, thread->buf, pkt_buf->len); memcpy(pkt_buf->buf, from_here->buf, pkt_buf->len);
fh = (struct ast_iax2_full_hdr *) pkt_buf->buf; fh = (struct ast_iax2_full_hdr *) pkt_buf->buf;
ast_mutex_lock(&thread->lock); ast_mutex_lock(&to_here->lock);
AST_LIST_TRAVERSE_SAFE_BEGIN(&thread->full_frames, cur_pkt_buf, entry) { AST_LIST_TRAVERSE_SAFE_BEGIN(&to_here->full_frames, cur_pkt_buf, entry) {
cur_fh = (struct ast_iax2_full_hdr *) cur_pkt_buf->buf; cur_fh = (struct ast_iax2_full_hdr *) cur_pkt_buf->buf;
if (fh->oseqno < cur_fh->oseqno) { if (fh->oseqno < cur_fh->oseqno) {
AST_LIST_INSERT_BEFORE_CURRENT(&thread->full_frames, pkt_buf, entry); AST_LIST_INSERT_BEFORE_CURRENT(&to_here->full_frames, pkt_buf, entry);
break; break;
} }
} }
AST_LIST_TRAVERSE_SAFE_END AST_LIST_TRAVERSE_SAFE_END
if (!cur_pkt_buf) if (!cur_pkt_buf)
AST_LIST_INSERT_TAIL(&thread->full_frames, pkt_buf, entry); AST_LIST_INSERT_TAIL(&to_here->full_frames, pkt_buf, entry);
ast_mutex_unlock(&thread->lock); ast_mutex_unlock(&to_here->lock);
} }
static int socket_read(int *id, int fd, short events, void *cbdata) static int socket_read(int *id, int fd, short events, void *cbdata)
@@ -6635,7 +6635,7 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
if (cur) { if (cur) {
/* we found another thread processing a full frame for this call, /* we found another thread processing a full frame for this call,
so queue it up for processing later. */ so queue it up for processing later. */
defer_full_frame(cur); defer_full_frame(thread, cur);
AST_LIST_UNLOCK(&active_list); AST_LIST_UNLOCK(&active_list);
insert_idle_thread(thread); insert_idle_thread(thread);
return 1; return 1;