Changeset 4a207b8 for lib/linktypes.c

Timestamp:

03/23/07 16:41:03 (14 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:

dbdc23f

Parents:

83f2cbf

Message:

Endace POS traces are in fact PPP traces. Deal with this correctly, even when
converting between trace formats

File:

• lib/linktypes.c (modified) (5 diffs)

lib/linktypes.c

@@ -42 +42 @@
                 case TRACE_DLT_IEEE802_11_RADIO: return TRACE_TYPE_80211_RADIO;
                 case TRACE_DLT_ATM_RFC1483: return TRACE_TYPE_LLCSNAP;
+                case TRACE_DLT_PPP: return TRACE_TYPE_PPP;
                 /* Unhandled */
                 case TRACE_DLT_NULL:    /* Raw IP frame with a BSD specific
@@ -67 +68 @@
                 case TRACE_TYPE_80211_RADIO: return TRACE_DLT_IEEE802_11_RADIO;
                 case TRACE_TYPE_LLCSNAP: return TRACE_DLT_ATM_RFC1483;
+                case TRACE_TYPE_PPP:    return TRACE_DLT_PPP;
                 /* Below here are unsupported conversions */
                 /* Dispite hints to the contrary, there is no DLT
@@ -80 +82 @@
                 /* Used for test traces within WAND */
                 case TRACE_TYPE_80211_PRISM:    
+                /* Probably == PPP */
+                case TRACE_TYPE_POS:
                 /* TODO: We haven't researched these yet */
-                case TRACE_TYPE_POS:
+                case TRACE_TYPE_AAL5:
                 case TRACE_TYPE_HDLC_POS:
-                case TRACE_TYPE_AAL5:
                         break;
         }
@@ -125 +128 @@
                 case TRACE_TYPE_80211_PRISM:
                 case TRACE_TYPE_80211:
-                case TRACE_TYPE_POS:
                 case TRACE_TYPE_PFLOG:
                 case TRACE_TYPE_NONE:
                 case TRACE_TYPE_LINUX_SLL:
+                case TRACE_TYPE_PPP:
+                case TRACE_TYPE_POS:
                         break;
         }
@@ -241 +245 @@
         static libtrace_t *trace = NULL;
         switch(trace_get_link_type(packet)) {
-                case TRACE_TYPE_POS:
-                        remaining=trace_get_capture_length(packet);
-                        packet->payload=trace_get_payload_from_pos(
-                                packet->payload,NULL,&remaining);
-
-                        tmp=(char*)malloc(
-                                trace_get_capture_length(packet)
-                                +sizeof(libtrace_pcapfile_pkt_hdr_t)
-                                );
-
-                        tv=trace_get_timeval(packet);
-                        ((libtrace_pcapfile_pkt_hdr_t*)tmp)->ts_sec=tv.tv_sec;
-                        ((libtrace_pcapfile_pkt_hdr_t*)tmp)->ts_usec=tv.tv_usec;
-                        ((libtrace_pcapfile_pkt_hdr_t*)tmp)->wirelen
-                                = trace_get_wire_length(packet)-(trace_get_capture_length(packet)-remaining);
-                        ((libtrace_pcapfile_pkt_hdr_t*)tmp)->caplen
-                                = remaining;
-
-                        memcpy(tmp+sizeof(libtrace_pcapfile_pkt_hdr_t),
-                                        packet->payload,
-                                        (size_t)remaining);
-                        if (packet->buf_control == TRACE_CTRL_EXTERNAL) {
-                                packet->buf_control=TRACE_CTRL_PACKET;
-                        }
-                        else {
-                                free(packet->buffer);
-                        }
-                        packet->buffer=tmp;
-                        packet->header=tmp;
-                        packet->payload=tmp+sizeof(libtrace_pcapfile_pkt_hdr_t);
-                        packet->type=pcap_dlt_to_rt(TRACE_DLT_RAW);
-                        
-                        if (trace == NULL) {
-                                trace = trace_create_dead("pcap:-");
-                        }
-
-                        packet->trace=trace;
-
-                        return true;
                 case TRACE_TYPE_ATM:
                         remaining=trace_get_capture_length(packet);