B.A.T.M.A.N

b.a.t.m.a.n@lists.open-mesh.org

15 participants
4308 discussions

[B.A.T.M.A.N.] batman adv to batmand
by Conner, Eric 05 Jan '10

05 Jan '10

Can batman adv nodes see batmand nodes and vice versa? Eric C. Conner Senior Software Engineer QinetiQ North America Technology Solutions Group 110 Corporate Dr.; Unit 2 Portsmouth, NH 03801 Work: (603)427-0205 ext. 208 Eric.Conner(a)qinetiq-na.com www.qinetiq-na.com

3 2

[B.A.T.M.A.N.] batman-adv gateway support
by Marek Lindner 05 Jan '10

05 Jan '10

Hi, batman-adv still lacks the well-known gateway functionality the batman daemon offered since quite a while. Since batman-adv works sufficiently well without it and due to the ongoing debate whether a layer 2 mesh protocol should interfere with layer 3 this topic has been neglected for a while. In multi-gateway environments proper gateway support is a must have. Therefore I hereby propose a set of patches to add this functionality. Comments welcome! What you get: * The first patch will add gateway announce / handling support to the protocol. You will have additional /proc files to switch gateway modes, get a list of gateways in the network and see the currently selected best gateway. * The second patch simply adds batctl support to conveniently configure the gateway setup. * The third patch checks whether locally received packets are DHCP queries and forwards them via uncicast to the best gateway instead of broadcasting them. Note: * These patches change the routing protocol, therefore the compat version is increased. This (intentionally) breaks interoperability with older batman-adv versions! * Only DHCP traffic gets redirected to the best gateway - no other traffic is affected. This is part of the compromise we achieved during the last discussions. * IPv6 support is still missing but should be fairly easy to add. Any volunteers ? Regards, Marek

6 15

[B.A.T.M.A.N.] sha256 for batmand advanced
by Conner, Eric 04 Jan '10

04 Jan '10

Does anyone have a sha256 for batmand-adv-kernelland-0.2.tar.gz? Thanks

2 1

Re: [B.A.T.M.A.N.] batman-adv gateway support
by Sven Eckelmann 04 Jan '10

04 Jan '10

predrag balorda wrote: > I've done it 3 times in the last few days and nothing ever happened. > Just as I wrote to the list a removal confirmation arrived. Yes, I did it for you as explained. Best regards, Sven

1 0

[B.A.T.M.A.N.] Missing unlocks
by Andrew Lunn 01 Jan '10

01 Jan '10

Hi Simon I just built batman-adv with make C=1 so that sparse it used to check the code. It found a few missing unlocks... drivers/staging/batman-adv/routing.c:585:12: warning: context imbalance in 'recv_my_icmp_packet' - different lock contexts for basic block This is the return if the skb_copy() fails. drivers/staging/batman-adv/routing.c:640:12: warning: context imbalance in 'recv_icmp_ttl_exceeded' - different lock contexts for basic block Same again. drivers/staging/batman-adv/routing.c:695:5: warning: context imbalance in 'recv_icmp_packet' - different lock contexts for basic block and same again... in each case you are missing a spin_unlock_irqrestore(&orig_hash_lock, flags); before the return NET_RX_DROP; Andrew

2 1

[B.A.T.M.A.N.] batmand advanced recipe for bitbake
by Conner, Eric 01 Jan '10

01 Jan '10

Has anyone created a BATMAN Advanced recipe for bitbake openembedded.dev? thanks

2 1

[B.A.T.M.A.N.] [PATCH 2/3] batman-adv: No deact of aggregation on wrong input
by Linus Lüssing 01 Jan '10

01 Jan '10

A non-integer changes the aggregation mode. Therefore this patch changes the behaviour to explicitly check strict_strtoul()'s return code. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- proc.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/proc.c b/proc.c index e7b7bf3..232efe3 100644 --- a/proc.c +++ b/proc.c @@ -433,6 +433,7 @@ static ssize_t proc_aggr_write(struct file *file, const char __user *buffer, char *aggr_string; int not_copied = 0; unsigned long aggregation_enabled_tmp; + int retval; aggr_string = kmalloc(count, GFP_KERNEL); @@ -442,22 +443,21 @@ static ssize_t proc_aggr_write(struct file *file, const char __user *buffer, not_copied = copy_from_user(aggr_string, buffer, count); aggr_string[count - not_copied - 1] = 0; - strict_strtoul(aggr_string, 10, &aggregation_enabled_tmp); + retval = strict_strtoul(aggr_string, 10, &aggregation_enabled_tmp); - if ((aggregation_enabled_tmp != 0) && (aggregation_enabled_tmp != 1)) { + if (retval == -EINVAL || aggregation_enabled_tmp > 1) { printk(KERN_ERR "batman-adv:Aggregation can only be enabled (1) or disabled (0), given value: %li\n", aggregation_enabled_tmp); - goto end; + } + else { + printk(KERN_INFO "batman-adv:Changing aggregation from: %s (%i) to: %s (%li)\n", + (atomic_read(&aggregation_enabled) == 1 ? + "enabled" : "disabled"), + atomic_read(&aggregation_enabled), + (aggregation_enabled_tmp == 1 ? "enabled" : "disabled"), + aggregation_enabled_tmp); + atomic_set(&aggregation_enabled, (unsigned)aggregation_enabled_tmp); } - printk(KERN_INFO "batman-adv:Changing aggregation from: %s (%i) to: %s (%li)\n", - (atomic_read(&aggregation_enabled) == 1 ? - "enabled" : "disabled"), - atomic_read(&aggregation_enabled), - (aggregation_enabled_tmp == 1 ? "enabled" : "disabled"), - aggregation_enabled_tmp); - - atomic_set(&aggregation_enabled, (unsigned)aggregation_enabled_tmp); -end: kfree(aggr_string); return count; } -- 1.6.5.7

2 1

[B.A.T.M.A.N.] [PATCH 3/3] batman-adv: Remove unused variable
by Linus Lüssing 01 Jan '10

01 Jan '10

The variable 'flag' is never being used in this function, therefore removing it. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- soft-interface.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index 4d4d542..bc0217b 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -148,7 +148,6 @@ struct net_device_stats *interface_stats(struct net_device *dev) int interface_set_mac_addr(struct net_device *dev, void *p) { struct sockaddr *addr = p; - unsigned long flags; if (!is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; -- 1.6.5.7

2 1

[B.A.T.M.A.N.] Coccinelle tests?
by Andrew Lunn 01 Jan '10

01 Jan '10

Hi Folks I asked Julai Lawall to run her Coccinelle (http://coccinelle.lip6.fr/) test suite on batman-adv. Here are her results. Some of these issues are already fixed in subversion, others are real bugs, and some are nice to fix. Andrew ----- Forwarded message from Julia Lawall <julia(a)diku.dk> ----- Date: Thu, 31 Dec 2009 17:40:21 +0100 (CET) From: Julia Lawall <julia(a)diku.dk> To: Andrew Lunn <andrew(a)lunn.ch> Subject: Re: Standard coccinelle tests? X-Spam-Status: No, score=-2.6 required=4.0 tests=BAYES_00 autolearn=ham version=3.2.5 I ran all of my tests on your code, and came up with the following results. Search for *** to see my comments about what I think should be done. It is only the first one that seems like a serious bug. Actually, I worked on that problem quite recently, but it must have been just before your code showed up, or I missed it for some other reason, because I don't have a record of having submitted a patch for that issue for your code. julia dev_addr.cocci ***dev->dev_addr is a pointer. The size of an address is probably 6. dev has an addr_len field that might be initialized. diff -u -p /var/linuxes/linux-next/drivers/staging/batman-adv/soft-interface.c /tmp/nothing --- /var/linuxes/linux-next/drivers/staging/batman-adv/soft-interface.c 2009-12-19 09:38:58.000000000 +0100 @@ -121,7 +121,7 @@ void interface_setup(struct net_device * /* generate random address */ random_ether_addr(dev_addr); - memcpy(dev->dev_addr, dev_addr, sizeof(dev->dev_addr)); SET_ETHTOOL_OPS(dev, &bat_ethtool_ops); kmalmem.cocci *** Use kzalloc instead of kmalloc + memset. Also consider testing the result of the kmaloc for NULL. diff -u -p a/originator.c b/originator.c --- a/originator.c 2009-12-19 09:38:58.000000000 +0100 +++ b/originator.c 2009-12-31 14:56:59.000000000 +0100 @@ -76,8 +76,7 @@ create_neighbor(struct orig_node *orig_n bat_dbg(DBG_BATMAN, "Creating new last-hop neighbour of originator\n"); - neigh_node = kmalloc(sizeof(struct neigh_node), GFP_ATOMIC); - memset(neigh_node, 0, sizeof(struct neigh_node)); + neigh_node = kzalloc(sizeof(struct neigh_node), GFP_ATOMIC); INIT_LIST_HEAD(&neigh_node->list); memcpy(neigh_node->addr, neigh, ETH_ALEN); @@ -126,8 +125,7 @@ struct orig_node *get_orig_node(uint8_t addr_to_string(orig_str, addr); bat_dbg(DBG_BATMAN, "Creating new originator: %s \n", orig_str); - orig_node = kmalloc(sizeof(struct orig_node), GFP_ATOMIC); - memset(orig_node, 0, sizeof(struct orig_node)); + orig_node = kzalloc(sizeof(struct orig_node), GFP_ATOMIC); INIT_LIST_HEAD(&orig_node->neigh_list); memcpy(orig_node->orig, addr, ETH_ALEN); @@ -137,12 +135,10 @@ struct orig_node *get_orig_node(uint8_t size = num_ifs * sizeof(TYPE_OF_WORD) * NUM_WORDS; - orig_node->bcast_own = kmalloc(size, GFP_ATOMIC); - memset(orig_node->bcast_own, 0, size); + orig_node->bcast_own = kzalloc(size, GFP_ATOMIC); size = num_ifs * sizeof(uint8_t); - orig_node->bcast_own_sum = kmalloc(size, GFP_ATOMIC); - memset(orig_node->bcast_own_sum, 0, size); + orig_node->bcast_own_sum = kzalloc(size, GFP_ATOMIC); hash_add(orig_hash, orig_node); kmbfree.cocci *** As far as I can tell, in the following, the if after the out label is not needed. diff -u -p /var/linuxes/linux-next/drivers/staging/batman-adv/hard-interface.c /tmp/nothing --- /var/linuxes/linux-next/drivers/staging/batman-adv/hard-interface.c 2009-12-19 09:38:58.000000000 +0100 @@ -335,7 +335,7 @@ int hardif_add_interface(char *dev, int else batman_if->packet_len = BAT_PACKET_LEN; - batman_if->packet_buff = kmalloc(batman_if->packet_len, GFP_KERNEL); if (!batman_if->packet_buff) { printk(KERN_ERR "batman-adv:Can't add interface packet (%s): out of memory\n", dev); @@ -401,7 +401,7 @@ int hardif_add_interface(char *dev, int out: if (batman_if->packet_buff) kfree(batman_if->packet_buff); - kfree(batman_if); kfree(dev); return -1; } kmtest.cocci *** the result of kmalloc should be tested for NULL diff -u -p /var/linuxes/linux-next/drivers/staging/batman-adv/hash.c /tmp/nothing --- /var/linuxes/linux-next/drivers/staging/batman-adv/hash.c 2009-11-23 22:35:21.000000000 +0100 @@ -76,7 +76,7 @@ struct hash_it_t *hash_iterate(struct ha if (iter_in == NULL) { iter = kmalloc(sizeof(struct hash_it_t), GFP_ATOMIC); - iter->index = -1; iter->bucket = NULL; iter->prev_bucket = NULL; } else { diff -u -p /var/linuxes/linux-next/drivers/staging/batman-adv/translation-table.c /tmp/nothing --- /var/linuxes/linux-next/drivers/staging/batman-adv/translation-table.c 2009-12-19 09:38:58.000000000 +0100 @@ -322,7 +322,6 @@ void hna_global_add_orig(struct orig_nod if (orig_node->hna_buff_len > 0) { orig_node->hna_buff = kmalloc(orig_node->hna_buff_len, GFP_ATOMIC); - memcpy(orig_node->hna_buff, hna_buff, orig_node->hna_buff_len); } else { orig_node->hna_buff = NULL; } returns.cocci *** Perhaps there is no point to put a return by itself at the end of a function. diff -u -p a/routing.c b/routing.c --- a/routing.c 2009-12-19 09:38:58.000000000 +0100 +++ b/routing.c 2009-12-31 14:59:41.000000000 +0100 @@ -307,7 +307,6 @@ static void update_orig(struct orig_node update_hna: update_routes(orig_node, orig_node->router, hna_buff, tmp_hna_buff_len); - return; } static char count_real_packets(struct ethhdr *ethhdr, @@ -627,7 +626,6 @@ static void recv_my_icmp_packet(struct e } spin_unlock(&orig_hash_lock); - return; } static void recv_icmp_ttl_exceeded(struct icmp_packet *icmp_packet, txok.cocci *** I saw in some patch that functions store in the field .ndo_start_xmit ought to return NETDEV_TX_OK rather than 0. I haven't submitted any patches of my own for this situation, so I don't know for sure what the rule is. diff -u -p a/soft-interface.c b/soft-interface.c --- a/soft-interface.c 2009-12-19 09:38:58.000000000 +0100 +++ b/soft-interface.c 2009-12-31 15:00:31.000000000 +0100 @@ -263,7 +263,7 @@ dropped: priv->stats.tx_dropped++; end: kfree_skb(skb); - return 0; + return NETDEV_TX_OK; } void interface_rx(struct net_device *dev, void *packet, int packet_len) -------------------------------- ----- End forwarded message -----

2 1

[B.A.T.M.A.N.] Changeset 1519
by Gus Wirth 31 Dec '09

31 Dec '09

I'm looking at changeset 1519 and have a question about the patch to routing.c On line 158 there is: if (neigh_node) but later at line 179 there is: if (!neigh_node) for essential the same functionality. Am I confused or is one of these wrong (most likely the first one)? Gus

2 2

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N