Changeset 1014

Timestamp:

09/21/06 16:29:24 (7 years ago)

Author:

smr26

Message:

trace_get_payload_from_linux_sll now returns a pointer to the start of the next header intead of trying to jump through the next one. It also returns the hardware address type instead of the protocol type now. trace_get_payload_from_link has been updated to recurse to step through the protocols. This makes _from_linux_sll more like the rest of the functions in protocols.c.
We also now have arphrd_type_to_libtrace() and libtrace_to_arphrd_type() functions to help with this.

Location:

trunk/lib

Files:

• linktypes.c (modified) (3 diffs)
• protocols.c (modified) (4 diffs)

trunk/lib/linktypes.c

@@ -85 +85 @@
                 case TRACE_TYPE_ATM:    return TYPE_ATM;
                 case TRACE_TYPE_AAL5:   return TYPE_AAL5;
+        }
+        return -1;
+}
+
+libtrace_linktype_t arphrd_type_to_libtrace(unsigned int arphrd) {
+        switch(arphrd) {
+                case ARPHRD_ETHER: return TRACE_TYPE_ETH;       
+                case ARPHRD_IEEE80211: return TRACE_TYPE_80211;
+                case ARPHRD_80211_RADIOTAP: return TRACE_TYPE_80211_RADIO;
+        }
+        return ~0;
+}
+
+unsigned int libtrace_to_arphrd_type(libtrace_linktype_t linktype) {
+        switch(linktype) {
+                case TRACE_TYPE_ETH: return ARPHRD_ETHER;
+                case TRACE_TYPE_80211: return ARPHRD_IEEE80211;
+                case TRACE_TYPE_80211_RADIO: return ARPHRD_80211_RADIOTAP;
         }
         return -1;
@@ -121 +139 @@
                                 hdr->pkttype=TRACE_SLL_OUTGOING;
                                 if (pcap_dlt_to_libtrace(rt_to_pcap_dlt(packet->type))==TRACE_TYPE_ETH)
-                                        hdr->hatype = ARPHRD_ETHER;
+                                        hdr->hatype = htons(ARPHRD_ETHER);
                                 else
-                                        hdr->hatype = ARPHRD_PPP;
+                                        hdr->hatype = htons(ARPHRD_PPP);
                                 trace_get_payload_from_link(
                                         trace_get_link(packet),
@@ -172 +190 @@
         switch(trace_get_link_type(packet)) {
                 case TRACE_TYPE_LINUX_SLL:
-                        switch(((libtrace_sll_header_t*)packet->payload)
-                                        ->hatype) {
+                        switch(ntohs(((libtrace_sll_header_t*)packet->payload)
+                                        ->hatype)) {
                                 case ARPHRD_PPP:
                                         packet->type=pcap_dlt_to_rt(DLT_NULL);

trunk/lib/protocols.c

@@ -110 +110 @@
 }
 
+/* NB: type is returned as an ARPHRD_ type for SLL*/
 static void *trace_get_payload_from_linux_sll(void *link,
                 uint16_t *type, uint32_t *remaining) 
@@ -125 +126 @@
 
         /* What kind of wacked out header, has this in host order?! */
-        if (type) *type = htons(sll->protocol); 
-
-        ret=(void*)((char*)sll+sizeof(*sll));
-
-        switch(sll->hatype) {
-                case ARPHRD_PPP:
-                        break;
-                case ARPHRD_ETHER:
-                        ret=trace_get_payload_from_ethernet(ret,type,remaining);
-                        break;
-                default:
-                        /* Unknown hardware type */
-                        return NULL;
-        }
-
-        return ret;
+        //if (type) *type = htons(sll->protocol); 
+
+        if (type) *type = ntohs(sll->hatype);
+
+        return (void*)((char*)sll+sizeof(*sll));
+
 }
 
@@ -240 +231 @@
 {
         void *l = NULL;
-
+        uint16_t dummytype;
+        
         switch(linktype) {
                 case TRACE_TYPE_80211_PRISM:
@@ -260 +252 @@
                         return link; /* I love the simplicity */
                 case TRACE_TYPE_LINUX_SLL:
-                        return trace_get_payload_from_linux_sll(link,type,remaining);
+                        l = trace_get_payload_from_linux_sll(link,&dummytype,remaining);
+                        if (type) *type = dummytype;
+                        return (l ? trace_get_payload_from_link(l,
+                                                arphrd_type_to_libtrace(dummytype), type, remaining) : NULL);
+                        
                 case TRACE_TYPE_PFLOG:
                         return trace_get_payload_from_pflog(link,type,remaining);