commits January 2011

commits@lists.open-mesh.org

1 participants
80 discussions

batman-adv; branch, master, updated. v2010.2.0-267-g18bc4ee
by postmaster＠open-mesh.org 28 Jan '11

28 Jan '11

The following commit has been merged in the master branch: commit dbc5be15130bc186bc505460fc28796ebca50cef Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jan 28 20:25:05 2011 +0000 batman-adv: Remove declaration of batman_skb_recv batman_skb_recv can be defined in hard-interface.c as static because it is never used outside of that file. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/hard-interface.c b/hard-interface.c index 3ab9a20..ee847e3 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -34,6 +34,12 @@ /* protect update critical side of if_list - but not the content */ static DEFINE_SPINLOCK(if_list_lock); + +static int batman_skb_recv(struct sk_buff *skb, + struct net_device *dev, + struct packet_type *ptype, + struct net_device *orig_dev); + static void hardif_free_rcu(struct rcu_head *rcu) { struct batman_if *batman_if; @@ -549,8 +555,9 @@ out: /* receive a packet with the batman ethertype coming on a hard * interface */ -int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, - struct packet_type *ptype, struct net_device *orig_dev) +static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, + struct packet_type *ptype, + struct net_device *orig_dev) { struct bat_priv *bat_priv; struct batman_packet *batman_packet; diff --git a/hard-interface.h b/hard-interface.h index 30ec3b8..a42f5a4 100644 --- a/hard-interface.h +++ b/hard-interface.h @@ -35,10 +35,6 @@ struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev); int hardif_enable_interface(struct batman_if *batman_if, char *iface_name); void hardif_disable_interface(struct batman_if *batman_if); void hardif_remove_interfaces(void); -int batman_skb_recv(struct sk_buff *skb, - struct net_device *dev, - struct packet_type *ptype, - struct net_device *orig_dev); int hardif_min_mtu(struct net_device *soft_iface); void update_min_mtu(struct net_device *soft_iface); -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.2.0-267-g18bc4ee
by postmaster＠open-mesh.org 28 Jan '11

28 Jan '11

The following commit has been merged in the master branch: commit 2372ab08f667aea4da38e1a706ae29041118df7a Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jan 28 20:25:03 2011 +0000 batman-adv: Remove unused definitions Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index c239c97..b07968d 100644 --- a/main.h +++ b/main.h @@ -22,9 +22,6 @@ #ifndef _NET_BATMAN_ADV_MAIN_H_ #define _NET_BATMAN_ADV_MAIN_H_ -/* Kernel Programming */ -#define LINUX - #define DRIVER_AUTHOR "Marek Lindner <lindner_marek(a)yahoo.de>, " \ "Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>" #define DRIVER_DESC "B.A.T.M.A.N. advanced" @@ -54,7 +51,6 @@ #define NUM_WORDS (TQ_LOCAL_WINDOW_SIZE / WORD_BIT_SIZE) -#define PACKBUFF_SIZE 2000 #define LOG_BUF_LEN 8192 /* has to be a power of 2 */ #define VIS_INTERVAL 5000 /* 5 seconds */ @@ -96,15 +92,11 @@ #define DBG_ROUTES 2 /* route or hna added / changed / deleted */ #define DBG_ALL 3 -#define LOG_BUF_LEN 8192 /* has to be a power of 2 */ - /* * Vis */ -/* #define VIS_SUBCLUSTERS_DISABLED */ - /* * Kernel headers */ @@ -160,13 +152,6 @@ static inline void bat_dbg(char type __always_unused, } #endif -#define bat_warning(net_dev, fmt, arg...) \ - do { \ - struct net_device *_netdev = (net_dev); \ - struct bat_priv *_batpriv = netdev_priv(_netdev); \ - bat_dbg(DBG_ALL, _batpriv, fmt, ## arg); \ - pr_warning("%s: " fmt, _netdev->name, ## arg); \ - } while (0) #define bat_info(net_dev, fmt, arg...) \ do { \ struct net_device *_netdev = (net_dev); \ -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.2.0-267-g18bc4ee
by postmaster＠open-mesh.org 28 Jan '11

28 Jan '11

The following commit has been merged in the master branch: commit 36dd1ee606b13cf9941dd877c7de90c876bb20c1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jan 28 20:25:01 2011 +0000 batman-adv: Remove dangling declaration of hash_remove_element Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/hash.h b/hash.h index a975e07..c3939ab 100644 --- a/hash.h +++ b/hash.h @@ -51,11 +51,6 @@ struct hashtable_t { /* allocates and clears the hash */ struct hashtable_t *hash_new(int size); -/* remove element if you already found the element you want to delete and don't - * need the overhead to find it again with hash_remove(). But usually, you - * don't want to use this function, as it fiddles with hash-internals. */ -void *hash_remove_element(struct hashtable_t *hash, struct element_t *elem); - /* free only the hashtable and the hash itself. */ void hash_destroy(struct hashtable_t *hash); -- batman-adv

1 0

batctl; branch, next, updated. v2010.2.0-86-g9cbafe7
by postmaster＠open-mesh.org 28 Jan '11

28 Jan '11

The following commit has been merged in the next branch: commit 9cbafe73ede6926b6044d68236185ad8eb4e5c38 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Jan 28 20:06:01 2011 +0100 batctl: tcpdump - support LARGETAIL flag Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/tcpdump.c b/tcpdump.c index 4bff970..8a08bbf 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -384,10 +384,11 @@ static void dump_batman_frag(unsigned char *packet_buff, ssize_t buff_len, int r printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)unicast_frag_packet->orig, read_opt)); - printf("%s: FRAG, seq %hu, ttl %hhu, flags [%c], ", + printf("%s: FRAG, seq %hu, ttl %hhu, flags [%c%c], ", get_name_by_macaddr((struct ether_addr *)unicast_frag_packet->dest, read_opt), ntohs(unicast_frag_packet->seqno), unicast_frag_packet->ttl, - (unicast_frag_packet->flags & UNI_FRAG_HEAD ? 'H' : '.')); + (unicast_frag_packet->flags & UNI_FRAG_HEAD ? 'H' : '.'), + (unicast_frag_packet->flags & UNI_FRAG_LARGETAIL ? 'L' : '.')); if (unicast_frag_packet->flags & UNI_FRAG_HEAD) parse_eth_hdr(packet_buff + ETH_HLEN + sizeof(struct unicast_frag_packet), -- batctl

1 0

batctl; branch, master, updated. v2010.2.0-82-g2b6474f
by postmaster＠open-mesh.org 28 Jan '11

28 Jan '11

The following commit has been merged in the master branch: commit 2b6474f4eece2676b0ebff24e99fd679bf2ac651 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Jan 28 20:06:01 2011 +0100 batctl: tcpdump - support LARGETAIL flag Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/tcpdump.c b/tcpdump.c index 4bff970..8a08bbf 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -384,10 +384,11 @@ static void dump_batman_frag(unsigned char *packet_buff, ssize_t buff_len, int r printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)unicast_frag_packet->orig, read_opt)); - printf("%s: FRAG, seq %hu, ttl %hhu, flags [%c], ", + printf("%s: FRAG, seq %hu, ttl %hhu, flags [%c%c], ", get_name_by_macaddr((struct ether_addr *)unicast_frag_packet->dest, read_opt), ntohs(unicast_frag_packet->seqno), unicast_frag_packet->ttl, - (unicast_frag_packet->flags & UNI_FRAG_HEAD ? 'H' : '.')); + (unicast_frag_packet->flags & UNI_FRAG_HEAD ? 'H' : '.'), + (unicast_frag_packet->flags & UNI_FRAG_LARGETAIL ? 'L' : '.')); if (unicast_frag_packet->flags & UNI_FRAG_HEAD) parse_eth_hdr(packet_buff + ETH_HLEN + sizeof(struct unicast_frag_packet), -- batctl

1 0

batman-adv; branch, next, updated. v2010.2.0-278-gbc30f99
by postmaster＠open-mesh.org 27 Jan '11

27 Jan '11

The following commit has been merged in the next branch: commit bc30f99fdb06a42a5bd62a2bfe1570140c718ed8 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Wed Dec 29 16:15:19 2010 +0000 batman-adv: remove unused parameters Some function parameters are obsolete now and can be removed. Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/originator.c b/originator.c index 6b7fb6b..3c5c889 100644 --- a/originator.c +++ b/originator.c @@ -247,7 +247,7 @@ static bool purge_orig_node(struct bat_priv *bat_priv, orig_node->hna_buff_len); /* update bonding candidates, we could have lost * some candidates. */ - update_bonding_candidates(bat_priv, orig_node); + update_bonding_candidates(orig_node); } } diff --git a/routing.c b/routing.c index a8cd389..e946dc9 100644 --- a/routing.c +++ b/routing.c @@ -433,8 +433,7 @@ static char count_real_packets(struct ethhdr *ethhdr, } /* copy primary address for bonding */ -static void mark_bonding_address(struct bat_priv *bat_priv, - struct orig_node *orig_node, +static void mark_bonding_address(struct orig_node *orig_node, struct orig_node *orig_neigh_node, struct batman_packet *batman_packet) @@ -447,8 +446,7 @@ static void mark_bonding_address(struct bat_priv *bat_priv, } /* mark possible bond.candidates in the neighbor list */ -void update_bonding_candidates(struct bat_priv *bat_priv, - struct orig_node *orig_node) +void update_bonding_candidates(struct orig_node *orig_node) { int candidates; int interference_candidate; @@ -730,9 +728,8 @@ void receive_bat_packet(struct ethhdr *ethhdr, update_orig(bat_priv, orig_node, ethhdr, batman_packet, if_incoming, hna_buff, hna_buff_len, is_duplicate); - mark_bonding_address(bat_priv, orig_node, - orig_neigh_node, batman_packet); - update_bonding_candidates(bat_priv, orig_node); + mark_bonding_address(orig_node, orig_neigh_node, batman_packet); + update_bonding_candidates(orig_node); /* is single hop (direct) neighbor */ if (is_single_hop_neigh) { @@ -866,7 +863,7 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv, } static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv, - struct sk_buff *skb, size_t icmp_len) + struct sk_buff *skb) { struct orig_node *orig_node; struct icmp_packet *icmp_packet; @@ -978,7 +975,7 @@ int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if) /* TTL exceeded */ if (icmp_packet->ttl < 2) - return recv_icmp_ttl_exceeded(bat_priv, skb, hdr_size); + return recv_icmp_ttl_exceeded(bat_priv, skb); ret = NET_RX_DROP; diff --git a/routing.h b/routing.h index f108f23..725cc38 100644 --- a/routing.h +++ b/routing.h @@ -42,7 +42,6 @@ int recv_vis_packet(struct sk_buff *skb, struct batman_if *recv_if); int recv_bat_packet(struct sk_buff *skb, struct batman_if *recv_if); struct neigh_node *find_router(struct bat_priv *bat_priv, struct orig_node *orig_node, struct batman_if *recv_if); -void update_bonding_candidates(struct bat_priv *bat_priv, - struct orig_node *orig_node); +void update_bonding_candidates(struct orig_node *orig_node); #endif /* _NET_BATMAN_ADV_ROUTING_H_ */ diff --git a/send.c b/send.c index b89b9f7..77f8297 100644 --- a/send.c +++ b/send.c @@ -49,7 +49,7 @@ static unsigned long own_send_time(struct bat_priv *bat_priv) } /* when do we schedule a forwarded packet to be sent */ -static unsigned long forward_send_time(struct bat_priv *bat_priv) +static unsigned long forward_send_time(void) { return jiffies + msecs_to_jiffies(random32() % (JITTER/2)); } @@ -356,7 +356,7 @@ void schedule_forward_packet(struct orig_node *orig_node, else batman_packet->flags &= ~DIRECTLINK; - send_time = forward_send_time(bat_priv); + send_time = forward_send_time(); add_bat_packet_to_list(bat_priv, (unsigned char *)batman_packet, sizeof(struct batman_packet) + hna_buff_len, -- batman-adv

1 0

batctl; branch, next, updated. v2010.2.0-85-g46d5dd1
by postmaster＠open-mesh.org 25 Jan '11

25 Jan '11

The following commit has been merged in the next branch: commit 46d5dd16153a70542b1be04a0e79ec61a0cc67dc Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jan 25 22:02:31 2011 +0000 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(a)personaltelco.net> Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/packet.h b/packet.h index 2284e81..03ce0d3 100644 --- a/packet.h +++ b/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; -- batctl

1 0

linux integration; branch, merge/master, updated. v2.6.38-rc1-827-g9364ea6
by postmaster＠open-mesh.org 25 Jan '11

25 Jan '11

The following commit has been merged in the merge/master branch: commit 9364ea649aa4e7405b2e769aceef8a6627e1bd9c Merge: 95cf345276bb0089e00df24c3564a3c0ad6d05ce 287f80bc1649bc831bbff54bab27694ae244c5ad Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jan 25 23:52:28 2011 +0100 Merge remote branch 'origin/standalone/next' into merge/master diff --combined net/batman-adv/packet.h index 2284e81,03ce0d3..03ce0d3 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@@ -50,6 -50,7 +50,7 @@@ /* fragmentation defines */ #define UNI_FRAG_HEAD 0x01 + #define UNI_FRAG_LARGETAIL 0x02 struct batman_packet { uint8_t packet_type; diff --combined net/batman-adv/routing.c index 8828edd,a8cd389..a8cd389 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@@ -1193,7 -1193,7 +1193,7 @@@ int route_unicast_packet(struct sk_buf 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 --combined net/batman-adv/unicast.c index ee41fef,fc77079..fc77079 --- a/net/batman-adv/unicast.c +++ b/net/batman-adv/unicast.c @@@ -224,7 -224,8 +224,8 @@@ int frag_send_skb(struct sk_buff *skb, struct unicast_frag_packet *frag1, *frag2; int uc_hdr_len = sizeof(struct unicast_packet); int ucf_hdr_len = sizeof(struct unicast_frag_packet); - int data_len = skb->len; + int data_len = skb->len - uc_hdr_len; + int large_tail = 0; if (!bat_priv->primary_if) goto dropped; @@@ -232,10 -233,11 +233,11 @@@ frag_skb = dev_alloc_skb(data_len - (data_len / 2) + ucf_hdr_len); if (!frag_skb) goto dropped; + skb_reserve(frag_skb, ucf_hdr_len); unicast_packet = (struct unicast_packet *) skb->data; memcpy(&tmp_uc, unicast_packet, uc_hdr_len); - skb_split(skb, frag_skb, data_len / 2); + skb_split(skb, frag_skb, data_len / 2 + uc_hdr_len); if (my_skb_head_push(skb, ucf_hdr_len - uc_hdr_len) < 0 || my_skb_head_push(frag_skb, ucf_hdr_len) < 0) @@@ -253,8 -255,11 +255,11 @@@ 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 --combined net/batman-adv/unicast.h index e32b786,e7211c2..e7211c2 --- a/net/batman-adv/unicast.h +++ b/net/batman-adv/unicast.h @@@ -22,6 -22,8 +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 +34,25 @@@ int unicast_send_skb(struct sk_buff *sk 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_ */ diff --combined net/batman-adv/vis.c index cd4c423,f69a374..f69a374 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c @@@ -268,10 -268,10 +268,10 @@@ int vis_seq_print_text(struct seq_file buff_pos += sprintf(buff + buff_pos, "%pM,", entry->addr); - for (i = 0; i < packet->entries; i++) + for (j = 0; j < packet->entries; j++) buff_pos += vis_data_read_entry( buff + buff_pos, - &entries[i], + &entries[j], entry->addr, entry->primary); -- linux integration

1 0

batman-adv; branch, next, updated. v2010.2.0-277-g287f80b
by postmaster＠open-mesh.org 25 Jan '11

25 Jan '11

The following commit has been merged in the next branch: commit 287f80bc1649bc831bbff54bab27694ae244c5ad Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jan 25 22:02:31 2011 +0000 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(a)personaltelco.net> Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/packet.h b/packet.h index 2284e81..03ce0d3 100644 --- a/packet.h +++ b/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/routing.c b/routing.c index 8828edd..a8cd389 100644 --- a/routing.c +++ b/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/unicast.c b/unicast.c index 811f7fc..fc77079 100644 --- a/unicast.c +++ b/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/unicast.h b/unicast.h index e32b786..e7211c2 100644 --- a/unicast.h +++ b/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_ */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-277-g287f80b
by postmaster＠open-mesh.org 25 Jan '11

25 Jan '11

The following commit has been merged in the next branch: commit 65ead5a23befd5c58901e0e71a662cf753ddf777 Author: Linus Lüssing <linus.luessing(a)web.de> Date: Tue Jan 25 21:56:16 2011 +0000 batman-adv: Fix kernel panic when fetching vis data on a vis server Commit 593180d8b00bd486187841468adb53ca1edf3950 introduced a bug leading to a kernel panic when fetching the vis data on a vis server. That commit forgot to rename one variable name, which this commit fixes now. Reported-by: Russell Senior <russell(a)personaltelco.net> Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/vis.c b/vis.c index cd4c423..f69a374 100644 --- a/vis.c +++ b/vis.c @@ -268,10 +268,10 @@ int vis_seq_print_text(struct seq_file *seq, void *offset) buff_pos += sprintf(buff + buff_pos, "%pM,", entry->addr); - for (i = 0; i < packet->entries; i++) + for (j = 0; j < packet->entries; j++) buff_pos += vis_data_read_entry( buff + buff_pos, - &entries[i], + &entries[j], entry->addr, entry->primary); -- batman-adv

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2011