Changeset 16da8f3 for lib

Timestamp:

10/25/06 13:06:05 (16 years ago)

Author:

Perry Lorier <perry@…>

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:

d5e1796

Parents:

01bc623

Message:

Add ATM support

Location:

lib

Files:

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

lib/libtrace.h.in

@@ -431 +431 @@
 } PACKED libtrace_8021q_t;
 
-/** ATM cell */
+/** ATM User Network Interface (UNI) Cell. */
 typedef struct libtrace_atm_cell
 {
   LT_BITFIELD32 gfc:4;          /**< Generic Flow Control */
   LT_BITFIELD32 vpi:8;          /**< Virtual Path Identifier */
-  LT_BITFIELD32 vci:8;          /**< Virtual Channel Identifier */
+  LT_BITFIELD32 vci:16;         /**< Virtual Channel Identifier */
   LT_BITFIELD32 pt:3;           /**< Payload Type */
   LT_BITFIELD32 clp:1;          /**< Cell Loss Priority */
   LT_BITFIELD32 hec:8;          /**< Header Error Control */
 } PACKED libtrace_atm_cell_t;
+
+/** ATM Network Node/Network Interface (NNI) Cell. */
+typedef struct libtrace_atm_nni_cell
+{
+  LT_BITFIELD32 vpi:12;         /**< Virtual Path Identifier */
+  LT_BITFIELD32 vci:16;         /**< Virtual Channel Identifier */
+  LT_BITFIELD32 pt:3;           /**< Payload Type */
+  LT_BITFIELD32 clp:1;          /**< Cell Loss Priority */
+  LT_BITFIELD32 hec:8;          /**< Header Error Control */
+} PACKED libtrace_atm_nni_cell_t;
+
+/** Captured UNI cell.
+ *
+ * Endance don't capture the HEC, presumably to keep alignment.  This 
+ * version of the \ref{libtrace_atm_cell} is used when dealing with dag
+ * captures of uni cells.
+ *
+ */
+typedef struct libtrace_atm_capture_cell
+{
+  LT_BITFIELD32 gfc:4;          /**< Generic Flow Control */
+  LT_BITFIELD32 vpi:8;          /**< Virtual Path Identifier */
+  LT_BITFIELD32 vci:16;         /**< Virtual Channel Identifier */
+  LT_BITFIELD32 pt:3;           /**< Payload Type */
+  LT_BITFIELD32 clp:1;          /**< Cell Loss Priority */
+} PACKED libtrace_atm_capture_cell_t;
+
+/** Captured NNI cell.
+ *
+ * Endance don't capture the HEC, presumably to keep alignment.  This 
+ * version of the \ref{libtrace_atm_nni_cell} is used when dealing with dag
+ * captures of nni cells.
+ *
+ */
+typedef struct libtrace_atm_nni_capture_cell
+{
+  LT_BITFIELD32 vpi:12;         /**< Virtual Path Identifier */
+  LT_BITFIELD32 vci:16;         /**< Virtual Channel Identifier */
+  LT_BITFIELD32 pt:3;           /**< Payload Type */
+  LT_BITFIELD32 clp:1;          /**< Cell Loss Priority */
+  LT_BITFIELD32 hec:8;          /**< Header Error Control */
+} PACKED libtrace_atm_nni_capture_cell_t;
 
 /** POS header */

lib/protocols.c

@@ -175 +175 @@
 
 static void *trace_get_payload_from_atm(void *link,
+                uint8_t *type, uint32_t *remaining)
+{
+        libtrace_atm_capture_cell_t *cell;
+        if (remaining && *remaining<sizeof(libtrace_atm_capture_cell_t))
+                return NULL;
+        cell=(libtrace_atm_capture_cell_t*)link;
+
+        if (type)
+                type=cell->pt;
+
+        if (remaining)
+                *remaining-=sizeof(libtrace_atm_capture_cell_t);
+
+        return ((char*)link)+sizeof(libtrace_atm_capture_cell_t);
+}
+
+static void *trace_get_payload_from_llcsnap(void *link,
                 uint16_t *type, uint32_t *remaining)
 {
@@ -181 +198 @@
 
         if (remaining) {
-                if (*remaining < sizeof(libtrace_llcsnap_t)+4)
-                        return NULL;
-                *remaining-=(sizeof(libtrace_llcsnap_t)+4);
-        }
-
-        /* advance the llc ptr +4 into the link layer.
-         * TODO: need to check what is in these 4 bytes.
-         * don't have time!
-         */
-        llc = (libtrace_llcsnap_t*)((char *)llc + 4);
+                if (*remaining < sizeof(libtrace_llcsnap_t))
+                        return NULL;
+                *remaining-=(sizeof(libtrace_llcsnap_t));
+        }
+
+        llc = (libtrace_llcsnap_t*)((char *)llc);
 
         if (type) *type = ntohs(llc->type);
@@ -302 +315 @@
                         return trace_get_payload_from_pos(link,type,remaining);
                 case TRACE_TYPE_ATM:
-                        return trace_get_payload_from_atm(link,type,remaining);
+                        l=trace_get_payload_from_atm(link,NULL,remaining);
+                        return (l ? trace_get_payload_from_llcsnap(l,
+                                                type, remaining):NULL);
                 case TRACE_TYPE_DUCK:
                         return NULL; /* duck packets have no payload! */