vlan

cephurs · Aug 9, 2014 · 5e5f65b · 5e5f65b
1 parent ba621b1
commit 5e5f65b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/pixie-timer.h b/src/pixie-timer.h
@@ -1,4 +1,4 @@
-#ifndef TIMER_H
+#ifndef PIXIE_TIMER_H
 #define PIXIE_TIMER_H
 #include <stdint.h>
 

diff --git a/src/rawsock-arp.c b/src/rawsock-arp.c
@@ -208,7 +208,10 @@ arp_resolve_sync(struct Adapter *adapter,
         /*
          * Parse the response as an ARP packet
          */
-        proto_arp_parse(&response, px, 14, length);
+        if (adapter->is_vlan)
+            proto_arp_parse(&response, px, 16, length);
+        else
+            proto_arp_parse(&response, px, 14, length);
 
         /* Is this an ARP packet? */
         if (!response.is_valid) {