Changeset 787

Timestamp:

05/06/06 02:24:13 (7 years ago)

Author:

perry

Message:

Make sure we set ->protocol correctly
->type is an rt type, not a libtrace type

File:

• trunk/lib/linktypes.c (modified) (3 diffs)

trunk/lib/linktypes.c

@@ -102 +102 @@
                                 return; /* Unnecessary */
 
+                        case TRACE_TYPE_NONE:
                         case TRACE_TYPE_ETH:
                                 /* This should be easy, just prepend the header */
@@ -113 +114 @@
 
                                 hdr->pkttype=0; /* "outgoing" */
-                                hdr->hatype = ARPHRD_ETHER;
+                                if (pcap_dlt_to_libtrace(rt_to_pcap_dlt(packet->type))==TRACE_TYPE_ETH)
+                                        hdr->hatype = ARPHRD_ETHER;
+                                else
+                                        hdr->hatype = ARPHRD_PPP;
+                                trace_get_payload_from_link(
+                                        trace_get_link(packet),
+                                        trace_get_link_type(packet),
+                                        &hdr->protocol,
+                                        NULL);
                                 break;
                         default:
@@ -135 +144 @@
                 packet->header=tmpbuffer;
                 packet->payload=tmpbuffer+trace_get_framing_length(packet);
-                packet->type=TRACE_TYPE_LINUX_SLL;
+                packet->type=pcap_dlt_to_rt(TRACE_DLT_LINUX_SLL);
                 return;
         }