codelab: fe: apply compatibility fixes

Author: vmaffione

codelab/fe.c

@@ -18,7 +18,9 @@
 #include <net/netmap.h>
 #define NETMAP_WITH_LIBS
 #include <net/netmap_user.h>
-#include <netinet/ether.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 #include <netinet/tcp.h>
@@ -56,23 +58,23 @@ static inline int
 pkt_get_udp_port(const char *buf)
 {
     struct ether_header *ethh;
-    struct iphdr *iph;
+    struct ip *iph;
     struct udphdr *udph;
 
     ethh = (struct ether_header *)buf;
     if (ethh->ether_type != htons(ETHERTYPE_IP)) {
         /* Filter out non-IP traffic. */
         return 0;
     }
-    iph = (struct iphdr *)(ethh + 1);
-    if (iph->protocol != IPPROTO_UDP) {
+    iph = (struct ip *)(ethh + 1);
+    if (iph->ip_p != IPPROTO_UDP) {
         /* Filter out non-UDP traffic. */
         return 0;
     }
     udph = (struct udphdr *)(iph + 1);
 
     /* Return destination port. */
-    return ntohs(udph->dest);
+    return ntohs(udph->uh_dport);
 }
 
 static void