Changeset 707

Timestamp:

04/11/06 14:52:58 (7 years ago)

Author:

perry

Message:

Fix various bugs in protocols.c
Move trace_get_next_option from trace.c to protocols.c

Location:

trunk/lib

Files:

• protocols.c (modified) (8 diffs)
• trace.c (modified) (1 diff)

trunk/lib/protocols.c

@@ -54 +54 @@
         }
 
-        return NULL;
+        return ethernet;
 }
 
@@ -193 +193 @@
 {
         uint16_t type;
-        void *ret=trace_get_payload_from_link(
-                        trace_get_link(packet),
+        void *link = trace_get_link(packet);
+        void *ret;
+
+        if (!link)
+                return NULL;
+        
+        ret=trace_get_payload_from_link(
+                        link,
                         trace_get_link_type(packet),
                         &type, NULL);
@@ -212 +218 @@
 {
         uint16_t type;
-        void *ret=trace_get_payload_from_link(
-                        trace_get_link(packet),
+        void *link=trace_get_link(packet);
+        void *ret;
+        
+        if (!link)
+                return NULL;
+
+        ret=trace_get_payload_from_link(
+                        link,
                         trace_get_link_type(packet),
                         &type,NULL);
@@ -303 +315 @@
         uint8_t dummy;
         uint16_t ethertype;
+        void *link;
 
         if (!proto) proto=&dummy;
@@ -309 +322 @@
                 *remaining = trace_get_capture_length(packet);
 
+        link=trace_get_link(packet);
+
+        if (!link)
+                return NULL;
+
         transport = trace_get_payload_from_link(
-                        trace_get_link(packet),
+                        link,
                         trace_get_link_type(packet),
                         &ethertype,
@@ -325 +343 @@
                 return NULL;
 
-        switch (*proto) {
+        switch (ethertype) {
                 case 0x0800: /* IPv4 */
                         transport=trace_get_payload_from_ip(
@@ -351 +369 @@
         tcp=(libtrace_tcp_t*)trace_get_transport(packet,&proto,NULL);
 
-        if (proto != 6)
+        if (!tcp && proto != 6)
                 return NULL;
 
@@ -646 +664 @@
 }
 
+/* parse an ip or tcp option
+ * @param[in,out] ptr   the pointer to the current option
+ * @param[in,out] len   the length of the remaining buffer
+ * @param[out] type     the type of the option
+ * @param[out] optlen   the length of the option
+ * @param[out] data     the data of the option
+ *
+ * @returns bool true if there is another option (and the fields are filled in)
+ *               or false if this was the last option.
+ *
+ * This updates ptr to point to the next option after this one, and updates
+ * len to be the number of bytes remaining in the options area.  Type is updated
+ * to be the code of this option, and data points to the data of this option,
+ * with optlen saying how many bytes there are.
+ *
+ * @note Beware of fragmented packets.
+ * @author Perry Lorier
+ */
+int trace_get_next_option(unsigned char **ptr,int *len,
+                        unsigned char *type,
+                        unsigned char *optlen,
+                        unsigned char **data)
+{
+        if (*len<=0)
+                return 0;
+        *type=**ptr;
+        switch(*type) {
+                case 0: /* End of options */
+                        return 0;
+                case 1: /* Pad */
+                        (*ptr)++;
+                        (*len)--;
+                        return 1;
+                default:
+                        *optlen = *(*ptr+1);
+                        if (*optlen<2)
+                                return 0; /* I have no idea wtf is going on
+                                           * with these packets
+                                           */
+                        (*len)-=*optlen;
+                        (*data)=(*ptr+2);
+                        (*ptr)+=*optlen;
+                        if (*len<0)
+                                return 0;
+                        return 1;
+        }
+        assert(0);
+}
+
+

trunk/lib/trace.c

@@ -678 +678 @@
 } legacy_framing_t;
 */
-
-
-
-
-/* parse an ip or tcp option
- * @param[in,out] ptr   the pointer to the current option
- * @param[in,out] len   the length of the remaining buffer
- * @param[out] type     the type of the option
- * @param[out] optlen   the length of the option
- * @param[out] data     the data of the option
- *
- * @returns bool true if there is another option (and the fields are filled in)
- *               or false if this was the last option.
- *
- * This updates ptr to point to the next option after this one, and updates
- * len to be the number of bytes remaining in the options area.  Type is updated
- * to be the code of this option, and data points to the data of this option,
- * with optlen saying how many bytes there are.
- *
- * @note Beware of fragmented packets.
- * @author Perry Lorier
- */
-int trace_get_next_option(unsigned char **ptr,int *len,
-                        unsigned char *type,
-                        unsigned char *optlen,
-                        unsigned char **data)
-{
-        if (*len<=0)
-                return 0;
-        *type=**ptr;
-        switch(*type) {
-                case 0: /* End of options */
-                        return 0;
-                case 1: /* Pad */
-                        (*ptr)++;
-                        (*len)--;
-                        return 1;
-                default:
-                        *optlen = *(*ptr+1);
-                        if (*optlen<2)
-                                return 0; /* I have no idea wtf is going on
-                                           * with these packets
-                                           */
-                        (*len)-=*optlen;
-                        (*data)=(*ptr+2);
-                        (*ptr)+=*optlen;
-                        if (*len<0)
-                                return 0;
-                        return 1;
-        }
-        assert(0);
-}