Changeset a857389 for lib/format_erf.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_erf.c (modified) (8 diffs)

lib/format_erf.c

@@ -120 +120 @@
 } erf_index_t;
 
-
 /* Ethernet packets have a 2 byte padding before the packet
  * so that the IP header is aligned on a 32 bit boundary.
@@ -132 +131 @@
                 dag_record_t *erfptr = (dag_record_t *)packet->header;
                 switch((erfptr->type & 0x7f)) {
-                        case TYPE_ETH:          
+                        case TYPE_ETH:
+                        case TYPE_COLOR_ETH:
                         case TYPE_DSM_COLOR_ETH:
+                        case TYPE_COLOR_HASH_ETH:
                                 return 2;
                         default:                return 0;
@@ -144 +145 @@
                 }
         }
+}
+
+int erf_is_color_type(uint8_t erf_type)
+{
+        switch(erf_type & 0x7f) {
+                case TYPE_COLOR_HDLC_POS:
+                case TYPE_DSM_COLOR_HDLC_POS:
+                case TYPE_COLOR_ETH:
+                case TYPE_DSM_COLOR_ETH:
+                case TYPE_COLOR_HASH_POS:
+                case TYPE_COLOR_HASH_ETH:
+                        return 1;
+        }
+
+        return 0;
 }
 
@@ -200 +216 @@
         }
         /* Is this a proper typed packet */
-        if ((erf->type & 0x7f) > TYPE_AAL2) {
+        if ((erf->type & 0x7f) > ERF_TYPE_MAX) {
                 return 0;
         }
@@ -464 +480 @@
 
         /* Check for loss */
-        if ((erfptr->type & 0x7f) == TYPE_DSM_COLOR_ETH) {
+        if (erf_is_color_type(erfptr->type)) {
                 /* No idea how we get this yet */
 
@@ -521 +537 @@
 
         /* Unknown/corrupt */
-        if ((((dag_record_t *)packet->buffer)->type & 0x7f) >= TYPE_RAW_LINK) {
+        if ((((dag_record_t *)packet->buffer)->type & 0x7f) > ERF_TYPE_MAX) {
                 trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, 
                                 "Corrupt or Unknown ERF type");
@@ -758 +774 @@
         dag_record_t *erfptr = 0;
         erfptr = (dag_record_t *)packet->header;
+
+        if ((erfptr->type & 0x7f) == TYPE_META)
+                return 0;
+
         return ntohs(erfptr->wlen);
 }
@@ -764 +784 @@
         dag_record_t *erfptr = 0;
         assert(packet);
-        if(size  > trace_get_capture_length(packet)) {
+        erfptr = (dag_record_t *)packet->header;
+
+        if(size > trace_get_capture_length(packet) || (erfptr->type & 0x7f) == TYPE_META) {
                 /* Can't make a packet larger */
                 return trace_get_capture_length(packet);
         }
+
         /* Reset cached capture length - otherwise we will both return the
          * wrong value here and subsequent get_capture_length() calls will
          * return the wrong value. */
         packet->capture_length = -1;
-        erfptr = (dag_record_t *)packet->header;
         erfptr->rlen = htons(size + erf_get_framing_length(packet));
         return trace_get_capture_length(packet);