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.] [PATCH] drivers/staging/batman-adv: Convert MAC_FMT to %pM
by Joe Perches 05 Jun '10

05 Jun '10

Remove the last uses of MAC_FMT Signed-off-by: Joe Perches <joe(a)perches.com> --- drivers/staging/batman-adv/main.c | 3 +- drivers/staging/batman-adv/translation-table.c | 25 ++++------------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/drivers/staging/batman-adv/main.c b/drivers/staging/batman-adv/main.c index 74c70d5..72851cd 100644 --- a/drivers/staging/batman-adv/main.c +++ b/drivers/staging/batman-adv/main.c @@ -226,8 +226,7 @@ void dec_module_count(void) int addr_to_string(char *buff, uint8_t *addr) { - return sprintf(buff, MAC_FMT, - addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); + return sprintf(buff, "%pM", addr); } /* returns 1 if they are the same originator */ diff --git a/drivers/staging/batman-adv/translation-table.c b/drivers/staging/batman-adv/translation-table.c index e01ff21..63d0967 100644 --- a/drivers/staging/batman-adv/translation-table.c +++ b/drivers/staging/batman-adv/translation-table.c @@ -202,13 +202,8 @@ int hna_local_fill_buffer_text(struct net_device *net_dev, char *buff, hna_local_entry = hashit.bucket->data; bytes_written += snprintf(buff + bytes_written, 22, - " * " MAC_FMT "\n", - hna_local_entry->addr[0], - hna_local_entry->addr[1], - hna_local_entry->addr[2], - hna_local_entry->addr[3], - hna_local_entry->addr[4], - hna_local_entry->addr[5]); + " * %pM\n", + hna_local_entry->addr); } spin_unlock_irqrestore(&hna_local_hash_lock, flags); @@ -420,19 +415,9 @@ int hna_global_fill_buffer_text(struct net_device *net_dev, char *buff, hna_global_entry = hashit.bucket->data; bytes_written += snprintf(buff + bytes_written, 44, - " * " MAC_FMT " via " MAC_FMT "\n", - hna_global_entry->addr[0], - hna_global_entry->addr[1], - hna_global_entry->addr[2], - hna_global_entry->addr[3], - hna_global_entry->addr[4], - hna_global_entry->addr[5], - hna_global_entry->orig_node->orig[0], - hna_global_entry->orig_node->orig[1], - hna_global_entry->orig_node->orig[2], - hna_global_entry->orig_node->orig[3], - hna_global_entry->orig_node->orig[4], - hna_global_entry->orig_node->orig[5]); + " * %pM via %pM\n", + hna_global_entry->addr, + hna_global_entry->orig_node->orig); } spin_unlock_irqrestore(&hna_global_hash_lock, flags);

5 16

[B.A.T.M.A.N.] [PATCH] Staging: batman-adv: bonding and interface alternating
by Simon Wunderlich 05 Jun '10

05 Jun '10

This patch adds interface alternating to the new bonding feature. Instead of only sending in a round robin fashion on the usable interfaces, we can also attempt to use a different interface for sending than for receiving (interface alternating). This should reduce problems of the half-duplex nature of WiFi Hardware and thus increase performance. The bonding modes are now enhanced from two modes (disabled/enabled) to the following 4 modes: * 0 - bonding off * 1 - round robin (as before) * 2 - interface alternating * 3 - smart bonding (round robin + interface alternating) This is an experimental patch and targeted for upcoming experiments at Wireless Battle Mesh v3 in Bracciano/Italy. Feedback, comments and reviews appreciated! Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- Index: a/batman-adv-kernelland/types.h =================================================================== --- a/batman-adv-kernelland/types.h (revision 1679) +++ a/batman-adv-kernelland/types.h (working copy) @@ -119,7 +119,7 @@ struct bat_priv { struct net_device_stats stats; atomic_t aggregation_enabled; - atomic_t bonding_enabled; + atomic_t bonding_mode; atomic_t vis_mode; atomic_t gw_mode; atomic_t gw_class; Index: a/batman-adv-kernelland/soft-interface.c =================================================================== --- a/batman-adv-kernelland/soft-interface.c (revision 1679) +++ a/batman-adv-kernelland/soft-interface.c (working copy) @@ -250,7 +250,7 @@ if (!orig_node) orig_node = transtable_search(ethhdr->h_dest); - router = find_router(orig_node); + router = find_router(orig_node, NULL); if (!router) goto unlock; Index: a/batman-adv-kernelland/hard-interface.c =================================================================== --- a/batman-adv-kernelland/hard-interface.c (revision 1679) +++ a/batman-adv-kernelland/hard-interface.c (working copy) @@ -514,7 +514,7 @@ /* unicast packet */ case BAT_UNICAST: - ret = recv_unicast_packet(skb); + ret = recv_unicast_packet(skb, batman_if); break; /* broadcast packet */ Index: a/batman-adv-kernelland/routing.c =================================================================== --- a/batman-adv-kernelland/routing.c (revision 1679) +++ a/batman-adv-kernelland/routing.c (working copy) @@ -417,7 +417,7 @@ { /* don't care if bonding is not enabled */ - if (!atomic_read(&bat_priv->bonding_enabled)) { + if (!atomic_read(&bat_priv->bonding_mode)) { orig_node->bond.candidates = 0; return; } @@ -429,7 +429,7 @@ return; } -/* mark possible bonding candidates in the neighbor list */ +/* mark possible bond.candidates in the neighbor list */ void update_bonding_candidates(struct bat_priv *bat_priv, struct orig_node *orig_node) { @@ -440,7 +440,7 @@ struct neigh_node *first_candidate, *last_candidate; /* don't care if bonding is not enabled */ - if (!atomic_read(&bat_priv->bonding_enabled)) { + if (!atomic_read(&bat_priv->bonding_mode)) { orig_node->bond.candidates = 0; return; } @@ -453,7 +453,7 @@ best_tq = orig_node->router->tq_avg; - /* update bonding candidates */ + /* update bond.candidates */ candidates = 0; @@ -1007,14 +1007,16 @@ /* find a suitable router for this originator, and use * bonding if possible. */ -struct neigh_node *find_router(struct orig_node *orig_node) +struct neigh_node *find_router(struct orig_node *orig_node, + struct batman_if *recv_if) { /* FIXME: each orig_node->batman_if will be attached to a softif */ struct bat_priv *bat_priv = netdev_priv(soft_device); struct orig_node *primary_orig_node; struct orig_node *router_orig; - struct neigh_node *router; + struct neigh_node *router, *first_candidate; static uint8_t zero_mac[ETH_ALEN] = {0, 0, 0, 0, 0, 0}; + int bonding_mode; if (!orig_node) return NULL; @@ -1022,8 +1024,9 @@ if (!orig_node->router) return NULL; - /* don't care if bonding is not enabled */ - if (!atomic_read(&bat_priv->bonding_enabled)) + /* just return default router if bonding is not enabled */ + bonding_mode = atomic_read(&bat_priv->bonding_mode); + if (!bonding_mode) return orig_node->router; router_orig = orig_node->router->orig_node; @@ -1052,19 +1055,50 @@ if (primary_orig_node->bond.candidates < 2) return orig_node->router; - router = primary_orig_node->bond.selected; + switch (bonding_mode) { + case BONDING_ROUNDROBIN: + router = primary_orig_node->bond.selected; - /* sanity check - this should never happen. */ - if (!router) - return orig_node->router; + /* sanity check - this should never happen. */ + if (!router) + return orig_node->router; - /* select the next bonding partner ... */ - primary_orig_node->bond.selected = router->next_bond_candidate; + /* select the next bonding partner ... */ + primary_orig_node->bond.selected = router->next_bond_candidate; + break; + case BONDING_ALTERNATE: + /* in alternate mode, the first node should + * always choose the default router. */ + if (recv_if == NULL) + return orig_node->router; + /* all nodes between should choose a candidate which + * is is not on the interface where the packet came + * in. There might be more than one alternative + * interface, and we send the packet in a round robin + * fashion on these interfaces in this case. */ + case BONDING_SMART: + first_candidate = primary_orig_node->bond.selected; + router = first_candidate; + + do { + /* recv_if == NULL on the first node. */ + if (router->if_incoming != recv_if) + break; + router = router->next_bond_candidate; + } while (router != first_candidate); + + /* select the next to have some diversity here. */ + primary_orig_node->bond.selected = router->next_bond_candidate; + break; + default: + router = orig_node->router; + } + return router; } -int recv_unicast_packet(struct sk_buff *skb) +int recv_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if) { struct unicast_packet *unicast_packet; struct orig_node *orig_node; @@ -1116,7 +1150,7 @@ orig_node = ((struct orig_node *) hash_find(orig_hash, unicast_packet->dest)); - router = find_router(orig_node); + router = find_router(orig_node, recv_if); if (!router) { spin_unlock_irqrestore(&orig_hash_lock, flags); Index: a/batman-adv-kernelland/main.h =================================================================== --- a/batman-adv-kernelland/main.h (revision 1679) +++ a/batman-adv-kernelland/main.h (working copy) @@ -63,6 +63,10 @@ * to be considered as bonding candidates */ #define BONDING_TQ_THRESHOLD 50 +#define BONDING_NONE 0 +#define BONDING_ROUNDROBIN 1 +#define BONDING_ALTERNATE 2 +#define BONDING_SMART 3 #define MAX_AGGREGATION_BYTES 512 /* should not be bigger than 512 bytes or * change the size of Index: a/batman-adv-kernelland/routing.h =================================================================== --- a/batman-adv-kernelland/routing.h (revision 1679) +++ a/batman-adv-kernelland/routing.h (working copy) @@ -32,11 +32,12 @@ struct neigh_node *neigh_node, unsigned char *hna_buff, int hna_buff_len); int recv_icmp_packet(struct sk_buff *skb); -int recv_unicast_packet(struct sk_buff *skb); +int recv_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if); int recv_bcast_packet(struct sk_buff *skb); int recv_vis_packet(struct sk_buff *skb); int recv_bat_packet(struct sk_buff *skb, struct batman_if *batman_if); -struct neigh_node *find_router(struct orig_node *orig_node); +struct neigh_node *find_router(struct orig_node *orig_node, + struct batman_if *recv_if); void update_bonding_candidates(struct bat_priv *bat_priv, struct orig_node *orig_node); Index: a/batman-adv-kernelland/bat_sysfs.c =================================================================== --- a/batman-adv-kernelland/bat_sysfs.c (revision 1679) +++ a/batman-adv-kernelland/bat_sysfs.c (working copy) @@ -92,10 +92,9 @@ { struct device *dev = to_dev(kobj->parent); struct bat_priv *bat_priv = netdev_priv(to_net_dev(dev)); - int bond_status = atomic_read(&bat_priv->bonding_enabled); + int bonding_mode = atomic_read(&bat_priv->bonding_mode); - return sprintf(buff, "%s\n", - bond_status == 0 ? "disabled" : "enabled"); + return sprintf(buff, "%d\n", bonding_mode); } static ssize_t store_bond(struct kobject *kobj, struct attribute *attr, @@ -104,17 +103,25 @@ struct device *dev = to_dev(kobj->parent); struct net_device *net_dev = to_net_dev(dev); struct bat_priv *bat_priv = netdev_priv(net_dev); - int bonding_enabled_tmp = -1; + int bonding_mode_tmp = -1; - if (((count == 2) && (buff[0] == '1')) || - (strncmp(buff, "enable", 6) == 0)) - bonding_enabled_tmp = 1; + if (count == 2) + switch (buff[0]) { + case '0': + bonding_mode_tmp = 0; + break; + case '1': + bonding_mode_tmp = BONDING_ROUNDROBIN; + break; + case '2': + bonding_mode_tmp = BONDING_ALTERNATE; + break; + case '3': + bonding_mode_tmp = BONDING_SMART; + break; + } - if (((count == 2) && (buff[0] == '0')) || - (strncmp(buff, "disable", 7) == 0)) - bonding_enabled_tmp = 0; - - if (bonding_enabled_tmp < 0) { + if (bonding_mode_tmp < 0) { if (buff[count - 1] == '\n') buff[count - 1] = '\0'; @@ -123,16 +130,14 @@ return -EINVAL; } - if (atomic_read(&bat_priv->bonding_enabled) == bonding_enabled_tmp) + if (atomic_read(&bat_priv->bonding_mode) == bonding_mode_tmp) return count; - printk(KERN_INFO "batman-adv:Changing bonding from: %s to: %s on mesh: %s\n", - atomic_read(&bat_priv->bonding_enabled) == 1 ? - "enabled" : "disabled", - bonding_enabled_tmp == 1 ? "enabled" : "disabled", + printk(KERN_INFO "batman-adv:Changing bonding from: %d to: %d on mesh: %s\n", + atomic_read(&bat_priv->bonding_mode), bonding_mode_tmp, net_dev->name); - atomic_set(&bat_priv->bonding_enabled, (unsigned)bonding_enabled_tmp); + atomic_set(&bat_priv->bonding_mode, (unsigned)bonding_mode_tmp); return count; } @@ -303,7 +308,7 @@ /* FIXME: should be done in the general mesh setup routine as soon as we have it */ atomic_set(&bat_priv->aggregation_enabled, 1); - atomic_set(&bat_priv->bonding_enabled, 0); + atomic_set(&bat_priv->bonding_mode, 0); atomic_set(&bat_priv->vis_mode, VIS_TYPE_CLIENT_UPDATE); atomic_set(&bat_priv->gw_mode, GW_MODE_OFF); atomic_set(&bat_priv->gw_class, 0);

2 4

[B.A.T.M.A.N.] How to connect to the 102.x.x.x net from eth0?
by Vernon Cole 03 Jun '10

03 Jun '10

I am new here and can't find this in the documentation... I have a Linux box connected to the ethernet port of a mesh router. If I let it use dhcp, it connects to the internet just fine via wireless link to one of my other two open-mesh routers, both of which are connected to Internet gateways. I want to enable a splash screen on the 101.x.x.x network, so that I can share it openly. If I do that, I must also "log in" my hardwired box, which makes it not work for my needs. The 102.x.x.x network works just fine via wireless (I am using it to type this message) but I cannot figure how how to connect to 102.x using the hard line to eth0. I notice on the dashboard that there is a *future* switch to turn on a "bridge" mode. That sounds like what I am trying to do. I want to inter-tie two hardwire networks on 102.x while letting outsiders use 101.x as an isolated v-lan on the same mesh. How do I convince an open-mesh router to enable access to 102.x from the ethernet port? I am not good enough at command line Linux interface configuration and routing and iptables to figure this out on my own. (Hard addressing and static routes would be fine.) -- Vernon Cole

2 1

[B.A.T.M.A.N.] building testbed for batman-adv and expected performance/throughput
by Krzysztof Urbas 02 Jun '10

02 Jun '10

Hello, I am writing my master thesis about performance of BATMAN routing protocol and so I build a simple testbed consisting of 4 nodes and configured them to run batman-adv. But results of my tests are quite strange and I don't really know what should I expected. From the beginning: I have one LaFonera+ and three Asus WL-500g with Atheros interface (changed thanks to miniPCI). I have installed Backfire on them and also newest kmod-batman-adv-kernelland package. I configured interfaces to run batman and all works fine. I configured Fonera as my MeshGateway (bridging bat0 with lan and connecting wan port to Internet) and all Asus routers as MeshPortals (by bridging bat0 with wan). All configuration works fine, each PC connected to MeshPortal (by cable) has access to Internet (by MeshGateway). Still the problem is to make this network multi hop and make opportunity for a protocol to change routes. As I can use only 4 nodes (my University provided me only with 3 and Fonera is mine) my testbed looks like: Fonera--------Asus1------- \ / \ -------Asus2---------Asus3 So there are two two-hop routes from Asus3 to Fonera. I can send you images made with vis server. I tried to lower the txpower (I don't think that it really works) and remove the outside antenna but the only one possibility is to put nodes away from each other. So Asus3 is in other room. But this complicates the measurements. I also have no central place of running tests and collecting data so I need to move from one place to another to start tests and this is really annoying and there is also dull work to collect after all data. In tests I use ping, iperf and wireshark to record all packets on iperf client and server station. First I test throughput (by iperf) between two direct nodes. TCP results was about 9Mb/s-11Mb/s. Then I used UDP. By trail and error: iperf -c 192.168.20.240 -i 10 -t 60 -u -b 26000K [1920] Server Report: [1920] 0.0-60.2 sec 144 MBytes 20.1 Mbits/sec 13.693 ms 29775/132678 (22%) [1920] Sent 132678 datagrams iperf -c 192.168.20.240 -i 10 -t 60 -u -b 20000K [1920] Server Report: [1920] 0.0-60.0 sec 111 MBytes 15.5 Mbits/sec 1.237 ms 23063/101914 (23%) [1920] 0.0-60.0 sec 3 datagrams received out-of-order [1920] Sent 101914 datagrams iperf -c 192.168.20.240 -i 10 -t 60 -u -b 10000K [1920] Server Report: [1920] 0.0-60.0 sec 62.0 MBytes 8.66 Mbits/sec 2.840 ms 6823/51023 (13%) [1920] Sent 51023 datagrams iperf -c 192.168.20.240 -i 10 -t 60 -u -b 8000K [1920] Server Report: [1920] 0.0-60.1 sec 52.1 MBytes 7.28 Mbits/sec 3.045 ms 3644/40818 (8.9%) [1920] Sent 40818 datagrams iperf -c 192.168.20.240 -i 10 -t 60 -u -b 5000K [1920] Server Report: [1920] 0.0-60.0 sec 33.6 MBytes 4.70 Mbits/sec 0.966 ms 1519/25512 (6%) [1920] 0.0-60.0 sec 1 datagrams received out-of-order [1920] Sent 25512 datagrams iperf -c 192.168.20.240 -i 10 -t 60 -u -b 4000K [1920] Server Report: [1920] 0.0-66.9 sec 23.8 MBytes 2.98 Mbits/sec 1.484 ms 42/17009 (0.25%) [1920] 0.0-66.9 sec 3 datagrams received out-of-order [1920] Sent 17009 datagrams iperf -c 192.168.20.240 -i 10 -t 60 -u -b 3000K [1920] Server Report: [1920] 0.0-60.1 sec 21.4 MBytes 2.98 Mbits/sec 5.359 ms 69/15308 (0.45%) [1920] Sent 15308 datagrams iperf -c 192.168.20.240 -i 10 -t 60 -u -b 1000K [1920] Server Report: [1920] 0.0-60.0 sec 7.11 MBytes 995 Kbits/sec 1.839 ms 29/ 5104 (0.57%) [1920] Sent 5104 datagrams So can I assume that real throughput is about 3Mb/s?? Of course I made a lot of more tests and good rate (about 1%) of packet looses was with throughput max 3Mb/s. So there are differences between TCP and UDP. I know that they work in different way but in fact difference in measured throughput is big. Another thing is that I expected about 20Mb/s as I am using 802.11g. And this is only one-hop throughput. When I was trying to do two-hop tests it occurred that throughput was about 100Kb/s but I think it may be because of too much distance to last node (Asus3). But in fact few hours earlier I downloaded 20MB file from Internet to pc connected to Asus3, the download speed was about 40KB/s as I remember. All nodes work on channel 1 and the next used channel in neighborhood is 5. (I use one station with atheros in monitor mode and airodump-ng to watch the neighborhood of the lab). So my questions are: 1. Do you have any suggestions how to build multi-hop testbed in laboratory environment (in one room)? 2. How to make testing proces more automatic (some kind of central server to run tests and collect data)? 3. How do you do tests of BATMAN? I.e. at BattleMesh? What do you measure and how? 4. What throughput should I expect on one-hop and two-hop routes using batman-adv and how it looks using layer3 batmand? I assume that it should be worse than in layer2.. 5. Do you have any other suggestions/observations/conclusions/example_data from your tests? 6. Maybe you could give me some other ideas? Regards Krzysztof Urbas ---------------------------------------------------------------------- Wakacyjna przygoda czeka! Zgarnij nagrody za 18 000zl! Sprawdz >>> http://linkint.pl/f2721

3 2

[B.A.T.M.A.N.] Layer 2 fragmentation
by Andreas Langer 27 May '10

27 May '10

Hello, i looked into the problem of fragmenting packets on layer2 to solve the mtu issue. I found a unforeseen problem : oversized packets will be dropped by the bridge module ( if bat0 is in a bridge ). I think the reason can be found here net/bridge/br_forward.c on line 44 43 /* drop mtu oversized packets except gso */ 44 if (packet_length(skb) > skb->dev->mtu && !skb_is_gso(skb)) 45 kfree_skb(skb); Possible solution: make a patch for the bridge module if (packet_length(skb) > skb->dev->mtu && !skb_is_gso(skb) && !(skb->dev->priv_flags & IFF_CAN_FRAG)) IFF_CAN_FRAG must be added to include/linux/if.h and batman-adv has to set this flag on bat0 I can make a patch for mainline inclusion, do you believe it is going to be accepted ? regards, andreas

3 4

[B.A.T.M.A.N.] The state of batman-adv branches in may 2010
by Sven Eckelmann 26 May '10

26 May '10

Hi, as we started to have different branches and repositories, everything became a little bit more complex to track. I will try to summarize what and where is something going on inside the batman-adv universe. * http://downloads.open-mesh.org/svn/batman/trunk/batman-adv-kernelland/ http://git.open-mesh.net/?p=batman-adv;a=shortlog;h=refs/heads/master In trunk is always summer - so changes always(?) enter here and will get moved to other branches unless they need some more time to get a fine flavor - or at least more testing. Even if everything should hit trunk, it is easier to describe changes in a different place. This branch can be used together with http://downloads.open-mesh.net/svn/batman/trunk/batctl/ * http://git.open-mesh.net/?p=batman-adv;a=shortlog;h=refs/heads/maint This is were commits are gathered to be send later to the linux kernel folks. Only tested features or features which are dependencies for the in-kernel batman-adv should enter this branch. We have already created the release v0.2.1 only from commits inside that branch while we developed new stuff in parallel in trunk. Since that release we received smaller patches which were merged into the linux mainline first or which were send to us directly from people which actually wanted to fix problems of the in-kernel batman-adv directly. We had for example style changes or patches which will guarantee that batman-adv still builds in upcoming kernel releases - things we otherwise would have to analyse after that kernel was released. So instead of having a user which notices that batman-adv doesn't build anymore, we got the fix for the problem which will exist somewhere in the future directly from the people which will create that problem. :) As one of the bigger changes we started to port batman-adv from /proc to sysfs and debugfs. batctl was also changed to work on top of the new configuration and debugging infrastructure. Unfortunately this change is a two step process. First we changed everything from /proc to sysfs and later moved parts of the files in sysfs to debugfs because they were not single value files. But later more about those changes in maint-0.2.2. Beside smaller bugfixes, a bigger problem was found when receiving an enormous amount of broadcast packets which must be rebroadcasted. It could happen that those packets looped inside the mesh. It was tried to fix that problem without changing the packet format. Even if that reduced the problem, there are more changes coming later which needs changes to the packet format. Also a smaller new feature has entered maint - the ability to allow netfilter/ebtables to filter incoming packets which are directly for batman-adv. This branch can be used together with http://downloads.open-mesh.net/svn/batman/branches/batctl-0.2.x/ * linux-2.6.35 The merge window has opened over a week ago and all patches (patches we send at least a week before it was opened) were accepted. Newer bugfixes will probably accepted in some days. Unfortunately some patches like the move of some files to debugfs weren't finished right in time and will only be merged into linux-2.6.36 because they are more than just simple bugfixes. That includes the removing of /dev/batman-adv in favor of debugfs, moving of tables from sysfs to debugfs and the netfilter integration. * http://git.open-mesh.net/?p=batman-adv;a=shortlog;h=refs/heads/maint-0.2.2 As we weren't able to merge all patches inside maint in linux-2.6.35 and we still want to be able to provide a release which behaves like the version in 2.6.35, it was decided that we just use a version before the debugfs patches and create a branch which will gather all bugfixes in maint. It will be merged and removed after the release of batman-adv-kernelland-0.2.2 or plans are changed. So better don't start a friendship with this little buddy. If you want to try that branch or any snapshot of 2.6.35 then please try revision r1664 of http://downloads.open-mesh.net/svn/batman/branches/batctl-0.2.x/ * http://git.open-mesh.net/?p=batman-adv;a=shortlog;h=refs/heads/linux The dirty place were all the linux integration happens. It is ugly, misunderstood and uninteresting for most people. The last synchronization point was GregKH-20100522. It is a merge of v2.6.34 and v0.2.1-38-gbcde864 + a documentation of all files we create in sysfs. So this synchronization point (a git tag) just says that we check at least v2.6.34 for new patches not yet integrated in maint/trunk of batman-adv and that we send our changes until that point to GregKH. In reality the patches are modified a little bit. * Files are moved from / to /drivers/staging/batman-adv * compat.h, bat_printk.c, Makefile.kbuild are removed * all references (#include) to compat.h are removed * TODO, Kconfig, sysfs-class-net-batman-adv and sysfs-class-net-mesh are added * Makefile is rewritten to look like a stripped down version of Makefile.kbuild * All passages how to compile batman-adv outside of the kernel are removed from README * Squashed with patches which only fix another patch All those changes are done for each patch (or at least ensured that no changes will conflict with those points) on top of the last merge point. This should ensure that we don't diverge too much from maint with the in-kernel batman-adv. Each patch is then applied on top of a current linux-next, tested if it compiles, checked with sparse and checkpatch.pl --strict. When everything looks fine, they get exported again using git-format-patch and send to GregKH. Only because a change is part of a synchronization point, it doesn't mean that it will appear with the next linux kernel. As said before, all bugfixes between GregKH-20100510 and GregKH-20100522 will be part of 2.6.35, but anything bigger will be part of 2.6.36. * http://git.open-mesh.net/?p=ecsv/master-rebase.git;a=shortlog;h=rebase My personal project. (With a little delay) I will try to get all changes in trunk rebased on top of maint. As result we get only the essence of changes in trunk which aren't already part of maint. This also means for example that patches will look like they were made with sysfs in mind even when they are originally created files in /proc. Even when I always ensure that the files in master and rebase are 100% equal, the original author may not be blamed when a single patch will try to eat your pet (or you could say that patches in that branch will not be checked by their original authors and I will only guarantee that when you apply all patches you will get the same files as in trunk). Nevertheless it is a great place to get and test feature patches on top of maint without using the complete set of changes in master. Or to understand what goes on in trunk compared to maint. Of course you cannot use all patches in any order because they have dependencies between each other. A the moment we have following patches which should be quite easy to use together with any other patch: * batman-adv: mark trunk as 0.3.0 alpha * batman-adv: Add bonding functionality * batman-adv: move queue counters into bat_priv We have also patches which changes the packet compat version to 9 (all gateway patches must be used in that order, otherwise they would not apply): * batman-adv: adding gateway functionality * batman-adv: send DHCP requests directly to the chosen gw * batman-adv: best gw DHCP filter 802.1Q support * batman-adv: record route for ICMP messages The last patch increases the compat version 10 and thus requires the patches which justify the compat version 9 ("adding gateway functionality", "record route for ICMP messages"): * batman-adv: 32bit sequence number and TTL for broadcasts This branch will jump around and it is not save to track it using a local git branch. This branch can be used together with http://downloads.open-mesh.net/svn/batman/trunk/batctl/ Last but not least, thanks to everyone who has done the real work * Andrea Gelmini * Andrew Lunn * Dan Carpenter * Daniel Seither * Linus Lüssing * Marek Lindner * Paul E. McKenney * Simon Wunderlich * Tejun Heo and lets see what the next months will bring us. Best regards, Sven

1 0

[B.A.T.M.A.N.] Blocking OGMs from a node for testing purpose
by Antonio Quartulli 25 May '10

25 May '10

Hi all, I'm tring to make some tests on batman-adv with some stations, but I'm in trouble since I'm not able to "hide" a node to another. In other words I would like to create some personalized topologies to to test batman against them. To do this, first of all, I should block OGMs from a particular station. I tried with ebtables in order to block all the packets with source MACa (where MACa is the MAC address of the station I would prevent to communicate with me), but I failed. Does anyone know a working way to do what I described before? Thank you so much! Regards -- Antonio Quartulli Ognuno di noi, da solo, non vale nulla Ernesto "Che" Guevara

3 14

[B.A.T.M.A.N.] [PATCH 00/26] Staging: batman-adv
by Sven Eckelmann 24 May '10

24 May '10

Hi, we've tried to fix the outstanding problem regarding the sysfs filesystem and fixed some further smaller problems. I hope that it is right were we put the ABI documentation. Linus Lüssing (1): Staging: batman-adv: Adding netfilter-bridge hooks Marek Lindner (4): Staging: batman-adv: remove redundant struct declaration Staging: batman-adv: fix rogue packets on shutdown Staging: batman-adv: convert all sysfs files to single value files Documentation: ABI: Add information about batman-adv sysfs entries Sven Eckelmann (5): Staging: batman-adv: Call unregister_netdev on failures to get rtnl lock Staging: batman-adv: Don't call free_netdev twice Staging: batman-adv: Move device for icmp injection to debugfs Staging: batman-adv: Move tables from sysfs to debugfs Staging: batman-adv: Don't allocate icmp packet with GFP_KERNEL Best regards, Sven

2 17

[B.A.T.M.A.N.] [PATCH 00/26] Staging: batman-adv for 2.6.36
by Sven Eckelmann 22 May '10

22 May '10

Hi, here are the patches for 2.6.36 split from the old patchset. Linus Lüssing (1): Staging: batman-adv: Adding netfilter-bridge hooks Marek Lindner (3): Staging: batman-adv: remove redundant struct declaration Staging: batman-adv: convert all sysfs files to single value files Staging: batman-adv: Add information about batman-adv sysfs entries Sven Eckelmann (2): Staging: batman-adv: Move device for icmp injection to debugfs Staging: batman-adv: Move tables from sysfs to debugfs Best regards, Sven

1 6

[B.A.T.M.A.N.] [PATCH 00/26] Staging: batman-adv for 2.6.35
by Sven Eckelmann 22 May '10

22 May '10

Hi, here are the patches which fixes different bugs backported for 2.6.35 Marek Lindner (1): Staging: batman-adv: fix rogue packets on shutdown Sven Eckelmann (3): Staging: batman-adv: Call unregister_netdev on failures to get rtnl lock Staging: batman-adv: Don't call free_netdev twice Staging: batman-adv: Don't allocate icmp packet with GFP_KERNEL thanks, Sven

1 4

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