Changeset ff7d949 for tools/tracereplay

Timestamp:

11/23/09 14:08:03 (12 years ago)

Author:

Andreas Löf <andreas.lof@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

43351e9

Parents:

c988da9

Message:

checksums working

File:

• tools/tracereplay/tracereplay.c (modified) (4 diffs)

tools/tracereplay/tracereplay.c

@@ -29 +29 @@
 /* This function assumes that the relevant fields have been zeroed out. RFC 1071*/
 static uint16_t checksum(void * buffer, uint16_t length) {
-  //printf("length: %d\n",length);
   uint32_t sum = 0;
   uint16_t * buff = (uint16_t *) buffer;
-  uint16_t i;
-  uint16_t result;
-
-  for (i=0;i<length;i=i+2) {
-    sum += ~ntohs(buff[i]);
-  }
-  
-  result = sum;
-  result += sum >> 16;
+  uint16_t count = length;
+
+  while(count > 1 ) {
+    sum += *buff++;
+    count = count -2;
+  }
+
+  if(count > 0) {
+    sum += buff;
+  }
+  
+  while (sum>>16)
+    sum = (sum & 0xffff) + (sum >> 16);
 
   return ~sum;
+}
+
+static uint16_t udp_tcp_checksum(libtrace_packet_t *packet) {
+
+  uint32_t sum;
+
+
+
 }
 
@@ -67 +78 @@
   if(header != NULL) {
     header -> ip_sum = 0;
-    header -> ip_sum = htons(checksum(header,header->ip_hl*4));
+    header -> ip_sum = checksum(header,header->ip_hl*sizeof(uint32_t));
   }
 
@@ -132 +143 @@
 }
 
+/* int main(int argc, char *argv[]) {  */
+  
+/*   /\* uint16_t buffer[] = {0x45,0x00,0x00,0x30, */
+/*                     0x3b,0xa9,0x40,0x00, */
+/*                     0x6e,0x06,0x44,0x5b, */
+/*                     0x25,0xdb,0xef,0x28, */
+/*                     0x7d,0xb6,0x6a,0xb1 */
+/*                     };*\/  */
+
+/*   uint8_t buffer[] = {0x00,0x01, */
+/*                    0xf2,0x03, */
+/*                    0xf4,0xf5, */
+/*                    0xf6,0xf7 */
+/*   }; */
+
+/*   uint16_t checksum = ip_checksum(buffer,8); */
+
+/*   printf("checksum: %04X\n",checksum); */
+  
+/* } */
+
+
 int main(int argc, char *argv[]) {
         
@@ -243 +276 @@
 
 }
+