diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-02 17:37:16 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-02 17:37:16 +0000 |
| commit | 241599784788ad7228ef7ad459242d67eabcb22f (patch) | |
| tree | 25d43a4048a141528a417be43c82c3ac518ca491 /channels | |
| parent | 2c174e162eb22641834f0e9b664b426a4eecbc2c (diff) | |
Merged revisions 222030 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r222030 | dvossel | 2009-10-02 12:34:07 -0500 (Fri, 02 Oct 2009) | 9 lines
Merged revisions 222026 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r222026 | dvossel | 2009-10-02 12:32:13 -0500 (Fri, 02 Oct 2009) | 3 lines
Removes unnecessary unlock, clarifies a memcpy.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@222038 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index cc89fc708..aad43194b 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -2396,7 +2396,7 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s } /* this searches for transfer call numbers that might not get caught otherwise */ memset(&tmp_pvt.addr, 0, sizeof(tmp_pvt.addr)); - memcpy(&tmp_pvt.transfer, sin, sizeof(tmp_pvt.addr)); + memcpy(&tmp_pvt.transfer, sin, sizeof(tmp_pvt.transfer)); if ((pvt = ao2_find(iax_transfercallno_pvts, &tmp_pvt, OBJ_POINTER))) { if (return_locked) { ast_mutex_lock(&iaxsl[pvt->callno]); @@ -9280,7 +9280,6 @@ static int socket_process(struct iax2_thread *thread) if (f.frametype == AST_FRAME_IAX) { if (iax_parse_ies(&ies, thread->buf + sizeof(*fh), f.datalen)) { ast_log(LOG_WARNING, "Undecodable frame received from '%s'\n", ast_inet_ntoa(sin.sin_addr)); - ast_mutex_unlock(&iaxsl[fr->callno]); return 1; } f.data = NULL; |