batman-adv: Calculate correct size for merged packets

The routing algorithm must be able to decide if a fragment can be merged with
the missing part and still be passed to a forwarding interface. The fragments
can only differ by one byte in case that the original payload had an uneven
length. In that situation the sender has to inform all possible receivers that
the tail is one byte longer using the flag UNI_FRAG_LARGETAIL.

The combination of UNI_FRAG_LARGETAIL and UNI_FRAG_HEAD flag makes it possible
to calculate the correct length for even and uneven sized payloads.

The original formula missed to add the unicast header at all and forgot to
remove the fragment header of the second fragment. This made the results highly
unreliable and only useful for machines with large differences between the
configured MTUs.

Reported-by: Russell Senior <russell@personaltelco.net>
Reported-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index 2284e8129cb26b8d5554538cd71b7722deea3f13..03ce0d314c9eef689edbb1b7e3460dcc1e6fa676 100644 (file)
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -50,6 +50,7 @@
 
 /* fragmentation defines */
 #define UNI_FRAG_HEAD 0x01
+#define UNI_FRAG_LARGETAIL 0x02
 
 struct batman_packet {
        uint8_t  packet_type;

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 8828eddd3f72bc7c704c994bd20a15065ccd7af7..a8cd3897b7d0580f644c40e6becbc10ea3fff34c 100644 (file)
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -1193,7 +1193,7 @@ int route_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if,
                                     dstaddr);
 
        if (unicast_packet->packet_type == BAT_UNICAST_FRAG &&
-           2 * skb->len - hdr_size <= batman_if->net_dev->mtu) {
+           frag_can_reassemble(skb, batman_if->net_dev->mtu)) {
 
                ret = frag_reassemble_skb(skb, bat_priv, &new_skb);
 

diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index 811f7fc7932dac7e907d77f858682d79136eacd2..fc77079b18bb9d37c437faab7c17314d50e7ca66 100644 (file)
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -225,6 +225,7 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
        int uc_hdr_len = sizeof(struct unicast_packet);
        int ucf_hdr_len = sizeof(struct unicast_frag_packet);
        int data_len = skb->len - uc_hdr_len;
+       int large_tail = 0;
 
        if (!bat_priv->primary_if)
                goto dropped;
@@ -254,8 +255,11 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
        memcpy(frag1->orig, bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
        memcpy(frag2, frag1, sizeof(struct unicast_frag_packet));
 
-       frag1->flags |= UNI_FRAG_HEAD;
-       frag2->flags &= ~UNI_FRAG_HEAD;
+       if (data_len & 1)
+               large_tail = UNI_FRAG_LARGETAIL;
+
+       frag1->flags = UNI_FRAG_HEAD | large_tail;
+       frag2->flags = large_tail;
 
        frag1->seqno = htons((uint16_t)atomic_inc_return(
                             &batman_if->frag_seqno));

diff --git a/net/batman-adv/unicast.h b/net/batman-adv/unicast.h
index e32b7867a9a4a08828cb534b7e7e76b7777da74b..e7211c279201f8e45c40565b4ebe360858f77b39 100644 (file)
--- a/net/batman-adv/unicast.h
+++ b/net/batman-adv/unicast.h
@@ -22,6 +22,8 @@
 #ifndef _NET_BATMAN_ADV_UNICAST_H_
 #define _NET_BATMAN_ADV_UNICAST_H_
 
+#include "packet.h"
+
 #define FRAG_TIMEOUT 10000     /* purge frag list entrys after time in ms */
 #define FRAG_BUFFER_SIZE 6     /* number of list elements in buffer */
 
@@ -32,4 +34,25 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv);
 int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
                  struct batman_if *batman_if, uint8_t dstaddr[]);
 
+static inline int frag_can_reassemble(struct sk_buff *skb, int mtu)
+{
+       struct unicast_frag_packet *unicast_packet;
+       int uneven_correction = 0;
+       unsigned int merged_size;
+
+       unicast_packet = (struct unicast_frag_packet *)skb->data;
+
+       if (unicast_packet->flags & UNI_FRAG_LARGETAIL) {
+               if (unicast_packet->flags & UNI_FRAG_HEAD)
+                       uneven_correction = 1;
+               else
+                       uneven_correction = -1;
+       }
+
+       merged_size = (skb->len - sizeof(struct unicast_frag_packet)) * 2;
+       merged_size += sizeof(struct unicast_packet) + uneven_correction;
+
+       return merged_size <= mtu;
+}
+
 #endif /* _NET_BATMAN_ADV_UNICAST_H_ */