1 files changed, 37 insertions, 13 deletions

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 319f2906c71a..2f1f88923df8 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -29,6 +29,7 @@
 #include "unicast.h"
 #include "bridge_loop_avoidance.h"
 #include "distributed-arp-table.h"
+#include "network-coding.h"
 
 static int batadv_route_unicast_packet(struct sk_buff *skb,
                                        struct batadv_hard_iface *recv_if);
@@ -548,6 +549,17 @@ batadv_find_ifalter_router(struct batadv_orig_node *primary_orig,
         return router;
 }
 
+/**
+ * batadv_check_unicast_packet - Check for malformed unicast packets
+ * @bat_priv: the bat priv with all the soft interface information
+ * @skb: packet to check
+ * @hdr_size: size of header to pull
+ *
+ * Check for short header and bad addresses in given packet. Returns negative
+ * value when check fails and 0 otherwise. The negative value depends on the
+ * reason: -ENODATA for bad header, -EBADR for broadcast destination or source,
+ * and -EREMOTE for non-local (other host) destination.
+ */
 static int batadv_check_unicast_packet(struct batadv_priv *bat_priv,
                                        struct sk_buff *skb, int hdr_size)
 {
@@ -555,21 +567,21 @@ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv,
 
         /* drop packet if it has not necessary minimum size */
         if (unlikely(!pskb_may_pull(skb, hdr_size)))
-                return -1;
+                return -ENODATA;
 
         ethhdr = (struct ethhdr *)skb_mac_header(skb);
 
         /* packet with unicast indication but broadcast recipient */
         if (is_broadcast_ether_addr(ethhdr->h_dest))
-                return -1;
+                return -EBADR;
 
         /* packet with broadcast sender address */
         if (is_broadcast_ether_addr(ethhdr->h_source))
-                return -1;
+                return -EBADR;
 
         /* not for me */
         if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest))
-                return -1;
+                return -EREMOTE;
 
         return 0;
 }
@@ -852,15 +864,18 @@ static int batadv_route_unicast_packet(struct sk_buff *skb,
         /* decrement ttl */
         unicast_packet->header.ttl--;
 
-        /* Update stats counter */
-        batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD);
-        batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES,
-                           skb->len + ETH_HLEN);
-
-        /* route it */
-        if (batadv_send_skb_to_orig(skb, orig_node, recv_if))
+        /* network code packet if possible */
+        if (batadv_nc_skb_forward(skb, neigh_node, ethhdr)) {
+                ret = NET_RX_SUCCESS;
+        } else if (batadv_send_skb_to_orig(skb, orig_node, recv_if)) {
                 ret = NET_RX_SUCCESS;
 
+                /* Update stats counter */
+                batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD);
+                batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES,
+                                   skb->len + ETH_HLEN);
+        }
+
 out:
         if (neigh_node)
                 batadv_neigh_node_free_ref(neigh_node);
@@ -1035,7 +1050,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
         struct batadv_unicast_4addr_packet *unicast_4addr_packet;
         uint8_t *orig_addr;
         struct batadv_orig_node *orig_node = NULL;
-        int hdr_size = sizeof(*unicast_packet);
+        int check, hdr_size = sizeof(*unicast_packet);
         bool is4addr;
 
         unicast_packet = (struct batadv_unicast_packet *)skb->data;
@@ -1046,7 +1061,16 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
         if (is4addr)
                 hdr_size = sizeof(*unicast_4addr_packet);
 
-        if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)
+        /* function returns -EREMOTE for promiscuous packets */
+        check = batadv_check_unicast_packet(bat_priv, skb, hdr_size);
+
+        /* Even though the packet is not for us, we might save it to use for
+         * decoding a later received coded packet
+         */
+        if (check == -EREMOTE)
+                batadv_nc_skb_store_sniffed_unicast(bat_priv, skb);
+
+        if (check < 0)
                 return NET_RX_DROP;
 
         if (!batadv_check_unicast_ttvn(bat_priv, skb))