B.A.T.M.A.N November 2010

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

16 participants
27 discussions

[B.A.T.M.A.N.] Staging: batman-adv for 2.6.37 (5)
by Sven Eckelmann 10 Nov '10

10 Nov '10

Hi, here are patches targeted for 2.6.37. All patches needed for that patchset are already part of your staging-next tree. All patches are bugfix/cleanup patches and no new feature is added. thanks, Sven

2 4

[B.A.T.M.A.N.] batman-adv gateway handling [v2]
by Marek Lindner 07 Nov '10

07 Nov '10

Hi, here comes the second revision of the gateway style patches. Only a few things changed: * rebased on top of current head * time_after / time_before bug was squashed * gw_sel_class & gw_bandwidth default values were moved into softif_create() * indentation was improved Unless someone objects I'll merge the patches this weekend. Regards, Marek

1 9

[B.A.T.M.A.N.] [PATCH 1/6] batctl: Correct format strings for 8 bit ttl
by Sven Eckelmann 04 Nov '10

04 Nov '10

Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batctl/tcpdump.c | 4 ++-- batctl/traceroute.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/batctl/tcpdump.c b/batctl/tcpdump.c index 0f62e65..8898cf8 100644 --- a/batctl/tcpdump.c +++ b/batctl/tcpdump.c @@ -335,7 +335,7 @@ static void dump_batman_ucast(unsigned char *packet_buff, ssize_t buff_len, int printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt)); - printf("%s: UCAST, ttl %hu, ", + printf("%s: UCAST, ttl %hhu, ", get_name_by_macaddr((struct ether_addr *)unicast_packet->dest, read_opt), unicast_packet->ttl); @@ -388,7 +388,7 @@ 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 %hu, flags [%c], ", + printf("%s: FRAG, seq %hu, ttl %hhu, flags [%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' : '.')); diff --git a/batctl/traceroute.c b/batctl/traceroute.c index dc97a01..0dc796a 100644 --- a/batctl/traceroute.c +++ b/batctl/traceroute.c @@ -199,9 +199,9 @@ int traceroute(char *mesh_iface, int argc, char **argv) } if (!bat_host) - printf("%2hu: %s", icmp_packet_out.ttl, (return_mac ? return_mac : "*")); + printf("%2hhu: %s", icmp_packet_out.ttl, (return_mac ? return_mac : "*")); else - printf("%2hu: %s (%s)", icmp_packet_out.ttl, bat_host->name, return_mac); + printf("%2hhu: %s (%s)", icmp_packet_out.ttl, bat_host->name, return_mac); for (i = 0; i < NUM_PACKETS; i++) { if (time_delta[i]) -- 1.7.2.3

2 9

[B.A.T.M.A.N.] [PATCH] batman-adv: suppress false warning when changing the mac address
by Marek Lindner 04 Nov '10

04 Nov '10

Whenever the mac address of an batman interface is changed check_known_mac_addr() is called to print a warning if the newly added mac address exists an another batman interface. While looping through the batman interface list check_known_mac_addr() only compares mac addresses and does not make sure they belong to different interfaces, thus always printing a warning. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- batman-adv/hard-interface.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/batman-adv/hard-interface.c b/batman-adv/hard-interface.c index 37f0f8b..63a6b3e 100644 --- a/batman-adv/hard-interface.c +++ b/batman-adv/hard-interface.c @@ -175,7 +175,7 @@ static void update_mac_addresses(struct batman_if *batman_if) batman_if->net_dev->dev_addr, ETH_ALEN); } -static void check_known_mac_addr(uint8_t *addr) +static void check_known_mac_addr(struct net_device *net_dev) { struct batman_if *batman_if; @@ -185,11 +185,16 @@ static void check_known_mac_addr(uint8_t *addr) (batman_if->if_status != IF_TO_BE_ACTIVATED)) continue; - if (!compare_orig(batman_if->net_dev->dev_addr, addr)) + if (batman_if->net_dev == net_dev) + continue; + + if (!compare_orig(batman_if->net_dev->dev_addr, + net_dev->dev_addr)) continue; pr_warning("The newly added mac address (%pM) already exists " - "on: %s\n", addr, batman_if->net_dev->name); + "on: %s\n", net_dev->dev_addr, + batman_if->net_dev->name); pr_warning("It is strongly recommended to keep mac addresses " "unique to avoid problems!\n"); } @@ -439,7 +444,7 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev) INIT_LIST_HEAD(&batman_if->list); kref_init(&batman_if->refcount); - check_known_mac_addr(batman_if->net_dev->dev_addr); + check_known_mac_addr(batman_if->net_dev); spin_lock(&if_list_lock); list_add_tail_rcu(&batman_if->list, &if_list); @@ -520,7 +525,7 @@ static int hard_if_event(struct notifier_block *this, if (batman_if->if_status == IF_NOT_IN_USE) goto hardif_put; - check_known_mac_addr(batman_if->net_dev->dev_addr); + check_known_mac_addr(batman_if->net_dev); update_mac_addresses(batman_if); bat_priv = netdev_priv(batman_if->soft_iface); -- 1.7.1

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Don't call sysfs_del_hardif() in atomic context
by Linus Lüssing 04 Nov '10

04 Nov '10

sysfs_del_hardif invokes kobject_put, which might sleep. However, we are not allowed to sleep during a call_rcu. There is also no need to do the removal with an atomic call_rcu, as kobject_put only frees the kobject when there is no more reference to it anyway. This commit basically revokes 7f32f2e8d97150ba5b80410dda86b01b0879fe8d, despite not reintroducing the synchronize_rcu, our rcu_barrier should handle this. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- hard-interface.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index 37f0f8b..5c6ce3f 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -36,16 +36,6 @@ /* protect update critical side of if_list - but not the content */ static DEFINE_SPINLOCK(if_list_lock); -static void hardif_free_rcu(struct rcu_head *rcu) -{ - struct batman_if *batman_if; - - batman_if = container_of(rcu, struct batman_if, rcu); - sysfs_del_hardif(&batman_if->hardif_obj); - dev_put(batman_if->net_dev); - kref_put(&batman_if->refcount, hardif_free_ref); -} - struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev) { struct batman_if *batman_if; @@ -470,7 +460,9 @@ static void hardif_remove_interface(struct batman_if *batman_if) /* caller must take if_list_lock */ list_del_rcu(&batman_if->list); - call_rcu(&batman_if->rcu, hardif_free_rcu); + sysfs_del_hardif(&batman_if->hardif_obj); + dev_put(batman_if->net_dev); + kref_put(&batman_if->refcount, hardif_free_ref); } void hardif_remove_interfaces(void) -- 1.7.1

3 4

[B.A.T.M.A.N.] batman-adv gateway handling
by Marek Lindner 03 Nov '10

03 Nov '10

Hi, the batman-adv gateway functionality has been available in the trunk for quite some time but was never able to enter an official release because the sysfs API did not follow the Linux kernel guidelines. I wrote a series of patches meant to address these style issues. A comprehensive documentation of the gateway handling is on my todo list and will follow shortly. Regards, Marek

3 13

[B.A.T.M.A.N.] [PATCH] staging: batman-adv: Use linux/etherdevice.h address helper functions
by Tobias Klauser 03 Nov '10

03 Nov '10

Replace custom ethernet address check functions by calls to the helpers in linux/etherdevice.h In one case where the address was tested for broadcast and multicast address, the broadcast address check can be omitted as broadcast is also a multicast address. The patch is only compile-tested. Cc: Marek Lindner <lindner_marek(a)yahoo.de> Cc: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Cc: Andrew Lunn <andrew(a)lunn.ch> Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch> --- drivers/staging/batman-adv/main.c | 12 +----------- drivers/staging/batman-adv/main.h | 3 +-- drivers/staging/batman-adv/routing.c | 16 ++++++++-------- drivers/staging/batman-adv/soft-interface.c | 2 +- drivers/staging/batman-adv/vis.c | 4 ++-- 5 files changed, 13 insertions(+), 24 deletions(-) diff --git a/drivers/staging/batman-adv/main.c b/drivers/staging/batman-adv/main.c index 0587940..6ea6420 100644 --- a/drivers/staging/batman-adv/main.c +++ b/drivers/staging/batman-adv/main.c @@ -149,7 +149,7 @@ void dec_module_count(void) int compare_orig(void *data1, void *data2) { - return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); + return (compare_ether_addr(data1, data2) == 0 ? 1 : 0); } /* hashfunction to choose an entry in a hash table of given size */ @@ -192,16 +192,6 @@ int is_my_mac(uint8_t *addr) } -int is_bcast(uint8_t *addr) -{ - return (addr[0] == (uint8_t)0xff) && (addr[1] == (uint8_t)0xff); -} - -int is_mcast(uint8_t *addr) -{ - return *addr & 0x01; -} - module_init(batman_init); module_exit(batman_exit); diff --git a/drivers/staging/batman-adv/main.h b/drivers/staging/batman-adv/main.h index 5e3f516..14d567d 100644 --- a/drivers/staging/batman-adv/main.h +++ b/drivers/staging/batman-adv/main.h @@ -109,6 +109,7 @@ #include <linux/mutex.h> /* mutex */ #include <linux/module.h> /* needed by all modules */ #include <linux/netdevice.h> /* netdevice */ +#include <linux/etherdevice.h> #include <linux/if_ether.h> /* ethernet header */ #include <linux/poll.h> /* poll_table */ #include <linux/kthread.h> /* kernel threads */ @@ -138,8 +139,6 @@ void dec_module_count(void); int compare_orig(void *data1, void *data2); int choose_orig(void *data, int32_t size); int is_my_mac(uint8_t *addr); -int is_bcast(uint8_t *addr); -int is_mcast(uint8_t *addr); #ifdef CONFIG_BATMAN_ADV_DEBUG int debug_log(struct bat_priv *bat_priv, char *fmt, ...); diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c index 9010263..d42c165 100644 --- a/drivers/staging/batman-adv/routing.c +++ b/drivers/staging/batman-adv/routing.c @@ -756,11 +756,11 @@ int recv_bat_packet(struct sk_buff *skb, struct batman_if *batman_if) ethhdr = (struct ethhdr *)skb_mac_header(skb); /* packet with broadcast indication but unicast recipient */ - if (!is_bcast(ethhdr->h_dest)) + if (!is_broadcast_ether_addr(ethhdr->h_dest)) return NET_RX_DROP; /* packet with broadcast sender address */ - if (is_bcast(ethhdr->h_source)) + if (is_broadcast_ether_addr(ethhdr->h_source)) return NET_RX_DROP; /* create a copy of the skb, if needed, to modify it. */ @@ -933,11 +933,11 @@ int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if) ethhdr = (struct ethhdr *)skb_mac_header(skb); /* packet with unicast indication but broadcast recipient */ - if (is_bcast(ethhdr->h_dest)) + if (is_broadcast_ether_addr(ethhdr->h_dest)) return NET_RX_DROP; /* packet with broadcast sender address */ - if (is_bcast(ethhdr->h_source)) + if (is_broadcast_ether_addr(ethhdr->h_source)) return NET_RX_DROP; /* not for me */ @@ -1107,11 +1107,11 @@ static int check_unicast_packet(struct sk_buff *skb, int hdr_size) ethhdr = (struct ethhdr *)skb_mac_header(skb); /* packet with unicast indication but broadcast recipient */ - if (is_bcast(ethhdr->h_dest)) + if (is_broadcast_ether_addr(ethhdr->h_dest)) return -1; /* packet with broadcast sender address */ - if (is_bcast(ethhdr->h_source)) + if (is_broadcast_ether_addr(ethhdr->h_source)) return -1; /* not for me */ @@ -1283,11 +1283,11 @@ int recv_bcast_packet(struct sk_buff *skb, struct batman_if *recv_if) ethhdr = (struct ethhdr *)skb_mac_header(skb); /* packet with broadcast indication but unicast recipient */ - if (!is_bcast(ethhdr->h_dest)) + if (!is_broadcast_ether_addr(ethhdr->h_dest)) return NET_RX_DROP; /* packet with broadcast sender address */ - if (is_bcast(ethhdr->h_source)) + if (is_broadcast_ether_addr(ethhdr->h_source)) return NET_RX_DROP; /* ignore broadcasts sent by myself */ diff --git a/drivers/staging/batman-adv/soft-interface.c b/drivers/staging/batman-adv/soft-interface.c index 3904db9..820e141 100644 --- a/drivers/staging/batman-adv/soft-interface.c +++ b/drivers/staging/batman-adv/soft-interface.c @@ -140,7 +140,7 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) hna_local_add(soft_iface, ethhdr->h_source); /* ethernet packet should be broadcasted */ - if (is_bcast(ethhdr->h_dest) || is_mcast(ethhdr->h_dest)) { + if (is_multicast_ether_addr(ethhdr->h_dest)) { if (!bat_priv->primary_if) goto dropped; diff --git a/drivers/staging/batman-adv/vis.c b/drivers/staging/batman-adv/vis.c index 3d2c1bc..c98a065 100644 --- a/drivers/staging/batman-adv/vis.c +++ b/drivers/staging/batman-adv/vis.c @@ -470,7 +470,7 @@ void receive_client_update_packet(struct bat_priv *bat_priv, int are_target = 0; /* clients shall not broadcast. */ - if (is_bcast(vis_packet->target_orig)) + if (is_broadcast_ether_addr(vis_packet->target_orig)) return; /* Are we the target for this VIS packet? */ @@ -747,7 +747,7 @@ static void send_vis_packet(struct bat_priv *bat_priv, struct vis_info *info) ETH_ALEN); packet->ttl--; - if (is_bcast(packet->target_orig)) + if (is_broadcast_ether_addr(packet->target_orig)) broadcast_vis_packet(bat_priv, info); else unicast_vis_packet(bat_priv, info); -- 1.7.0.4

3 5

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N November 2010