Changeset 754

Timestamp:

04/27/06 11:36:36 (7 years ago)

Author:

spa1

Message:

Fixed error where the packet's sequence number was corrupted whenever the
rt_read buffer was being refilled.

File:

• trunk/lib/format_rt.c (modified) (12 diffs)

trunk/lib/format_rt.c

@@ -82 +82 @@
         char *pkt_buffer;
         char *buf_current;
-        int buf_left;
+        int buf_filled;
 
         
@@ -197 +197 @@
         RT_INFO->pkt_buffer = NULL;
         RT_INFO->buf_current = NULL;
-        RT_INFO->buf_left = 0;
+        RT_INFO->buf_filled = 0;
         
         if (strlen(uridata) == 0) {
@@ -269 +269 @@
 static int rt_read(struct libtrace_t *libtrace, void **buffer, size_t len, int block) {
         int numbytes;
-
+        rt_header_t *test_hdr;
+        
         assert(len <= RT_BUF_SIZE);
         
@@ -275 +276 @@
                 RT_INFO->pkt_buffer = malloc(RT_BUF_SIZE);
                 RT_INFO->buf_current = RT_INFO->pkt_buffer;
-                RT_INFO->buf_left = 0;
+                RT_INFO->buf_filled = 0;
         }
 
@@ -288 +289 @@
 
         
-        if (len > RT_INFO->buf_left) {
+        if (len > RT_INFO->buf_filled) {
                 memcpy(RT_INFO->pkt_buffer, RT_INFO->buf_current, 
-                                RT_INFO->buf_left);
+                                RT_INFO->buf_filled);
                 RT_INFO->buf_current = RT_INFO->pkt_buffer;
-
+                
 #ifndef MSG_NOSIGNAL
 #  define MSG_NOSIGNAL 0
 #endif
-                while (len > RT_INFO->buf_left) {
+                while (len > RT_INFO->buf_filled) {
                         if ((numbytes = recv(RT_INFO->input_fd,
-                                                RT_INFO->pkt_buffer + 
-                                                RT_INFO->buf_left,
-                                                RT_BUF_SIZE-RT_INFO->buf_left,
+                                                RT_INFO->buf_current + 
+                                                RT_INFO->buf_filled,
+                                                RT_BUF_SIZE-RT_INFO->buf_filled,
                                                 MSG_NOSIGNAL|block)) <= 0) {
                                 if (numbytes == 0) {
@@ -335 +336 @@
                         printf("\n");
                         */
-                        RT_INFO->buf_left+=numbytes;
+                        RT_INFO->buf_filled+=numbytes;
                 }
 
@@ -341 +342 @@
         *buffer = RT_INFO->buf_current;
         RT_INFO->buf_current += len;
-        RT_INFO->buf_left -= len;
-        assert(RT_INFO->buf_left >= 0);
+        RT_INFO->buf_filled -= len;
+        assert(RT_INFO->buf_filled >= 0);
         return len;
 }
@@ -429 +430 @@
         buf_ptr = ack_buffer;
 
-        
         while (to_write > 0) {
                 numbytes = send(RT_INFO->input_fd, buf_ptr, to_write, 0); 
@@ -455 +455 @@
                 libtrace_packet_t *packet,int blocking) {
         rt_header_t rt_hdr;
-        rt_header_t *pkt_hdr = &rt_hdr;
+        static rt_header_t *pkt_hdr = 0;
         int pkt_size = 0;
-        
+        uint32_t seqno;
+        
+        if (pkt_hdr == 0)
+                pkt_hdr = malloc(sizeof(rt_header_t));
         
         if (packet->buf_control == TRACE_CTRL_EXTERNAL || !packet->buffer) {
@@ -471 +474 @@
         }
 
+        /* Need to salvage these in case the next rt_read overwrites the 
+         * buffer they came from! */
         packet->type = pkt_hdr->type;
         pkt_size = pkt_hdr->length;
         packet->size = pkt_hdr->length;
+        seqno = pkt_hdr->sequence;
 
         if (packet->type >= RT_DATA_SIMPLE) {
@@ -486 +492 @@
                 }
                 rt_set_payload(packet);
-
                 if (RT_INFO->reliable > 0) {
-                        if (rt_send_ack(libtrace, pkt_hdr->sequence) 
+                        if (rt_send_ack(libtrace, seqno) 
                                         == -1)
                         {
@@ -519 +524 @@
                         default:
                                 printf("Bad rt type for client receipt: %d\n",
-                                        pkt_hdr->type);
+                                        packet->type);
                 }
         }