Changeset a857389 for lib/format_dag25.c

Timestamp:

02/15/18 17:59:50 (3 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, etsilive, master, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

5a70a80

Parents:

3004d6c

git-author:

Anthony Coddington <anthony.coddington@…> (02/14/18 16:03:04)

git-committer:

Shane Alcock <salcock@…> (02/15/18 17:59:50)

Message:

Initial support for ERF provenance records

Update erftypes.h with TYPE_META (27).
Check for ERF_TYPE_MAX rather than some arbitrary type in ERF sanity checks. In Wireshark we recently completely removed these checks as there are only a few types before TYPE_PAD/ERF_TYPE_MAX, but leave them in for now.
Add TRACE_TYPE_ERF_META for provenance record payload.
Continue to use TRACE_RT_DATA_ERF as provenance is a valid ERF record. Note: this means that LIBTRACE_IS_META_PACKET() will currently return FALSE which may confuse some tools. Other places in the code also tend to check for TRACE_TYPE_NONDATA which isn't true here either.
Return zero for wire length of provenance records.
Don't allow snapping them (just return the same value).
Skip provenance records in l2 parsers and trace_get_payload_from_meta().
Return provenance payload for trace_get_packet_meta().

Also add support for a couple of missing ERF_TYPE_ETH_COLOR variants.

File:

• lib/format_dag25.c (modified) (2 diffs)

lib/format_dag25.c

@@ -187 +187 @@
                 switch(erfptr->type) {
                         case TYPE_ETH:
+                        case TYPE_COLOR_ETH:
                         case TYPE_DSM_COLOR_ETH:
+                        case TYPE_COLOR_HASH_ETH:
                                 return 2;
                         default:                return 0;
@@ -1050 +1052 @@
         /* No loss counter for DSM coloured records - have to use some
          * other API */
-        if (erfptr->type == TYPE_DSM_COLOR_ETH) {
+        if (erf_is_color_type(erfptr->type)) {
                 /* TODO */
         } else {