[asterisk-commits] wedhorn: trunk r405985 - in /trunk: ./ channels/chan_skinny.c

[SVN commits to the Asterisk project]

Author: wedhorn
Date: Mon Jan 20 17:25:38 2014
New Revision: 405985

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405985
Log:
Skinny: fix up handling of fragmented packets.

Bad offset in reading second or more fragment of skinny packets. Fixed
to offset by char (single byte) rather than size of req.
........

Merged revisions 405982 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/channels/chan_skinny.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=405985&r1=405984&r2=405985
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Mon Jan 20 17:25:38 2014
@@ -7595,7 +7595,7 @@
 
 			bytesread = 0;
 			while (1) {
-				if ((res = read(s->fd, &req->data+bytesread, dlen-bytesread)) < 0) {
+				if ((res = read(s->fd, ((char*)&req->data)+bytesread, dlen-bytesread)) < 0) {
 					ast_log(LOG_WARNING, "Data read() returned error: %s\n", strerror(errno));
 					break;
 				}