Changeset 1577

Timestamp:

05/04/10 16:08:24 (3 years ago)

Author:

perry

Message:

The spec says that it's the IP header + first 16 bytes of transport, but lets just assume everyones
lazy and just captures the first 'n' bytes.

File:

• trunk/lib/format_tsh.c (modified) (4 diffs)

trunk/lib/format_tsh.c

@@ -153 +153 @@
         if ((numbytes=wandio_read(libtrace->io,
                                 buffer2,
-                                (size_t)sizeof(libtrace_ip_t))) 
-                        != sizeof(libtrace_ip_t)) {
+                                (size_t)sizeof(libtrace_ip_t)+16))  /* 16 bytes of transport header */
+                        != sizeof(libtrace_ip_t)+16) {
                 trace_set_err(libtrace,errno,"read(%s)",
                                 libtrace->uridata);
@@ -160 +160 @@
         }
 
+#if 0
         /* IP Options aren't captured in the trace, so leave room
          * for them, and put the transport header where it "should" be
@@ -173 +174 @@
                 return -1;
         }
+#endif
         
         if (tsh_prepare_packet(libtrace, packet, packet->buffer, packet->type, 
@@ -204 +206 @@
          * IP options, but we'll pretend we have them
          */
+#if 0
         return 16+((libtrace_ip_t*)packet->payload)->ip_hl*4;
+#else
+        return 16+sizeof(libtrace_ip_t);
+#endif
 }
 
 static int tsh_get_wire_length(const libtrace_packet_t *packet) {
-        return ((libtrace_ip_t*)packet->payload)->ip_len;
+        return ntohs(((libtrace_ip_t*)packet->payload)->ip_len);
 }