B.A.T.M.A.N February 2011

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

20 participants
28 discussions

[B.A.T.M.A.N.] pull request: batman-adv 2011-02-08
by Sven Eckelmann 08 Feb '11

08 Feb '11

Hi, I would like to propose following patch for net-2.6.git/2.6.38 which fixes a possible kernel oops in the unicast fragmentation code. thanks, Sven The following changes since commit 1181e1daace88018b2ff66592aa10a4791d705ff: batman-adv: Make vis info stack traversal threadsafe (2011-01-30 10:32:08 +0100) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/merge Sven Eckelmann (1): batman-adv: Linearize fragment packets before merge net/batman-adv/unicast.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-)

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: Disallow originator addressing within mesh layer
by Linus Lüssing 07 Feb '11

07 Feb '11

For a host in the mesh network, the batman layer should be transparent. However, we had one exception, data packets within the mesh network which have the same destination as a originator are being routed to that node, although there is no host that node's bat0 interface and therefore gets dropped anyway. This commit removes this exception. Signed-off-by: Linus Lüssing <linus.luessing(a)ascom.ch> --- unicast.c | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) diff --git a/batman-adv/unicast.c b/batman-adv/unicast.c index 6a9ab61..9b13565 100644 --- a/batman-adv/unicast.c +++ b/batman-adv/unicast.c @@ -295,28 +295,12 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv) /* get routing information */ if (is_multicast_ether_addr(ethhdr->h_dest)) { orig_node = (struct orig_node *)gw_get_selected(bat_priv); - if (!orig_node) - goto trans_search; - - kref_get(&orig_node->refcount); - goto find_router; - } else { - rcu_read_lock(); - orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash, - compare_orig, - choose_orig, - ethhdr->h_dest)); - if (!orig_node) { - rcu_read_unlock(); - goto trans_search; + if (orig_node) { + kref_get(&orig_node->refcount); + goto find_router; } - - kref_get(&orig_node->refcount); - rcu_read_unlock(); - goto find_router; } -trans_search: /* check for hna host - increases orig_node refcount */ orig_node = transtable_search(bat_priv, ethhdr->h_dest); -- 1.7.2.3

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Linearize fragment packets before merge
by Sven Eckelmann 06 Feb '11

06 Feb '11

We access the data inside the skbs of two fragments directly using memmove during the merge. The data of the skb could span over multiple skb pages. An direct access without knowledge about the pages would lead to an invalid memory access. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- batman-adv/unicast.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/batman-adv/unicast.c b/batman-adv/unicast.c index 6a9ab61..04b152c 100644 --- a/batman-adv/unicast.c +++ b/batman-adv/unicast.c @@ -50,6 +50,11 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, skb = tfp->skb; } + if (skb_linearize(skb) < 0 || skb_linearize(tmp_skb) < 0) { + kfree_skb(tfp->skb); + return NULL; + } + skb_pull(tmp_skb, sizeof(struct unicast_frag_packet)); if (pskb_expand_head(skb, 0, tmp_skb->len, GFP_ATOMIC) < 0) { /* free buffered skb, skb will be freed later */ -- 1.7.2.3

2 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove duplicate types.h inclusions
by Linus Lüssing 06 Feb '11

06 Feb '11

types.h is included by main.h, which is included at the beginning of any other c-file anyway. Therefore this commit removes those duplicate inclussions. Signed-off-by: Linus Lüssing <linus.luessing(a)ascom.ch> --- icmp_socket.c | 1 - icmp_socket.h | 2 -- main.c | 1 - routing.c | 1 - routing.h | 2 -- send.c | 1 - send.h | 2 -- soft-interface.c | 1 - translation-table.c | 1 - translation-table.h | 2 -- 10 files changed, 0 insertions(+), 14 deletions(-) diff --git a/batman-adv/icmp_socket.c b/batman-adv/icmp_socket.c index 10a969c..fc812e1 100644 --- a/batman-adv/icmp_socket.c +++ b/batman-adv/icmp_socket.c @@ -24,7 +24,6 @@ #include <linux/slab.h> #include "icmp_socket.h" #include "send.h" -#include "types.h" #include "hash.h" #include "originator.h" #include "hard-interface.h" diff --git a/batman-adv/icmp_socket.h b/batman-adv/icmp_socket.h index 08b1859..462b190 100644 --- a/batman-adv/icmp_socket.h +++ b/batman-adv/icmp_socket.h @@ -22,8 +22,6 @@ #ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_ #define _NET_BATMAN_ADV_ICMP_SOCKET_H_ -#include "types.h" - #define ICMP_SOCKET "socket" void bat_socket_init(void); diff --git a/batman-adv/main.c b/batman-adv/main.c index e687e7f..658ad5a 100644 --- a/batman-adv/main.c +++ b/batman-adv/main.c @@ -30,7 +30,6 @@ #include "translation-table.h" #include "hard-interface.h" #include "gateway_client.h" -#include "types.h" #include "vis.h" #include "hash.h" diff --git a/batman-adv/routing.c b/batman-adv/routing.c index 2861f18..b792df4 100644 --- a/batman-adv/routing.c +++ b/batman-adv/routing.c @@ -28,7 +28,6 @@ #include "icmp_socket.h" #include "translation-table.h" #include "originator.h" -#include "types.h" #include "ring_buffer.h" #include "vis.h" #include "aggregation.h" diff --git a/batman-adv/routing.h b/batman-adv/routing.h index 8b76424..e2a9872 100644 --- a/batman-adv/routing.h +++ b/batman-adv/routing.h @@ -22,8 +22,6 @@ #ifndef _NET_BATMAN_ADV_ROUTING_H_ #define _NET_BATMAN_ADV_ROUTING_H_ -#include "types.h" - void slide_own_bcast_window(struct batman_if *batman_if); void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_packet, diff --git a/batman-adv/send.c b/batman-adv/send.c index 7cc620e..8314276 100644 --- a/batman-adv/send.c +++ b/batman-adv/send.c @@ -25,7 +25,6 @@ #include "translation-table.h" #include "soft-interface.h" #include "hard-interface.h" -#include "types.h" #include "vis.h" #include "aggregation.h" #include "gateway_common.h" diff --git a/batman-adv/send.h b/batman-adv/send.h index bc53ade..b68c272 100644 --- a/batman-adv/send.h +++ b/batman-adv/send.h @@ -22,8 +22,6 @@ #ifndef _NET_BATMAN_ADV_SEND_H_ #define _NET_BATMAN_ADV_SEND_H_ -#include "types.h" - int send_skb_packet(struct sk_buff *skb, struct batman_if *batman_if, uint8_t *dst_addr); diff --git a/batman-adv/soft-interface.c b/batman-adv/soft-interface.c index 145e0f7..bd088f8 100644 --- a/batman-adv/soft-interface.c +++ b/batman-adv/soft-interface.c @@ -26,7 +26,6 @@ #include "send.h" #include "bat_debugfs.h" #include "translation-table.h" -#include "types.h" #include "hash.h" #include "gateway_common.h" #include "gateway_client.h" diff --git a/batman-adv/translation-table.c b/batman-adv/translation-table.c index a998c25..28a212a 100644 --- a/batman-adv/translation-table.c +++ b/batman-adv/translation-table.c @@ -22,7 +22,6 @@ #include "main.h" #include "translation-table.h" #include "soft-interface.h" -#include "types.h" #include "hash.h" #include "originator.h" diff --git a/batman-adv/translation-table.h b/batman-adv/translation-table.h index a4f3a37..f19931c 100644 --- a/batman-adv/translation-table.h +++ b/batman-adv/translation-table.h @@ -22,8 +22,6 @@ #ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ #define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ -#include "types.h" - int hna_local_init(struct bat_priv *bat_priv); void hna_local_add(struct net_device *soft_iface, uint8_t *addr); void hna_local_remove(struct bat_priv *bat_priv, -- 1.7.2.3

3 4

[B.A.T.M.A.N.] [PATCH] batctl: add radiotap wifi packet decapsulation support
by Sven Eckelmann 04 Feb '11

04 Feb '11

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- batctl/tcpdump.c | 37 ++++++++++++++++++++++++++++++------- batctl/tcpdump.h | 12 ++++++++++++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/batctl/tcpdump.c b/batctl/tcpdump.c index 4443a2a..a715e27 100644 --- a/batctl/tcpdump.c +++ b/batctl/tcpdump.c @@ -460,6 +460,30 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read } } +static int monitor_header_length(unsigned char *packet_buff, ssize_t buff_len, int32_t hw_type) +{ + struct radiotap_header *radiotap_hdr; + switch (hw_type) { + case ARPHRD_IEEE80211_PRISM: + if (buff_len <= (ssize_t)PRISM_HEADER_LEN) + return -1; + else + return PRISM_HEADER_LEN; + + case ARPHRD_IEEE80211_RADIOTAP: + if (buff_len <= (ssize_t)RADIOTAP_HEADER_LEN) + return -1; + + radiotap_hdr = (struct radiotap_header*)packet_buff; + if (buff_len <= radiotap_hdr->it_len) + return -1; + else + return radiotap_hdr->it_len; + } + + return -1; +} + static void parse_wifi_hdr(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { struct ether_header *eth_hdr; @@ -468,12 +492,6 @@ static void parse_wifi_hdr(unsigned char *packet_buff, ssize_t buff_len, int rea uint16_t fc; int hdr_len; - if (buff_len <= (ssize_t)PRISM_HEADER_LEN) - return; - - buff_len -= PRISM_HEADER_LEN; - packet_buff += PRISM_HEADER_LEN; - /* we assume a minimum size of 38 bytes * (802.11 data frame + LLC) * before we calculate the real size */ @@ -540,6 +558,7 @@ int tcpdump(int argc, char **argv) int ret = EXIT_FAILURE, res, optchar, found_args = 1, max_sock = 0, tmp; int read_opt = USE_BAT_HOSTS; unsigned char packet_buff[2000]; + int monitor_header_len = -1; while ((optchar = getopt(argc, argv, "hnp:")) != -1) { switch (optchar) { @@ -609,6 +628,7 @@ int tcpdump(int argc, char **argv) switch (dump_if->hw_type) { case ARPHRD_ETHER: case ARPHRD_IEEE80211_PRISM: + case ARPHRD_IEEE80211_RADIOTAP: break; default: printf("Error - interface '%s' is of unknown type: %i\n", dump_if->dev, dump_if->hw_type); @@ -685,7 +705,10 @@ int tcpdump(int argc, char **argv) parse_eth_hdr(packet_buff, read_len, read_opt, 0); break; case ARPHRD_IEEE80211_PRISM: - parse_wifi_hdr(packet_buff, read_len, read_opt, 0); + case ARPHRD_IEEE80211_RADIOTAP: + monitor_header_len = monitor_header_length(packet_buff, read_len, dump_if->hw_type); + if (monitor_header_len >= 0) + parse_wifi_hdr(packet_buff + monitor_header_len, read_len - monitor_header_len, read_opt, 0); break; default: /* should not happen */ diff --git a/batctl/tcpdump.h b/batctl/tcpdump.h index 17eaeb0..4364be1 100644 --- a/batctl/tcpdump.h +++ b/batctl/tcpdump.h @@ -27,6 +27,10 @@ #define ARPHRD_IEEE80211_PRISM 802 #endif +#ifndef ARPHRD_IEEE80211_RADIOTAP +#define ARPHRD_IEEE80211_RADIOTAP 803 +#endif + #define DUMP_TYPE_BATOGM 1 #define DUMP_TYPE_BATICMP 2 #define DUMP_TYPE_BATUCAST 4 @@ -67,6 +71,13 @@ struct ieee80211_hdr { u_int8_t addr4[6]; } __attribute__ ((packed)); +struct radiotap_header { + u_int8_t it_version; + u_int8_t it_pad; + u_int16_t it_len; + u_int32_t it_present; +} __attribute__((__packed__)); + struct prism_item { u_int32_t did; u_int16_t status; @@ -91,5 +102,6 @@ struct prism_header { }; #define PRISM_HEADER_LEN sizeof(struct prism_header) +#define RADIOTAP_HEADER_LEN sizeof(struct radiotap_header) int tcpdump(int argc, char **argv); -- 1.7.2.3

2 1

[B.A.T.M.A.N.] Weighting the local packet count; Optimizations for multi-interface nodes
by Daniel Seither 04 Feb '11

04 Feb '11

Hi there, I found an interesting paper today that covers mobility of some nodes in a batman-adv network: > Stefano Annese, Claudio Casetti, Carla F. Chiasserini, Paolo > Cipollone, Andrea Ghittino, and Massimo Reineri. 2009. Assessing > mobility support in mesh networks. In Proceedings of the 4th ACM > international workshop on Experimental evaluation and > characterization (WINTECH '09). http://portal.acm.org/citation.cfm?id=1614297 Unfortunately, the paper is not freely available on the web. If you're blessed with access to the ACM digital library by your school or employer, you can download it free of charge; in other cases you'll have to buy it for USD 15. In the following, I will summarize relevant parts: I) Weighting the local packet count The authors found that when each entry in the sliding window is weighed with the same weight as it is done in the current version of batman-adv, routing loops can occur when mobility is present. They greatly improve their results by weighting with the following function (i = 0..S-1 where S is the window size; 0 means freshest packet): weight(i) := max(1, floor(i * S / e^i)) This function seems to be suboptimal as it weights entry 0 with 1 while the following few entries are boosted with a weight of up to 20 (see attachment). Adding 1 to i should deal with this flaw. However, this weighting function lead to big improvements in the authors' simulations, so I think you are on the right track when thinking about introducing some kind of weighting or moving average to boost the weight of current packets. Here's the Octave/Matlab code I used to create the plot (if you want to do plots for other weighting functions that are discussed, just replace the definition of w and don't forget to use .* and ./ instead of * and / to enforce elementwise operations): > x = 0:63 > w = max(1, x.*64./exp(x)) > stem(x,w) > xlabel('age') > ylabel('weight') II) Optimizations for multi-interface nodes The authors used nodes with 2 radios. They did roughly the following on the mobile nodes (not on the fixed ones): 1) In regular intervals, scan the forwarding tables for each interface to check if any neighbors are known. If an interface has no contact to any neighbor, go to 2) 2) Use the interface without known neighbors to scan all channels except the channel that the other interface is listening to. Don't send OGMs but simply listen for OGMs from other stations. If a channel is found that has a neighbor sending, stay on this channel and start to behave like a normal batman-adv node (send OGMs etc.). I'm not sure if this will be benefitial in other scenarios than in the vehicular network scenario of the paper, but I wanted to share my findings with you. - Daniel

4 4

Re: [B.A.T.M.A.N.] [PATCH] Re: batman-adv: Correct rcu refcounting for gw_node
by jay.busch 02 Feb '11

02 Feb '11

Sent from my HTC PURE™, a Windows® phone from AT&T -----Original Message----- From: Marek Lindner <lindner_marek(a)yahoo.de> Sent: Wednesday, February 02, 2011 2:49 PM To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n(a)lists.open-mesh.org> Subject: Re: [B.A.T.M.A.N.] [PATCH] Re: batman-adv: Correct rcu refcounting for gw_node On Wednesday 02 February 2011 18:37:18 Linus Lüssing wrote: > So after some more discussions with Marek and Sven, it looks like we > have to use the rcu protected macros rcu_dereference() and > rcu_assign_pointer() for the bat_priv->curr_gw and curr_gw->orig_node. > > Changes here also include moving the kref_get() from unicast_send_skb() > into gw_get_selected(). The orig_node could have been freed already at > the time the kref_get() was called in unicast_send_skb(). I'd suggest you make a standalone patch because the patches address different problems. Thanks, Marek

1 0

[B.A.T.M.A.N.] [PATCH] batctl: add raw wifi packet decapsulation support
by Marek Lindner 01 Feb '11

01 Feb '11

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- batctl/tcpdump.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++- batctl/tcpdump.h | 49 +++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 1 deletions(-) diff --git a/batctl/tcpdump.c b/batctl/tcpdump.c index 4bff970..bdf81bc 100644 --- a/batctl/tcpdump.c +++ b/batctl/tcpdump.c @@ -29,6 +29,7 @@ #include <sys/time.h> #include <arpa/inet.h> #include <net/if.h> +#include <net/if_arp.h> #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/tcp.h> @@ -458,6 +459,75 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read } } +static void parse_wifi_hdr(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) +{ + struct ether_header *eth_hdr; + struct ieee80211_hdr *wifi_hdr; + unsigned char *shost, *dhost; + uint16_t fc; + int hdr_len; + + if (buff_len <= (ssize_t)PRISM_HEADER_LEN) + return; + + buff_len -= PRISM_HEADER_LEN; + packet_buff += PRISM_HEADER_LEN; + + /* we assume a minimum size of 38 bytes + * (802.11 data frame + LLC) + * before we calculate the real size */ + if (buff_len <= 38) + return; + + wifi_hdr = (struct ieee80211_hdr *)packet_buff; + fc = wifi_hdr->frame_control; + + /* not carrying payload */ + if ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) + return; + + /* encrypted packet */ + if (fc & IEEE80211_FCTL_PROTECTED) + return; + + shost = wifi_hdr->addr2; + if (fc & IEEE80211_FCTL_FROMDS) + shost = wifi_hdr->addr3; + else if (fc & IEEE80211_FCTL_TODS) + shost = wifi_hdr->addr4; + + dhost = wifi_hdr->addr1; + if (fc & IEEE80211_FCTL_TODS) + dhost = wifi_hdr->addr3; + + hdr_len = 24; + if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS)) + hdr_len = 30; + + if (fc & IEEE80211_STYPE_QOS_DATA) + hdr_len += 2; + + /* LLC */ + hdr_len += 8; + hdr_len -= sizeof(struct ether_header); + + if (buff_len <= hdr_len) + return; + + buff_len -= hdr_len; + packet_buff += hdr_len; + + eth_hdr = (struct ether_header *)packet_buff; + memmove(eth_hdr->ether_shost, shost, ETH_ALEN); + memmove(eth_hdr->ether_dhost, dhost, ETH_ALEN); + + /* printf("parse_wifi_hdr(): ether_type: 0x%04x\n", ntohs(eth_hdr->ether_type)); + printf("parse_wifi_hdr(): shost: %s\n", ether_ntoa_long((struct ether_addr *)eth_hdr->ether_shost)); + printf("parse_wifi_hdr(): dhost: %s\n", ether_ntoa_long((struct ether_addr *)eth_hdr->ether_dhost)); */ + + parse_eth_hdr(packet_buff, buff_len, read_opt, time_printed); +} + int tcpdump(int argc, char **argv) { struct ifreq req; @@ -526,6 +596,27 @@ int tcpdump(int argc, char **argv) memset(&req, 0, sizeof (struct ifreq)); strncpy(req.ifr_name, dump_if->dev, IFNAMSIZ); + res = ioctl(dump_if->raw_sock, SIOCGIFHWADDR, &req); + if (res < 0) { + printf("Error - can't create raw socket (SIOCGIFHWADDR): %s\n", strerror(errno)); + close(dump_if->raw_sock); + goto out; + } + + dump_if->hw_type = req.ifr_hwaddr.sa_family; + + switch (dump_if->hw_type) { + case ARPHRD_ETHER: + case ARPHRD_IEEE80211_PRISM: + break; + default: + printf("Error - interface '%s' is of unknown type: %i\n", dump_if->dev, dump_if->hw_type); + goto out; + } + + memset(&req, 0, sizeof (struct ifreq)); + strncpy(req.ifr_name, dump_if->dev, IFNAMSIZ); + res = ioctl(dump_if->raw_sock, SIOCGIFINDEX, &req); if (res < 0) { @@ -588,7 +679,18 @@ int tcpdump(int argc, char **argv) continue; } - parse_eth_hdr(packet_buff, read_len, read_opt, 0); + switch (dump_if->hw_type) { + case ARPHRD_ETHER: + parse_eth_hdr(packet_buff, read_len, read_opt, 0); + break; + case ARPHRD_IEEE80211_PRISM: + parse_wifi_hdr(packet_buff, read_len, read_opt, 0); + break; + default: + /* should not happen */ + break; + } + fflush(stdout); } diff --git a/batctl/tcpdump.h b/batctl/tcpdump.h index f98d63f..f4276dc 100644 --- a/batctl/tcpdump.h +++ b/batctl/tcpdump.h @@ -23,6 +23,10 @@ #include <netpacket/packet.h> #include "list-batman.h" +#ifndef ARPHRD_IEEE80211_PRISM +#define ARPHRD_IEEE80211_PRISM 802 +#endif + #define DUMP_TYPE_BATOGM 1 #define DUMP_TYPE_BATICMP 2 #define DUMP_TYPE_BATUCAST 4 @@ -31,11 +35,21 @@ #define DUMP_TYPE_BATFRAG 32 #define DUMP_TYPE_NONBAT 64 +#define IEEE80211_FCTL_FTYPE 0x000c +#define IEEE80211_FCTL_TODS 0x0100 +#define IEEE80211_FCTL_FROMDS 0x0200 +#define IEEE80211_FCTL_PROTECTED 0x4000 + +#define IEEE80211_FTYPE_DATA 0x0008 + +#define IEEE80211_STYPE_QOS_DATA 0x0080 + struct dump_if { struct list_head list; char *dev; int32_t raw_sock; struct sockaddr_ll addr; + int32_t hw_type; }; struct vlanhdr { @@ -43,4 +57,39 @@ struct vlanhdr { u_int16_t ether_type; } __attribute__ ((packed)); +struct ieee80211_hdr { + u_int16_t frame_control; + u_int16_t duration_id; + u_int8_t addr1[6]; + u_int8_t addr2[6]; + u_int8_t addr3[6]; + u_int16_t seq_ctrl; + u_int8_t addr4[6]; +} __attribute__ ((packed)); + +struct prism_item { + u_int32_t did; + u_int16_t status; + u_int16_t len; + u_int32_t data; +}; + +struct prism_header { + u_int32_t msgcode; + u_int32_t msglen; + u_int8_t devname[16]; + struct prism_item hosttime; + struct prism_item mactime; + struct prism_item channel; + struct prism_item rssi; + struct prism_item sq; + struct prism_item signal; + struct prism_item noise; + struct prism_item rate; + struct prism_item istx; + struct prism_item frmlen; +}; + +#define PRISM_HEADER_LEN sizeof(struct prism_header) + int tcpdump(int argc, char **argv); -- 1.7.2.3

3 8

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N February 2011