Ticket #6: fix.patch

ntripcastertypes.h

@@ -228 +228 @@
         char buf[20]; // to store hex length. ajd
         int off; // store offset in buf.
         int left;
+        int finish;
 } http_chunk_t;
 
 typedef struct statistics_St

source.c

@@ -647 +647 @@
                                                 xa_debug (5, "add_chunk: hex [%s], read=%d", con->http_chunk->buf, len);
 
                                                 if (len > (20 - con->http_chunk->off)) { // a whole line could be read. ajd
-                                                        con->http_chunk->left = strtol(con->http_chunk->buf, (char **)NULL, 16);
-                                                        con->http_chunk->off = 0;
-
-                                                        xa_debug (4, "add_chunk: http chunk left=%d", con->http_chunk->left);
-
+                                                        if(con->http_chunk->finish)
+                                                        {
+                                                                xa_debug (4, "read trailing [%s]", con->http_chunk->buf);
+                                                                con->http_chunk->finish = 0;
+                                                                continue;
+                                                        }
+                                                        else
+                                                        {
+                                                                con->http_chunk->left = strtol(con->http_chunk->buf, (char **)NULL, 16);
+                                                                con->http_chunk->off = 0;
+                                                                con->http_chunk->finish = 1;
+                                                                xa_debug (4, "add_chunk: http chunk left=%d", con->http_chunk->left);
+                                                        }
                                                 } else if (len > 0) {
                                                         con->http_chunk->off += len;
                                                         len = -1;
@@ -761 +769 @@
         con->food.source->chunk[con->food.source->cid].len = read_bytes;
         con->food.source->chunk[con->food.source->cid].clients_left = con->food.source->num_clients;
         con->food.source->cid = (con->food.source->cid + 1) % CHUNKLEN;
-
-//printf("chunk %d of size %d added!\r\n", con->food.source->cid, read_bytes);
-
-        /* rtsp. ajd */
+        
         if (con->trans_encoding == chunked_e) {
                 con->http_chunk->left = con->http_chunk->left - read_bytes;
-                if (con->http_chunk->left <= 0) {
-                        len = sock_read_line(con->sock, con->http_chunk->buf, 20); // read trailing /n. ajd
-
-                        xa_debug (4, "read trailing [%s]", con->http_chunk->buf);
-
-                        con->http_chunk->off = 0;
-                }
                 xa_debug (4, "http_chunk left now=%d ", con->http_chunk->left );
         }
 }