[Xineliboutput-cvslog] vdr-xineliboutput xine_input_vdr.c, 1.270, 1.271

[Petri H. <phi...@us...>]

Update of /cvsroot/xineliboutput/vdr-xineliboutput
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6315

Modified Files:
	xine_input_vdr.c 
Log Message:
Fixed reading partially read block from tcp/pipe socket


Index: xine_input_vdr.c
===================================================================
RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/xine_input_vdr.c,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- xine_input_vdr.c	16 Jul 2009 14:04:18 -0000	1.270
+++ xine_input_vdr.c	17 Jul 2009 12:44:59 -0000	1.271
@@ -3564,7 +3564,7 @@
   int            result, n;
 
   if (read_buffer && read_buffer->size >= sizeof(stream_tcp_header_t))
-    todo = read_buffer->size + ((stream_tcp_header_t *)read_buffer->content)->len;
+    todo += ((stream_tcp_header_t *)read_buffer->content)->len;
 
   while (XIO_READY == (result = _x_io_select(this->stream, this->fd_data, XIO_READ_READY, 100))) {
 
@@ -3593,7 +3593,7 @@
 
     /* Read data */
     errno = 0;
-    n = read(this->fd_data, read_buffer->mem + read_buffer->size, todo - read_buffer->size);
+    n = read(this->fd_data, read_buffer->content + read_buffer->size, todo - read_buffer->size);
     if (n <= 0) {
       if (!n || (errno != EINTR && errno != EAGAIN)) {
         if (n < 0 && this->fd_data >= 0)
@@ -3602,7 +3602,7 @@
           LOGMSG("Data stream disconnected");
         errno = ENOTCONN;
       }
-      /* errno == EINTR || errno == EAGAIN */
+      /* errno == EINTR || errno == EAGAIN || errno == ENOTCONN */
       return NULL;
     }
 
@@ -3614,7 +3614,8 @@
       hdr->len = ntohl(hdr->len);
       hdr->pos = ntohull(hdr->pos);
 
-      todo = read_buffer->size + hdr->len;
+      todo += hdr->len;
+
       if (todo + read_buffer->size >= read_buffer->max_size) {
         LOGMSG("TCP: Buffer too small (%d ; incoming frame %d bytes)",
                read_buffer->max_size, todo + read_buffer->size);
@@ -3632,8 +3633,8 @@
         if (!DATA_IS_TS(pkt_data) && pkt_data[0]) { /* -> can't be pes or ts frame */
           data_stream_parse_control(this, (char*)pkt_data);
 
-          read_buffer->size = 0;
-
+          read_buffer->free_buffer(read_buffer);
+          this->read_buffer = NULL;
           errno = EAGAIN;
           return NULL;
         }