Changeset 827

Timestamp:

05/25/06 15:18:11 (7 years ago)

Author:

perry

Message:

Add new DUCK link type (for duck packets obviously).
Make get_payload_from_link on a duck packet return "NULL" (no payload)

Location:

trunk/lib

Files:

• format_duck.c (modified) (2 diffs)
• libtrace.h.in (modified) (1 diff)
• protocols.c (modified) (1 diff)

trunk/lib/format_duck.c

@@ -246 +246 @@
 static int duck_get_wire_length(const libtrace_packet_t *packet) {
         return 0;
+}
+
+static int duck_get_link_type(const libtrace_packet_t *packet) {
+        return TRACE_TYPE_DUCK;
 }
 
@@ -273 +277 @@
         NULL,                           /* fin_packet */
         duck_write_packet,              /* write_packet */
-        NULL,                           /* get_link_type */
+        duck_get_link_type,             /* get_link_type */
         NULL,                           /* get_direction */
         NULL,                           /* set_direction */

trunk/lib/libtrace.h.in

@@ -216 +216 @@
        TRACE_TYPE_PFLOG,                /**< FreeBSD's PFlug */
        TRACE_TYPE_POS,
-       TRACE_TYPE_80211_PRISM = 12
+       TRACE_TYPE_80211_PRISM = 12,
+       TRACE_TYPE_DUCK,                 /**< Pseudo link layer for DUCK packets */
      } libtrace_linktype_t;
 

trunk/lib/protocols.c

@@ -208 +208 @@
                 case TRACE_TYPE_ATM:
                         return trace_get_payload_from_atm(link,type,remaining);
+                case TRACE_TYPE_DUCK:
+                        return NULL; /* duck packets have no payload! */
         }
         fprintf(stderr,"Don't understand link layer type %i in trace_get_payload_from_link()\n",