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 + lxc
by Christof Schulze 21 Mar '14

21 Mar '14

Hello, This is my first post to this list. I would like to run batman-adv inside an lxc-container just as described in [1]. I do not want to do it to simulate a network having multiple nodes but to separate duties of different "virtual machines" - linux containers in my case and to be able to easily migrate the configuration to a differen machine lateron. I started by loading batman-adv on the host and bridging it into the container. After adding the interfaces inside the container where meshing should happen I cannot add a gateway because batctl complains that /sys/class/net/bat0/mesh does not exist. Indeed, in the container it does not exist. How can batman-adv be used from an lxc-container? Christof [1] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2011-September/005355.html -- () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments

3 3

[B.A.T.M.A.N.] [PATCHv4 next 01/11] batman-adv: remove useless goto
by Antonio Quartulli 21 Mar '14

21 Mar '14

There is no need to use a label and a goto for code that is used once only. Moreover having a goto for a single return statement should always be avoided. Introduced by e368857f66620b8483166e8e6556d9c87f9b3e71 ("batman-adv: Multicast Listener Announcements via Translation Table") Cc: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- Changes from v3: - simply has_bridge() function even more Changes from v2: - added compat code change to 2/11 to accommodate new use of netdev_master_upper_dev_get_rcu() Changes from v1: - change "we are out of memory" to "in case of memory allocation failure" in 3/11 - fix commit message in 10/11 multicast.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/multicast.c b/multicast.c index 998b429..d92de1e 100644 --- a/multicast.c +++ b/multicast.c @@ -194,12 +194,10 @@ static bool batadv_mcast_has_bridge(struct batadv_priv *bat_priv) bridge = batadv_mcast_get_bridge(bat_priv); if (!bridge) - goto out; + return false; dev_put(bridge); return true; -out: - return false; } /** -- 1.8.3.2

2 21

[B.A.T.M.A.N.] [PATCHv3 next 01/11] batman-adv: remove useless goto
by Antonio Quartulli 19 Mar '14

19 Mar '14

There is no need to use a label and a goto for code that is used once only. Moreover having a goto for a single return statement should always be avoided. Introduced by e368857f66620b8483166e8e6556d9c87f9b3e71 ("batman-adv: Multicast Listener Announcements via Translation Table") Cc: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- Changes from v2: - added compat code change to 2/11 to accommodate new use of netdev_master_upper_dev_get_rcu() Changes from v1: - change "we are out of memory" to "in case of memory allocation failure" in 3/11 - fix commit message in 10/11 multicast.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/multicast.c b/multicast.c index 998b429..d92de1e 100644 --- a/multicast.c +++ b/multicast.c @@ -194,12 +194,10 @@ static bool batadv_mcast_has_bridge(struct batadv_priv *bat_priv) bridge = batadv_mcast_get_bridge(bat_priv); if (!bridge) - goto out; + return false; dev_put(bridge); return true; -out: - return false; } /** -- 1.8.3.2

1 3

[B.A.T.M.A.N.] [PATCH-maint 0/3] fix multiif regressions
by Simon Wunderlich 19 Mar '14

19 Mar '14

From: Simon Wunderlich <simon(a)open-mesh.com> There are some regressions introduced my network wide multi interface optimization patchset which are adressed by this patchset. All of them fix some kind of leaks caused reference counter imbalances, which may lead to problems when an interface is removed which was previously used by batman-adv. Thanks Antonio for your help tracking that down! Cheers, Simon Simon Wunderlich (3): batman-adv: fix neigh_ifinfo imbalance batman-adv: fix neigh reference imbalance batman-adv: always run purge_orig_neighbors bat_iv_ogm.c | 2 ++ originator.c | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) -- 1.7.10.4

2 5

[B.A.T.M.A.N.] [PATCHv2 next 01/11] batman-adv: remove useless goto
by Antonio Quartulli 19 Mar '14

19 Mar '14

There is no need to use a label and a goto for code that is used once only. Moreover having a goto for a single return statement should always be avoided. Introduced by e368857f66620b8483166e8e6556d9c87f9b3e71 ("batman-adv: Multicast Listener Announcements via Translation Table") Cc: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- Changes from v1: - change "we are out of memory" to "in case of memory allocation failure" in 3/11 - fix commit message in 10/11 multicast.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/multicast.c b/multicast.c index 998b429..d92de1e 100644 --- a/multicast.c +++ b/multicast.c @@ -194,12 +194,10 @@ static bool batadv_mcast_has_bridge(struct batadv_priv *bat_priv) bridge = batadv_mcast_get_bridge(bat_priv); if (!bridge) - goto out; + return false; dev_put(bridge); return true; -out: - return false; } /** -- 1.8.3.2

2 14

[B.A.T.M.A.N.] [PATCH next 01/11] batman-adv: remove useless goto
by Antonio Quartulli 17 Mar '14

17 Mar '14

There is no need to use a label and a goto for code that is used once only. Moreover having a goto for a single return statement should always be avoided. Introduced by e368857f66620b8483166e8e6556d9c87f9b3e71 ("batman-adv: Multicast Listener Announcements via Translation Table") Cc: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- multicast.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/multicast.c b/multicast.c index 998b429..d92de1e 100644 --- a/multicast.c +++ b/multicast.c @@ -194,12 +194,10 @@ static bool batadv_mcast_has_bridge(struct batadv_priv *bat_priv) bridge = batadv_mcast_get_bridge(bat_priv); if (!bridge) - goto out; + return false; dev_put(bridge); return true; -out: - return false; } /** -- 1.8.3.2

2 14

[B.A.T.M.A.N.] Anyone at CLT2014?
by Robert Schwebel 13 Mar '14

13 Mar '14

Hi, Is there a chance to meet some of the B.A.T.M.A.N people next weekend at Chemnitzer Linux-Tag? I have seen that there is a talk: http://chemnitzer.linux-tage.de/2014/en/vortraege/detail/189 so I'm wondering if some of the Freifunk people are there. rsc -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |

3 2

[B.A.T.M.A.N.] batman-adv 2014.1.0 released
by Marek Lindner 13 Mar '14

13 Mar '14

The B.A.T.M.A.N. developers are happy to present batman-adv 2014.1.0, stabilizing the feature-packed 2014.0.0 release while also pushing routing improvements and other smaller features. As the kernel module always depends on the Linux kernel it is compiled against, it does not make sense to provide binaries on our website. As usual, you will find the signed tarballs in our download section: http://downloads.open-mesh.org/batman/releases/batman-adv-2014.1.0/ as well as prepackaged binaries in your distribution. Thanks ------ Thanks to all people sending in patches: * Antonio Quartulli <antonio(a)meshcoding.com> * Linus Lüssing <linus.luessing(a)web.de> * Marek Lindner <mareklindner(a)neomailbox.ch> * Simon Wunderlich <sw(a)simonwunderlich.de> * Stephen Hemminger <stephen(a)networkplumber.org> * Sven Eckelmann <sven(a)narfation.org> * Ying Xue <ying.xue(a)windriver.com> Special thanks to Russell Senior for his vigorous testing and debugging efforts. batman-adv ---------- After having accomplished the heavy infrastructure lifting with the previous release, the attention shifted towards batman-adv's core functionality - routing packets - once more. The forwarding mechanism of the mesh protocol messages (OGMs) was revamped to allow applying rules when packets are forwarded from one interface to another. For example, when the same interface is used for sending and receiving, there might be throughput degradation on half-duplex interfaces such as WiFi which is now reflected in the metric. At the same time, packets switching interfaces (incoming interface is not equal to the outgoing one) do not get handicapped, effectively favoring interface switching. To pull all this together, batman-adv now maintains a routing table per interface (plus the default routing table) which essentially allows the kernel module to route traffic based on network wide multi-interface information. Also new on board is the extended AP isolation, aiming to grant fine-grained isolation control by working with a user specified 'skb mark'. Incoming broadcast packets carrying the specified skb mark are flagged as 'isolated' (translation table flag). Isolated packets received over the mesh are transformed back to an skb with a mark before they are forwarded to the upper layers. There, the packets can be filtered, dropped, etc by netfilter and friends based on the skb mark. The DHCP packet handling scope was widened to force all DHCP packet types to unicast transmission (with the gateway feature enabled), covering older / unusual DHCP client implementations. Previously, only DHCP discover packets were forwarded as unicast. The MTU overhead calculation did not consider the prepended Ethernet header before setting dev->hard_header_len leading to fragmented packets. Also removed was the 1500 bytes MTU limit on the batX interface by improving the maximum MTU computation. A potential kernel crash on skb reallocation was fixed along numerous problems in the translation table component and a memory leak in the newly introduced TVLV infrastructure code. batctl ------ The recent switch to the RTNL API was further enriched by replacing the custom RTNL code with the libnl library to reduce maintenance burden and security risks. The batctl Makefile attempts to locate the libnl library by itself as well as tries to determine the compiler options, thereby facilitating the build process. To monitor the per-interface routing tables, batctl gained the ability to retrieve the routing table of a particular interface (the local routing table is shown per default). Also, the extended AP isolation mark/mask pair can be configured through batctl. alfred ------ Fixed was a file descriptor leak in the batadv-vis component which is part of the alfred package. Over a longer period time file descriptors were opened and 'lost', leading batadv-vis to eventually hit the open file limit and stop normal operation. Happy routing, The B.A.T.M.A.N. team

1 0

Re: [B.A.T.M.A.N.] Anyone at CLT2014?
by Amadeus Alfa 13 Mar '14

13 Mar '14

That will be me talking about batman-adv and how we use it in Freifunk Chemnitz. You can also meet us at our stand in the exhibition hall on Sat/Sun. Best wishes, Amadeus -- Vorstand Freifunk Chemnitz e.V. Dipl.-Ing. Amadeus Alfa Mobil: +49 170 6763627 >---- Original Message ---- >From: Robert Schwebel <r.schwebel(a)pengutronix.de> >To: b.a.t.m.a.n(a)lists.open-mesh.org >Sent: Mi, Mar 12, 2014, 8:21 PM >Subject: [B.A.T.M.A.N.] Anyone at CLT2014? > >Hi, > >Is there a chance to meet some of the B.A.T.M.A.N people next weekend at >Chemnitzer Linux-Tag? I have seen that there is a talk: > >http://chemnitzer.linux-tage.de/2014/en/vortraege/detail/189 > >so I'm wondering if some of the Freifunk people are there. > >rsc >-- >Pengutronix e.K. | | >Industrial Linux Solutions | http://www.pengutronix.de/ | >Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | >Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |

1 0

[B.A.T.M.A.N.] [PATCH-next v3 1/2] batctl: check for batman interface
by Simon Wunderlich 12 Mar '14

12 Mar '14

From: Simon Wunderlich <simon(a)open-mesh.com> Check if the interface supplied by -m (or bat0 by default) is actually a batman interface. The check is performed by testing if the sysfs path is available. This change is required since debugfs now contains originator tables per hard interface. This might be confusing for users as batctl -m eth0 o will now (accidently) print these tables without eth0 beeing a batman interface, assuming eth0 is a hard interface used by batman-adv. Some reordering of commands were required to first allow commands which don't depend on a (correctly set up) mesh interface, like bisect or interface. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- Changes to PATCHv2: * fix VLAN check, this is now similar to the sysfs handling code --- main.c | 32 +++++++++++++++++--------------- sys.c | 30 ++++++++++++++++++++++++++++++ sys.h | 1 + 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/main.c b/main.c index a37c0b7..44cf49b 100644 --- a/main.c +++ b/main.c @@ -137,7 +137,23 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } - if ((strcmp(argv[1], "ping") == 0) || (strcmp(argv[1], "p") == 0)) { + if ((strcmp(argv[1], "interface") == 0) || (strcmp(argv[1], "if") == 0)) { + + ret = interface(mesh_iface, argc - 1, argv + 1); + + } else if ((strcmp(argv[1], "tcpdump") == 0) || (strcmp(argv[1], "td") == 0)) { + + ret = tcpdump(argc - 1, argv + 1); + +#ifdef BATCTL_BISECT + } else if ((strcmp(argv[1], "bisect_iv") == 0)) { + + ret = bisect_iv(argc - 1, argv + 1); +#endif + } else if (check_mesh_iface(mesh_iface) < 0) { + fprintf(stderr, "Error - interface %s is not present or not a batman-adv interface\n", mesh_iface); + exit(EXIT_FAILURE); + } else if ((strcmp(argv[1], "ping") == 0) || (strcmp(argv[1], "p") == 0)) { ret = ping(mesh_iface, argc - 1, argv + 1); @@ -145,14 +161,6 @@ int main(int argc, char **argv) ret = traceroute(mesh_iface, argc - 1, argv + 1); - } else if ((strcmp(argv[1], "tcpdump") == 0) || (strcmp(argv[1], "td") == 0)) { - - ret = tcpdump(argc - 1, argv + 1); - - } else if ((strcmp(argv[1], "interface") == 0) || (strcmp(argv[1], "if") == 0)) { - - ret = interface(mesh_iface, argc - 1, argv + 1); - } else if ((strcmp(argv[1], "loglevel") == 0) || (strcmp(argv[1], "ll") == 0)) { ret = handle_loglevel(mesh_iface, argc - 1, argv + 1); @@ -179,12 +187,6 @@ int main(int argc, char **argv) ret = translate(mesh_iface, argc - 1, argv + 1); -#ifdef BATCTL_BISECT - } else if ((strcmp(argv[1], "bisect_iv") == 0)) { - - ret = bisect_iv(argc - 1, argv + 1); -#endif - } else { for (i = 0; i < BATCTL_SETTINGS_NUM; i++) { diff --git a/sys.c b/sys.c index fd6e107..0b98d82 100644 --- a/sys.c +++ b/sys.c @@ -566,3 +566,33 @@ out: free(path_buff); return res; } + +int check_mesh_iface(char *mesh_iface) +{ + char *base_dev = NULL; + char path_buff[PATH_BUFF_LEN]; + int ret = -1, vid; + DIR *dir; + + /* use the parent interface if this is a VLAN */ + vid = vlan_get_link(mesh_iface, &base_dev); + if (vid >= 0) + snprintf(path_buff, PATH_BUFF_LEN, SYS_VLAN_PATH, base_dev, vid); + else + snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + path_buff[PATH_BUFF_LEN - 1] = '\0'; + + /* try to open the mesh sys directory */ + dir = opendir(path_buff); + if (!dir) + goto out; + + closedir(dir); + + ret = 0; +out: + if (base_dev) + free(base_dev); + + return ret; +} diff --git a/sys.h b/sys.h index 5633822..5aec020 100644 --- a/sys.h +++ b/sys.h @@ -71,5 +71,6 @@ int interface(char *mesh_iface, int argc, char **argv); int handle_loglevel(char *mesh_iface, int argc, char **argv); int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv); int handle_gw_setting(char *mesh_iface, int argc, char **argv); +int check_mesh_iface(char *mesh_iface); #endif -- 1.7.10.4

2 3

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