[v2,2/2] batman-adv: Calculate correct size for merged packets
Commit Message
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>
---
This patch is completely untested and is currently only to support marec and
russell-- during their debugging sessions. Maybe it doesn't even compile.
Reduced size of patch slightly.
batman-adv/packet.h | 1 +
batman-adv/routing.c | 24 +++++++++++++++++++++++-
batman-adv/unicast.c | 8 ++++++--
3 files changed, 30 insertions(+), 3 deletions(-)
Comments
On Friday 21 January 2011 00:00:19 Sven Eckelmann wrote:
> This patch is completely untested and is currently only to support marec
> and russell-- during their debugging sessions. Maybe it doesn't even
> compile.
Thanks Sven! I think this is another bugfix we'll need for the fragmentation.
> --- a/batman-adv/routing.c
> +++ b/batman-adv/routing.c
> @@ -1243,6 +1243,28 @@ static int check_unicast_packet(struct sk_buff *skb,
> int hdr_size) return 0;
> }
>
> +static int frag_can_reassemble(struct sk_buff *skb, int mtu)
I'd suggest we move this function into unicast.c to let it join all the other
fragmentation related functions there.
Apart from that it looks good. We might want to do some more testing though.
Regards,
Marek
@@ -50,6 +50,7 @@
/* fragmentation defines */
#define UNI_FRAG_HEAD 0x01
+#define UNI_FRAG_LARGETAIL 0x02
struct batman_packet {
uint8_t packet_type;
@@ -1243,6 +1243,28 @@ static int check_unicast_packet(struct sk_buff *skb, int hdr_size)
return 0;
}
+static 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);
+ merged_size += uneven_correction;
+
+ return merged_size <= mtu;
+}
+
int route_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if,
int hdr_size)
{
@@ -1297,7 +1319,7 @@ int route_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if,
}
if (unicast_packet->packet_type == BAT_UNICAST_FRAG &&
- 2 * skb->len - hdr_size <= neigh_node->if_incoming->net_dev->mtu) {
+ frag_can_reassemble(skb, neigh_node->if_incoming->net_dev->mtu)) {
ret = frag_reassemble_skb(skb, bat_priv, &new_skb);
@@ -231,6 +231,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;
@@ -260,8 +261,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));