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 1/3] batman-adv: atomic variable for vis-srv activation
by Linus Lüssing 13 Jan '10

13 Jan '10

This fixes the bug discovered by Marek which did not allow turning on the vis-server before an interface has been added. This is now being done in a similar way as for (de)activating the aggregation mode with an atomic variable. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- main.c | 2 ++ main.h | 1 + proc.c | 43 ++++++++++++++++++++++++------------------- send.c | 2 +- vis.c | 41 +++-------------------------------------- vis.h | 2 -- 6 files changed, 31 insertions(+), 60 deletions(-) diff --git a/main.c b/main.c index c733504..843d552 100644 --- a/main.c +++ b/main.c @@ -44,6 +44,7 @@ DEFINE_SPINLOCK(forw_bcast_list_lock); atomic_t originator_interval; atomic_t vis_interval; +atomic_t vis_srv_enabled; atomic_t aggregation_enabled; int16_t num_hna; int16_t num_ifs; @@ -84,6 +85,7 @@ int init_module(void) atomic_set(&originator_interval, 1000); atomic_set(&vis_interval, 1000);/* TODO: raise this later, this is only * for debugging now. */ + atomic_set(&vis_srv_enabled, 0); atomic_set(&aggregation_enabled, 1); /* the name should not be longer than 10 chars - see diff --git a/main.h b/main.h index 3dfe5fe..385818f 100644 --- a/main.h +++ b/main.h @@ -130,6 +130,7 @@ extern spinlock_t forw_bcast_list_lock; extern atomic_t originator_interval; extern atomic_t vis_interval; +extern atomic_t vis_srv_enabled; extern atomic_t aggregation_enabled; extern int16_t num_hna; extern int16_t num_ifs; diff --git a/proc.c b/proc.c index 61e1d0d..e7b7bf3 100644 --- a/proc.c +++ b/proc.c @@ -325,36 +325,41 @@ static int proc_transt_global_open(struct inode *inode, struct file *file) static ssize_t proc_vis_srv_write(struct file *file, const char __user * buffer, size_t count, loff_t *ppos) { - char *vis_mode_string; + char *vis_srv_string; int not_copied = 0; + unsigned long vis_srv_enabled_tmp; + int retval; - vis_mode_string = kmalloc(count, GFP_KERNEL); + vis_srv_string = kmalloc(count, GFP_KERNEL); - if (!vis_mode_string) + if (!vis_srv_string) return -ENOMEM; - not_copied = copy_from_user(vis_mode_string, buffer, count); - vis_mode_string[count - not_copied - 1] = 0; - - if ((strcmp(vis_mode_string, "client") == 0) || - (strcmp(vis_mode_string, "disabled") == 0)) { - printk(KERN_INFO "batman-adv:Setting VIS mode to client (disabling vis server)\n"); - vis_set_mode(VIS_TYPE_CLIENT_UPDATE); - } else if ((strcmp(vis_mode_string, "server") == 0) || - (strcmp(vis_mode_string, "enabled") == 0)) { - printk(KERN_INFO "batman-adv:Setting VIS mode to server (enabling vis server)\n"); - vis_set_mode(VIS_TYPE_SERVER_SYNC); - } else + not_copied = copy_from_user(vis_srv_string, buffer, count); + vis_srv_string[count - not_copied - 1] = 0; + + retval = strict_strtoul(vis_srv_string, 10, &vis_srv_enabled_tmp); + + /* Unknown vis mode input? */ + if (retval == -EINVAL || vis_srv_enabled_tmp > 1) { printk(KERN_ERR "batman-adv:Unknown VIS mode: %s\n", - vis_mode_string); + vis_srv_string); + } + else { + if (vis_srv_enabled_tmp == 0) + printk(KERN_INFO "batman-adv:Setting VIS mode to client (disabling vis server)\n"); + else + printk(KERN_INFO "batman-adv:Setting VIS mode to server (enabling vis server)\n"); + atomic_set(&vis_srv_enabled, vis_srv_enabled_tmp); + } - kfree(vis_mode_string); + kfree(vis_srv_string); return count; } static int proc_vis_srv_read(struct seq_file *seq, void *offset) { - int vis_server = is_vis_server(); + int vis_server = atomic_read(&vis_srv_enabled); seq_printf(seq, "[%c] client mode (server disabled) \n", (!vis_server) ? 'x' : ' '); @@ -380,7 +385,7 @@ static int proc_vis_data_read(struct seq_file *seq, void *offset) unsigned long flags; rcu_read_lock(); - if (list_empty(&if_list) || (!is_vis_server())) { + if (list_empty(&if_list) || (!atomic_read(&vis_srv_enabled))) { rcu_read_unlock(); goto end; } diff --git a/send.c b/send.c index fd48f3f..92d14a6 100644 --- a/send.c +++ b/send.c @@ -279,7 +279,7 @@ void schedule_own_packet(struct batman_if *batman_if) /* change sequence number to network order */ batman_packet->seqno = htons((uint16_t)atomic_read(&batman_if->seqno)); - if (is_vis_server()) + if (atomic_read(&vis_srv_enabled)) batman_packet->flags = VIS_SERVER; else batman_packet->flags = 0; diff --git a/vis.c b/vis.c index fa8afdb..e7c14b5 100644 --- a/vis.c +++ b/vis.c @@ -49,41 +49,6 @@ static void free_info(void *data) kfree(info); } -/* set the mode of the visualization to client or server */ -void vis_set_mode(int mode) -{ - unsigned long flags; - spin_lock_irqsave(&vis_hash_lock, flags); - - if (my_vis_info != NULL) - my_vis_info->packet.vis_type = mode; - - spin_unlock_irqrestore(&vis_hash_lock, flags); -} - -/* is_vis_server(), locked outside */ -static int is_vis_server_locked(void) -{ - if (my_vis_info != NULL) - if (my_vis_info->packet.vis_type == VIS_TYPE_SERVER_SYNC) - return 1; - - return 0; -} - -/* get the current set mode */ -int is_vis_server(void) -{ - int ret = 0; - unsigned long flags; - - spin_lock_irqsave(&vis_hash_lock, flags); - ret = is_vis_server_locked(); - spin_unlock_irqrestore(&vis_hash_lock, flags); - - return ret; -} - /* Compare two vis packets, used by the hashing algorithm */ static int vis_info_cmp(void *data1, void *data2) { @@ -280,7 +245,7 @@ void receive_server_sync_packet(struct vis_packet *vis_packet, int vis_info_len) /* only if we are server ourselves and packet is newer than the one in * hash.*/ - if (is_vis_server_locked() && is_new) { + if (atomic_read(&vis_srv_enabled) && is_new) { memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); if (list_empty(&info->send_list)) list_add_tail(&info->send_list, &send_list); @@ -309,7 +274,7 @@ void receive_client_update_packet(struct vis_packet *vis_packet, /* send only if we're the target server or ... */ - if (is_vis_server_locked() && + if (atomic_read(&vis_srv_enabled) && is_my_mac(info->packet.target_orig) && is_new) { info->packet.vis_type = VIS_TYPE_SERVER_SYNC; /* upgrade! */ @@ -380,7 +345,7 @@ static int generate_vis_packet(void) info->packet.seqno++; info->packet.entries = 0; - if (!is_vis_server_locked()) { + if (!atomic_read(&vis_srv_enabled)) { best_tq = find_best_vis_server(info); if (best_tq < 0) { spin_unlock_irqrestore(&orig_hash_lock, flags); diff --git a/vis.h b/vis.h index 2e24258..0cdafde 100644 --- a/vis.h +++ b/vis.h @@ -48,8 +48,6 @@ struct recvlist_node { extern struct hashtable_t *vis_hash; extern spinlock_t vis_hash_lock; -void vis_set_mode(int mode); -int is_vis_server(void); void proc_vis_read_entry(struct seq_file *seq, struct vis_info_entry *entry, struct hlist_head *if_list, -- 1.6.5.7

3 6

[B.A.T.M.A.N.] modprobe
by ecfu 11 Jan '10

11 Jan '10

The installation instructions say to use insmod to load the batman-adv module. Can you use modprobe? Basically I just want it to start when the system boots. Is there an easy way to do this? Thanks

2 1

[B.A.T.M.A.N.] Are older kernels abandoned?
by Gus Wirth 11 Jan '10

11 Jan '10

Now that work is under way to incorporate B.A.T.M.A.N (batman-adv) into the mainline Linux kernel, hopefully 2.6.33, will older kernels be abandoned? I have some embedded systems that are on 2.6.30.10 and running fine, and I really don't want to have to put in a new kernel and recertify the software just to get some improvements to B.A.T.M.A.N. Is there any consideration to doing something similar to compat-wireless but for B.A.T.M.A.N (batman-adv) instead? Gus

2 1

[B.A.T.M.A.N.] B.A.T.M.A.N. V outlook
by Marek Lindner 08 Jan '10

08 Jan '10

Hey, I wrote a summary regarding the current ideas how B.A.T.M.A.N. V could look like: http://www.open-mesh.net/wiki/2009-12-18-batman-v-outlook Feedback welcome! Cheers, Marek

6 10

[B.A.T.M.A.N.] link local mcast
by ecfu 07 Jan '10

07 Jan '10

Does Batman Adv provide correct mcast routing for link-local mcast groups?

3 4

[B.A.T.M.A.N.] mdns over batman-adv
by Eric Smith 07 Jan '10

07 Jan '10

I am using batman-adv and can see multiple nodes in my ad-hoc network. However I can't seem to see the avahi services of the nodes that require a hop. Is there some configuration I need to get this to work? If avahi doesn't work, would bonjour or JmDNS work better? Thanks

2 1

[B.A.T.M.A.N.] Wireless Battle Mesh v2.7182 next 26-28 Feb in Hasselt (Belgium)
by Benjamin Henrion 07 Jan '10

07 Jan '10

Join the Wireless Battle Mesh v2.7182 next 26-28 Feb in Hasselt (Belgium): http://hackerspace.be/Wireless_Battle_Mesh_v_2.7182 Please forward to your wireless mailing-lists, blogs, etc... -- Benjamin Henrion <bhenrion at ffii.org> FFII Brussels - +32-484-566109 - +32-2-4148403 "In July 2005, after several failed attempts to legalise software patents in Europe, the patent establishment changed its strategy. Instead of explicitly seeking to sanction the patentability of software, they are now seeking to create a central European patent court, which would establish and enforce patentability rules in their favor, without any possibility of correction by competing courts or democratically elected legislators."

1 0

[B.A.T.M.A.N.] Correct smaller typographical errors
by Sven Eckelmann 07 Jan '10

07 Jan '10

After the infamous "neighbo(u)rs" patches, I wanted to send some more release critical fixes. :) There are just some possible problems found by Debian's lintian (or by me after searching for more typos) which could easily fixed by upstream. No big changes, but some letters exchanged. There is also some sentence in the batman manpage which should maybe changed. Maybe a native english speaking person could check if it is valid and understandable. "B.A.T.M.A.N tries to find the best available connection by watching the uplinks throughput and the link quality."

3 13

[B.A.T.M.A.N.] [PATCH] Staging: batman-adv: Update the README for mainline usage.
by Andrew Lunn 06 Jan '10

06 Jan '10

The module now only compiles inside mainline, so remove the comments about different versions of the kernel it can be used with. Also update comments about building with debug enabled and how to use the VIS data now that it no longer natively outputs dot or JSON. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> --- drivers/staging/batman-adv/README | 50 +++++++++--------------------------- 1 files changed, 13 insertions(+), 37 deletions(-) diff --git a/drivers/staging/batman-adv/README b/drivers/staging/batman-adv/README index 2bedcbe..7d666ad 100644 --- a/drivers/staging/batman-adv/README +++ b/drivers/staging/batman-adv/README @@ -1,4 +1,4 @@ -[state: 13-12-2009] +[state: 06-01-2010] BATMAN-ADV ---------- @@ -15,19 +15,6 @@ above B.A.T.M.A.N. Advanced, prominent examples are: IPv4, IPv6, DHCP, IPX. This is batman-advanced implemented as Linux kernel driver. It does not depend on any network (other) driver, and can be used on wifi as well as ethernet, vpn, etc ... (anything with ethernet-style layer 2). -It compiles against and should work with Linux 2.6.20 - 2.6.32. Supporting older -versions is not planned, but it's probably easy to backport it. If you work on a -backport, feel free to contact us. :-) - -COMPILE -------- -To compile against your currently installed kernel, just type: - -# make - -if you want to compile against some other kernel, use: - -# make KERNELPATH=/path/to/kernel USAGE ----- @@ -73,16 +60,9 @@ When configured as server, you can get a topology snapshot of your mesh: # cat /proc/net/batman-adv/vis -This output format is a graphviz formatted text file which can be -processed with graphviz-tools like dot. -The labels are similar/compatible to the ETX metric, 1.0 means perfect -connection (100%), 2.0 means 50%, 3.0 means 33% and so on. - -Alternatively, a JSON output format is available. The format can be set -using by writing either "dot_draw" or "json" into the vis_format file. -"dot_draw" is selected by default. - -echo "json" > /proc/net/batman-adv/vis_format +The output is in a generic raw format. Use the batctl tool (See below) +to convert this to other formats more suitable for graphing, eg +graphviz dot, or JSON data-interchange format. In very mobile scenarios, you might want to adjust the originator interval to a lower value. This will make the mesh more responsive to @@ -110,15 +90,11 @@ dmesg | grep batman-adv When investigating problems with your mesh network it is sometimes necessary to see more detail debug messages. This must be enabled when -compiling the batman-adv module. When building batman-adv as part of -kernel, use "make menuconfig" and enable the option -"B.A.T.M.A.N. debugging". When compiling outside of the kernel tree it -is necessary to edit the file Makefile.kbuild and uncomment the line - -#EXTRA_CFLAGS += -DCONFIG_BATMAN_ADV_DEBUG +compiling the batman-adv module. Use "make menuconfig" and enable the +option "B.A.T.M.A.N. debugging". The additional debug output is by default disabled. It can be enabled -either at kernel modules load time or during run time. To enable debug +either at kernel module load time or during run time. To enable debug output at module load time, add the module parameter debug=<value>. <value> can take one of four values. @@ -147,12 +123,12 @@ to see the debug messages. BATCTL ------ -B.A.T.M.A.N. advanced operates on layer 2 and thus all hosts partici- -pating in the virtual switch are completely transparent for all proto- -cols above layer 2. Therefore the common diagnosis tools do not work as -expected. To overcome these problems batctl was created. At the moment -the batctl contains ping, traceroute, tcpdump and interfaces to the -kernel module settings. +B.A.T.M.A.N. advanced operates on layer 2 and thus all hosts +participating in the virtual switch are completely transparent for all +protocols above layer 2. Therefore the common diagnosis tools do not +work as expected. To overcome these problems batctl was created. At +the moment the batctl contains ping, traceroute, tcpdump and +interfaces to the kernel module settings. For more information, please see the manpage (man batctl). -- 1.6.5.7

1 0

[B.A.T.M.A.N.] [PATCH 01/17] Staging: batman-adv: Remove NULL pointer check
by Andrew Lunn 06 Jan '10

06 Jan '10

From: Sven Eckelmann <sven.eckelmann(a)gmx.de> It is safe to call kfree(NULL) which makes this extra check unneeded. It was found using checkpatch.pl from linux-2.6 Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> --- drivers/staging/batman-adv/hard-interface.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/staging/batman-adv/hard-interface.c b/drivers/staging/batman-adv/hard-interface.c index e9cb977..28d02f6 100644 --- a/drivers/staging/batman-adv/hard-interface.c +++ b/drivers/staging/batman-adv/hard-interface.c @@ -399,8 +399,7 @@ int hardif_add_interface(char *dev, int if_num) return 1; out: - if (batman_if->packet_buff) - kfree(batman_if->packet_buff); + kfree(batman_if->packet_buff); kfree(batman_if); kfree(dev); return -1; -- 1.6.5.7

2 18

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