Changeset f7bcbfb for lib

Timestamp:

02/21/14 10:38:06 (7 years ago)

Author:

Shane Alcock <salcock@…>

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:

a31777e

Parents:

86bec15

Message:

Fixed warnings that cropped up when building with clang

• Added proper "unknown" or "error" values to some libtrace enums. This removes the need for the hideous ==~0U checks that we used to do to check for errors and should be a bit more robust.
• Fixed potential strncat bugs in one of the libpacketdump decoders.
• Changed some null-ops in ior-peek as our current method was triggering warnings.

Location:

lib

Files:

• format_erf.c (modified) (1 diff)
• format_pcap.c (modified) (1 diff)
• format_pcapfile.c (modified) (2 diffs)
• libtrace.h.in (modified) (3 diffs)
• linktypes.c (modified) (4 diffs)
• protocols_l2.c (modified) (6 diffs)
• protocols_pktmeta.c (modified) (2 diffs)
• trace.c (modified) (4 diffs)

lib/format_erf.c

@@ -637 +637 @@
                 /* Flags. Can't do this */
                 memset(&erfhdr.flags,1,sizeof(erfhdr.flags));
-                if (trace_get_direction(packet)!=~0U)
+                if (trace_get_direction(packet)!=TRACE_DIR_UNKNOWN)
                         erfhdr.flags.iface = trace_get_direction(packet);
 

lib/format_pcap.c

@@ -463 +463 @@
          * pop off the top header until it can be converted
          */
-        while (libtrace_to_pcap_linktype(linktype)==~0U) {
+        while (libtrace_to_pcap_linktype(linktype)==TRACE_DLT_ERROR) {
                 if (!demote_packet(packet)) {
                         trace_set_err_out(libtrace, 

lib/format_pcapfile.c

@@ -426 +426 @@
         /* Silently discard RT metadata packets and packets with an
          * unknown linktype. */
-        if (linktype == TRACE_TYPE_NONDATA || linktype == ~0U) {
+        if (linktype == TRACE_TYPE_NONDATA || linktype == TRACE_TYPE_UNKNOWN) {
                 return 0;
         }
@@ -433 +433 @@
          * pop off the top header until it can be converted
          */
-        while (libtrace_to_pcap_linktype(linktype)==~0U) {
+        while (libtrace_to_pcap_linktype(linktype)==TRACE_DLT_ERROR) {
                 if (!demote_packet(packet)) {
                         trace_set_err_out(out, 

lib/libtrace.h.in

@@ -249 +249 @@
  */
 typedef enum {
+        /* Special value used to indicate a failure to convert to libtrace
+         * DLT */
+        TRACE_DLT_ERROR = -1,
+        
         /** pcap documents this as having the Address Family value in host byte order as the 
           * framing.  Ugly? Yes.
@@ -279 +283 @@
 /** Enumeration of link layer types supported by libtrace */
 typedef enum { 
+       TRACE_TYPE_UNKNOWN = -1,         /**< Unable to determine link type */
     /* TRACE_TYPE_LEGACY = 0            Obsolete */
        TRACE_TYPE_HDLC_POS = 1,         /**< HDLC over POS */
@@ -487 +492 @@
         TRACE_DIR_OUTGOING = 0,         /**< Packets originating "inside" */
         TRACE_DIR_INCOMING = 1,         /**< Packets originating "outside" */
-        TRACE_DIR_OTHER    = 2          /**< Packets with an unknown direction, or one that's unknown */
+        TRACE_DIR_OTHER    = 2,         /**< Packets with an unknown direction, or one that's unknown */
+        TRACE_DIR_UNKNOWN = -1,         /**< No direction information available */
 } libtrace_direction_t;
 

lib/linktypes.c

@@ -67 +67 @@
                 case TRACE_DLT_OPENBSD_LOOP: return TRACE_TYPE_OPENBSD_LOOP;
                 /* Unhandled */
+                case TRACE_DLT_ERROR:
                 case TRACE_DLT_NULL:    /* Raw IP frame with a BSD specific
                                          * header If you want raw L3 headers
@@ -73 +74 @@
                         break;
         }
-        return ~0U;
+        return TRACE_TYPE_UNKNOWN;
 }
 
@@ -115 +116 @@
                 case TRACE_TYPE_NONDATA:
                         break;
-        }
-        return ~0U;
+                case TRACE_TYPE_UNKNOWN:
+                        break;
+        }
+        return TRACE_DLT_ERROR;
 }
 
@@ -203 +206 @@
                 case TRACE_TYPE_NONDATA:
                 case TRACE_TYPE_OPENBSD_LOOP:
+                case TRACE_TYPE_UNKNOWN:
                         break;
         }

lib/protocols_l2.c

@@ -390 +390 @@
                 case TRACE_TYPE_PFLOG:
                         break;
+                case TRACE_TYPE_UNKNOWN:
+                        return NULL;
         }
 
@@ -423 +425 @@
                                 case TRACE_TYPE_PFLOG:
                                         break;
+                                case TRACE_TYPE_UNKNOWN:
+                                        return NULL;
                         }
                         
@@ -464 +468 @@
         void *l;
 
-        if (linktype == ~0U) {
+        if (linktype == TRACE_TYPE_UNKNOWN) {
                 fprintf(stderr, "Unable to determine linktype for packet\n");
                 return NULL;
@@ -486 +490 @@
                 case TRACE_TYPE_METADATA:
                 case TRACE_TYPE_NONDATA:
+                case TRACE_TYPE_UNKNOWN:
                         return NULL;
 
@@ -587 +592 @@
                 case TRACE_TYPE_NONDATA:
                 case TRACE_TYPE_OPENBSD_LOOP:
+                case TRACE_TYPE_UNKNOWN:
                         return NULL;
 
@@ -635 +641 @@
                 case TRACE_TYPE_NONDATA:
                 case TRACE_TYPE_OPENBSD_LOOP:
+                case TRACE_TYPE_UNKNOWN:
                         /* No MAC address */
                         return NULL;

lib/protocols_pktmeta.c

@@ -162 +162 @@
                 case TRACE_TYPE_NONDATA:
                 case TRACE_TYPE_OPENBSD_LOOP:
+                case TRACE_TYPE_UNKNOWN:
                         return NULL;
         }
@@ -218 +219 @@
                 case TRACE_TYPE_NONDATA:
                 case TRACE_TYPE_OPENBSD_LOOP:
+                case TRACE_TYPE_UNKNOWN:
                         /* In this case, the pointer passed in does not point
                          * to a metadata header and so we cannot get the

lib/trace.c

@@ -1075 +1075 @@
         if (packet->link_type == 0) {
                 if (!packet->trace->format->get_link_type)
-                        return (libtrace_linktype_t)-1;
+                        return TRACE_TYPE_UNKNOWN;
                 ((libtrace_packet_t *)packet)->link_type =
                         packet->trace->format->get_link_type(packet);
@@ -1216 +1216 @@
                         return -1;
                 }
-                if (libtrace_to_pcap_dlt(linktype) == ~1U) {
+                if (libtrace_to_pcap_dlt(linktype) == TRACE_DLT_ERROR) {
                         trace_set_err(packet->trace,TRACE_ERR_BAD_FILTER,
                                         "Unknown pcap equivalent linktype");
@@ -1267 +1267 @@
                 return 1;       
 
-        if (libtrace_to_pcap_dlt(linktype)==~0U) {
+        if (libtrace_to_pcap_dlt(linktype)==TRACE_DLT_ERROR) {
                 
                 /* If we cannot get a suitable DLT for the packet, it may
@@ -1280 +1280 @@
                 free_packet_needed=true;
 
-                while (libtrace_to_pcap_dlt(linktype) == ~0U) {
+                while (libtrace_to_pcap_dlt(linktype) == TRACE_DLT_ERROR) {
                         if (!demote_packet(packet_copy)) {
                                 trace_set_err(packet->trace,