commits May 2010

commits@lists.open-mesh.org

1 participants
83 discussions

r1654 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 04 May '10

04 May '10

Author: marek Date: 2010-05-04 09:31:55 +0200 (Tue, 04 May 2010) New Revision: 1654 Modified: trunk/batman-adv-kernelland/README Log: batman-adv: strip utf8 characters from the README Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv-kernelland/README =================================================================== --- trunk/batman-adv-kernelland/README 2010-05-04 02:07:21 UTC (rev 1653) +++ trunk/batman-adv-kernelland/README 2010-05-04 07:31:55 UTC (rev 1654) @@ -1,30 +1,30 @@ -[state: 03‐05‐2010] +[state: 03-05-2010] -BATMAN‐ADV -‐‐‐‐‐‐‐‐‐‐ +BATMAN-ADV +---------- Batman advanced is a new approach to wireless networking which does no longer operate on the IP basis. Unlike the batman daemon, which exchanges information using UDP packets and sets routing -tables, batman‐advanced operates on ISO/OSI Layer 2 only and uses +tables, batman-advanced operates on ISO/OSI Layer 2 only and uses and routes (or better: bridges) Ethernet Frames. It emulates a virtual network switch of all nodes participating. Therefore all -nodes appear to be link local, thus all higher operating proto‐ -cols won’t be affected by any changes within the network. You can +nodes appear to be link local, thus all higher operating proto- +cols won't be affected by any changes within the network. You can run almost any protocol above batman advanced, prominent examples are: IPv4, IPv6, DHCP, IPX. -Batman advanced was implemented as a Linux kernel driver to re‐ +Batman advanced was implemented as a Linux kernel driver to re- duce the overhead to a minimum. It does not depend on any (other) network driver, and can be used on wifi as well as ethernet lan, -vpn, etc ... (anything with ethernet‐style layer 2). It compiles -against and should work with Linux 2.6.21 ‐ 2.6.33. 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. :‐) +vpn, etc ... (anything with ethernet-style layer 2). It compiles +against and should work with Linux 2.6.21 - 2.6.33. 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: @@ -36,13 +36,13 @@ CONFIGURATION -‐‐‐‐‐‐‐‐‐‐‐‐‐ +------------- -Load the batman‐adv module into your kernel: +Load the batman-adv module into your kernel: -# insmod batman‐adv.ko +# insmod batman-adv.ko -The module is now waiting for activation. You must add some in‐ +The module is now waiting for activation. You must add some in- terfaces on which batman can operate. After loading the module batman advanced will scan your systems interfaces to search for compatible interfaces. Once found, it will create subfolders in @@ -51,13 +51,13 @@ # ls /sys/class/net/eth0/batman_adv/ # iface_status mesh_iface -If an interface does not have the "batman_adv" subfolder it prob‐ +If an interface does not have the "batman_adv" subfolder it prob- ably is not supported. Not supported interfaces are: loopback, -non‐ethernet and batman’s own interfaces. +non-ethernet and batman's own interfaces. Note: After the module was loaded it will continuously watch for new interfaces to verify the compatibility. There is no need to -reload the module if you plug your USB wifi adapter into your ma‐ +reload the module if you plug your USB wifi adapter into your ma- chine after batman advanced was initially loaded. To activate a given interface simply write "bat0" into its @@ -79,7 +79,7 @@ # echo none > /sys/class/net/eth0/batman_adv/mesh_iface -All mesh wide settings can be found in batman’s own interface +All mesh wide settings can be found in batman's own interface folder: # ls /sys/class/net/bat0/mesh/ @@ -87,13 +87,13 @@ # orig_interval transtable_local vis_data -Some of the files contain all sort of status information regard‐ +Some of the files contain all sort of status information regard- ing the mesh network. For example, you can view the table of originators (mesh participants) with: # cat /sys/class/net/bat0/mesh/originators -Other files allow to change batman’s behaviour to better fit your +Other files allow to change batman's behaviour to better fit your requirements. For instance, you can check the current originator interval (value in milliseconds which determines how often batman sends its broadcast packets): @@ -106,12 +106,12 @@ # echo 3000 > /sys/class/net/bat0/mesh/orig_interval In very mobile scenarios, you might want to adjust the originator -interval to a lower value. This will make the mesh more respon‐ +interval to a lower value. This will make the mesh more respon- sive to topology changes, but will also increase the overhead. USAGE -‐‐‐‐‐ +----- To make use of your newly created mesh, batman advanced provides a new interface "bat0" which you should use from this point on. @@ -120,28 +120,29 @@ over" the data by using the batman interface and batman will make sure it reaches its destination. -The "bat0" interface can be used like any other regular inter‐ -face. It needs an IP address which can be either statically con‐ +The "bat0" interface can be used like any other regular inter- +face. It needs an IP address which can be either statically con- figured or dynamically (by using DHCP or similar services): # NodeA: ifconfig bat0 192.168.0.1 # NodeB: ifconfig bat0 192.168.0.2 # NodeB: ping 192.168.0.1 -Note: In order to avoid problems remove all IP addresses previ‐ +Note: In order to avoid problems remove all IP addresses previ- ously assigned to interfaces now used by batman advanced, e.g. # ifconfig eth0 0.0.0.0 -VISUALIZATION ‐‐‐‐‐‐‐‐‐‐‐‐‐ +VISUALIZATION +------------- If you want topology visualization, at least one mesh node must -be configured as VIS‐server: +be configured as VIS-server: # echo "server" > /sys/class/net/bat0/mesh/vis_mode -Each node is either configured as "server" or as "client" (de‐ +Each node is either configured as "server" or as "client" (de- fault: "client"). Clients send their topology data to the server next to them, and server synchronize with other servers. If there is no server configured (default) within the mesh, no topology @@ -156,20 +157,20 @@ This raw output is intended to be easily parsable and convertable with other tools. Have a look at the batctl README if you want a -vis output in dot or json format for instance and how those out‐ +vis output in dot or json format for instance and how those out- puts could then be visualised in an image. The raw format consists of comma separated values per entry where -each entry is giving information about a certain source inter‐ +each entry is giving information about a certain source inter- face. Each entry can/has to have the following values: -‐> "mac" ‐ mac address of an originator’s source interface +-> "mac" - mac address of an originator's source interface (each line begins with it) -‐> "TQ mac value" ‐ src mac’s link quality towards mac address - of a neighbor originator’s interface which +-> "TQ mac value" - src mac's link quality towards mac address + of a neighbor originator's interface which is being used for routing -‐> "HNA mac" ‐ HNA announced by source mac -‐> "PRIMARY" ‐ this is a primary interface -‐> "SEC mac" ‐ secondary mac address of source +-> "HNA mac" - HNA announced by source mac +-> "PRIMARY" - this is a primary interface +-> "SEC mac" - secondary mac address of source (requires preceding PRIMARY) The TQ value has a range from 4 to 255 with 255 being the best. @@ -179,57 +180,57 @@ LOGGING/DEBUGGING -‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐ +----------------- All error messages, warnings and information messages are sent to the kernel log. Depending on your operating system distribution -this can be read in one of a number of ways. Try using the com‐ +this can be read in one of a number of ways. Try using the com- mands: dmesg, logread, or looking in the files /var/log/kern.log -or /var/log/syslog. All batman‐adv messages are prefixed with -"batman‐adv:" So to see just these messages try +or /var/log/syslog. All batman-adv messages are prefixed with +"batman-adv:" So to see just these messages try -# dmesg | grep batman‐adv +# dmesg | grep batman-adv -When investigating problems with your mesh network it is some‐ +When investigating problems with your mesh network it is some- times necessary to see more detail debug messages. This must be -enabled when compiling the batman‐adv module. When building bat‐ -man‐adv as part of kernel, use "make menuconfig" and enable the +enabled when compiling the batman-adv module. When building bat- +man-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 +#EXTRA_CFLAGS += -DCONFIG_BATMAN_ADV_DEBUG -The additional debug output is by default disabled. It can be en‐ +The additional debug output is by default disabled. It can be en- abled either at kernel modules 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. -0 ‐ All debug output disabled -1 ‐ Enable messages related to routing / flooding / broadcasting -2 ‐ Enable route or hna added / changed / deleted -3 ‐ Enable all messages +0 - All debug output disabled +1 - Enable messages related to routing / flooding / broadcasting +2 - Enable route or hna added / changed / deleted +3 - Enable all messages e.g. -# modprobe batman‐adv debug=2 +# modprobe batman-adv debug=2 will load the module and enable debug messages for when routes or HNAs change. The debug output can also be changed at runtime using the file -/sys/module/batman‐adv/parameters/debug. e.g. +/sys/module/batman-adv/parameters/debug. e.g. -# echo 2 > /sys/module/batman‐adv/parameters/debug +# echo 2 > /sys/module/batman-adv/parameters/debug enables debug messages for when routes or HNAs -The debug output is sent to the kernel logs. So try dmesg, lo‐ +The debug output is sent to the kernel logs. So try dmesg, lo- gread, etc to see the debug messages. BATCTL -‐‐‐‐‐‐ +------ As batman advanced operates on layer 2 all hosts participating in the virtual switch are completely transparent for all protocols @@ -240,20 +241,20 @@ For more information, please see the manpage (man batctl). -batctl is available on http://www.open‐mesh.org/ +batctl is available on http://www.open-mesh.org/ CONTACT -‐‐‐‐‐‐‐ +------- Please send us comments, experiences, questions, anything :) IRC: #batman on irc.freenode.org -Mailing‐list: b.a.t.m.a.n(a)xn--openmesh-3m3d.net (optional subscription - at https://lists.open‐mesh.org/mm/listinfo/b.a.t.m.a.n) +Mailing-list: b.a.t.m.a.n(a)open-mesh.net (optional subscription + at https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n) You can also contact the Authors: Marek Lindner <lindner_marek(a)yahoo.de> -Simon Wunderlich <siwu(a)hrz.xn--tuchemnitz-rt6e.de> +Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>

1 0

r1653 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 04 May '10

04 May '10

Author: marek Date: 2010-05-04 04:07:21 +0200 (Tue, 04 May 2010) New Revision: 1653 Modified: trunk/batman-adv-kernelland/bat_sysfs.c trunk/batman-adv-kernelland/compat.h Log: batman-adv: adding sysfs compat The linux sysfs layer changed with 2.6.25 which breaks batman-adv on older versions. This patch adds a compat layer for the affected function calls. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Modified: trunk/batman-adv-kernelland/bat_sysfs.c =================================================================== --- trunk/batman-adv-kernelland/bat_sysfs.c 2010-05-04 02:07:17 UTC (rev 1652) +++ trunk/batman-adv-kernelland/bat_sysfs.c 2010-05-04 02:07:21 UTC (rev 1653) @@ -27,6 +27,7 @@ #include "gateway_common.h" #include "gateway_client.h" #include "vis.h" +#include "compat.h" #define to_dev(obj) container_of(obj, struct device, kobj) Modified: trunk/batman-adv-kernelland/compat.h =================================================================== --- trunk/batman-adv-kernelland/compat.h 2010-05-04 02:07:17 UTC (rev 1652) +++ trunk/batman-adv-kernelland/compat.h 2010-05-04 02:07:21 UTC (rev 1653) @@ -23,6 +23,7 @@ */ #include <linux/version.h> /* LINUX_VERSION_CODE */ +#include "bat_sysfs.h" /* struct bat_attribute */ #ifndef IPPROTO_UDP #define IPPROTO_UDP 17 @@ -52,6 +53,17 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) +#define transtable_local_read(kobj, attr, buff, off, count) \ + transtable_local_read(kobj, buff, off, count) +#define transtable_global_read(kobj, attr, buff, off, count) \ + transtable_global_read(kobj, buff, off, count) +#define originators_read(kobj, attr, buff, off, count) \ + originators_read(kobj, buff, off, count) +#define gateways_read(kobj, attr, buff, off, count) \ + gateways_read(kobj, buff, off, count) +#define vis_data_read(kobj, attr, buff, off, count) \ + vis_data_read(kobj, buff, off, count) + static inline int skb_clone_writable(struct sk_buff *skb, unsigned int len) { /* skb->hdr_len not available, just "not writable" to enforce a copy */ @@ -80,6 +92,64 @@ ret; \ }) +#define to_battr(a) container_of(a, struct bat_attribute, attr) + +static inline ssize_t bat_wrapper_show(struct kobject *kobj, + struct attribute *attr, char *buf) +{ + struct bat_attribute *bat_attr = to_battr(attr); + + if (bat_attr->show) + return bat_attr->show(kobj, attr, buf); + + return -EIO; +} + +static inline ssize_t bat_wrapper_store(struct kobject *kobj, + struct attribute *attr, + const char *buf, size_t count) +{ + struct bat_attribute *bat_attr = to_battr(attr); + + if (bat_attr->store) + return bat_attr->store(kobj, attr, (char *)buf, count); + + return -EIO; +} + +static struct sysfs_ops bat_wrapper_ops = { + .show = bat_wrapper_show, + .store = bat_wrapper_store, +}; + +static struct kobj_type ktype_bat_wrapper = { + .sysfs_ops = &bat_wrapper_ops, +}; + +static inline struct kobject *kobject_create_and_add(const char *name, + struct kobject *parent) +{ + struct kobject *kobj; + int err; + + kobj = kzalloc(sizeof(*kobj), GFP_KERNEL); + if (!kobj) + return NULL; + + kobject_set_name(kobj, name); + kobj->ktype = &ktype_bat_wrapper; + kobj->kset = NULL; + kobj->parent = parent; + + err = kobject_register(kobj); + if (err) { + kobject_put(kobj); + return NULL; + } + + return kobj; +} + #endif /* < KERNEL_VERSION(2, 6, 25) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)

1 0

r1652 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 04 May '10

04 May '10

Author: marek Date: 2010-05-04 04:07:17 +0200 (Tue, 04 May 2010) New Revision: 1652 Modified: trunk/batman-adv-kernelland/compat.h Log: batman-adv: adding MAC_FMT compatibility Kernel older than 2.6.24 do not have the MAC_FMT definition, therefore we need to add it to our compat layer. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv-kernelland/compat.h =================================================================== --- trunk/batman-adv-kernelland/compat.h 2010-05-04 01:46:24 UTC (rev 1651) +++ trunk/batman-adv-kernelland/compat.h 2010-05-04 02:07:17 UTC (rev 1652) @@ -62,6 +62,12 @@ #endif /* < KERNEL_VERSION(2, 6, 23) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) + +#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" + +#endif /* < KERNEL_VERSION(2, 6, 24) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) #define strict_strtoul(cp, base, res) \

1 0

r1651 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 04 May '10

04 May '10

Author: marek Date: 2010-05-04 03:46:24 +0200 (Tue, 04 May 2010) New Revision: 1651 Modified: trunk/batman-adv-kernelland/README Log: batman-adv: updating README Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv-kernelland/README =================================================================== --- trunk/batman-adv-kernelland/README 2010-05-02 23:24:27 UTC (rev 1650) +++ trunk/batman-adv-kernelland/README 2010-05-04 01:46:24 UTC (rev 1651) @@ -1,186 +1,259 @@ -[state: 22-03-2010] +[state: 03‐05‐2010] -BATMAN-ADV ----------- +BATMAN‐ADV +‐‐‐‐‐‐‐‐‐‐ -Batman-advanced is a new approach to wireless networking which does no longer -operate on the IP basis. Unlike B.A.T.M.A.N, which exchanges information -using UDP packets and sets routing tables, batman-advanced operates on ISO/OSI -Layer 2 only and uses and routes (or better: bridges) Ethernet Frames. It -emulates a virtual network switch of all nodes participating. Therefore all -nodes appear to be link local, thus all higher operating protocols won't be -affected by any changes within the network. You can run almost any protocol -above B.A.T.M.A.N. Advanced, prominent examples are: IPv4, IPv6, DHCP, IPX. +Batman advanced is a new approach to wireless networking which +does no longer operate on the IP basis. Unlike the batman daemon, +which exchanges information using UDP packets and sets routing +tables, batman‐advanced operates on ISO/OSI Layer 2 only and uses +and routes (or better: bridges) Ethernet Frames. It emulates a +virtual network switch of all nodes participating. Therefore all +nodes appear to be link local, thus all higher operating proto‐ +cols won’t be affected by any changes within the network. You can +run almost any protocol above batman 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.33. 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. :-) +Batman advanced was implemented as a Linux kernel driver to re‐ +duce the overhead to a minimum. It does not depend on any (other) +network driver, and can be used on wifi as well as ethernet lan, +vpn, etc ... (anything with ethernet‐style layer 2). It compiles +against and should work with Linux 2.6.21 ‐ 2.6.33. 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: +‐‐‐‐‐‐‐ +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 ------ -insmod the batman-adv.ko in your kernel: +CONFIGURATION +‐‐‐‐‐‐‐‐‐‐‐‐‐ -# insmod batman-adv.ko +Load the batman‐adv module into your kernel: -the module is now waiting for activation. You must add some interfaces -on which batman can operate. Each interface must be added separately: +# insmod batman‐adv.ko -# echo wlan0 > /proc/net/batman-adv/interfaces +The module is now waiting for activation. You must add some in‐ +terfaces on which batman can operate. After loading the module +batman advanced will scan your systems interfaces to search for +compatible interfaces. Once found, it will create subfolders in +the /sys directories of each supported interface, e.g. -( # echo wlan1 > /proc/net/batman-adv/interfaces ) -( # echo eth0 > /proc/net/batman-adv/interfaces ) -( ... ) +# ls /sys/class/net/eth0/batman_adv/ +# iface_status mesh_iface -Now batman starts broadcasting on this interface. -You can now view the table of originators (mesh participants) with: +If an interface does not have the "batman_adv" subfolder it prob‐ +ably is not supported. Not supported interfaces are: loopback, +non‐ethernet and batman’s own interfaces. -# cat /proc/net/batman-adv/originators +Note: After the module was loaded it will continuously watch for +new interfaces to verify the compatibility. There is no need to +reload the module if you plug your USB wifi adapter into your ma‐ +chine after batman advanced was initially loaded. -The module will create a new interface "bat0", which can be used as a -regular interface: +To activate a given interface simply write "bat0" into its +"mesh_iface" file inside the batman_adv subfolder: -# ifconfig bat0 inet 192.168.0.1 up -# ping 192.168.0.2 -... +# echo bat0 > /sys/class/net/eth0/batman_adv/mesh_iface ---- -If you want topology visualization, your meshnode must be configured -as VIS-server: +Repeat this step for all interfaces you wish to add. Now batman +starts using/broadcasting on this/these interface(s). -# echo "server" > /proc/net/batman-adv/vis_server +By reading the "iface_status" file you can check its status: -Each node is either configured as "server" or as "client" (default: -"client"). Clients send their topology data to the server next to them, -and server synchronize with other servers. If there is no server -configured (default) within the mesh, no topology information will be -transmitted. With these "synchronizing servers", there can be 1 or -more vis servers sharing the same (or at least very similar) data. +# cat /sys/class/net/eth0/batman_adv/iface_status +# active -When configured as server, you can get a topology snapshot of your mesh: +To deactivate an interface you have to write "none" into its +"mesh_iface" file: -# cat /proc/net/batman-adv/vis_data +# echo none > /sys/class/net/eth0/batman_adv/mesh_iface -This raw output is intended to be easily parsable and convertable with -other tools. Have a look at the batctl README if you want a vis output -in dot or json format for instance and how those outputs could then be -visualised in an image. -The raw format consists of comma seperated values per entry where each -entry is giving information about a certain source interface. Each entry -can/has to have the following values: --> "mac" -> mac address of an originator's source interface - (each line begins with it) --> "TQ mac value" -> src mac's link quality towards mac address of a neighbor - originator's interface which is being used for routing --> "HNA mac" -> HNA announced by source mac --> "PRIMARY" -> this is a primary interface --> "SEC mac" -> secondary mac address of source (requires preceeding --> PRIMARY) +All mesh wide settings can be found in batman’s own interface +folder: -The TQ value has a range from 4 to 255 with 255 being the best. -The HNA entries are showing which hosts are connected to the mesh via bat0 -or being bridged into the mesh network. -The PRIMARY/SEC values are only applied on primary interfaces +# ls /sys/class/net/bat0/mesh/ +# aggregate_ogm originators transtable_global vis_mode +# orig_interval transtable_local vis_data ---- + +Some of the files contain all sort of status information regard‐ +ing the mesh network. For example, you can view the table of +originators (mesh participants) with: + +# cat /sys/class/net/bat0/mesh/originators + +Other files allow to change batman’s behaviour to better fit your +requirements. For instance, you can check the current originator +interval (value in milliseconds which determines how often batman +sends its broadcast packets): + +# cat /sys/class/net/bat0/mesh/orig_interval +# status: 1000 + +and also change its value: + +# echo 3000 > /sys/class/net/bat0/mesh/orig_interval + In very mobile scenarios, you might want to adjust the originator -interval to a lower value. This will make the mesh more responsive to -topology changes, but will also increase the overhead. Please make sure -that all nodes in your mesh use the same interval. The default value -is 1000 ms (1 second). +interval to a lower value. This will make the mesh more respon‐ +sive to topology changes, but will also increase the overhead. -# echo 1000 > /proc/net/batman-adv/orig_interval -To deactivate batman, do: +USAGE +‐‐‐‐‐ -# echo "" > /proc/net/batman-adv/interfaces +To make use of your newly created mesh, batman advanced provides +a new interface "bat0" which you should use from this point on. +All interfaces added to batman advanced are not relevant any +longer because batman handles them for you. Basically, one "hands +over" the data by using the batman interface and batman will make +sure it reaches its destination. +The "bat0" interface can be used like any other regular inter‐ +face. It needs an IP address which can be either statically con‐ +figured or dynamically (by using DHCP or similar services): + +# NodeA: ifconfig bat0 192.168.0.1 +# NodeB: ifconfig bat0 192.168.0.2 +# NodeB: ping 192.168.0.1 + +Note: In order to avoid problems remove all IP addresses previ‐ +ously assigned to interfaces now used by batman advanced, e.g. + +# ifconfig eth0 0.0.0.0 + + +VISUALIZATION ‐‐‐‐‐‐‐‐‐‐‐‐‐ + +If you want topology visualization, at least one mesh node must +be configured as VIS‐server: + +# echo "server" > /sys/class/net/bat0/mesh/vis_mode + +Each node is either configured as "server" or as "client" (de‐ +fault: "client"). Clients send their topology data to the server +next to them, and server synchronize with other servers. If there +is no server configured (default) within the mesh, no topology +information will be transmitted. With these "synchronizing +servers", there can be 1 or more vis servers sharing the same (or +at least very similar) data. + +When configured as server, you can get a topology snapshot of +your mesh: + +# cat /sys/class/net/bat0/mesh/vis_data + +This raw output is intended to be easily parsable and convertable +with other tools. Have a look at the batctl README if you want a +vis output in dot or json format for instance and how those out‐ +puts could then be visualised in an image. + +The raw format consists of comma separated values per entry where +each entry is giving information about a certain source inter‐ +face. Each entry can/has to have the following values: +‐> "mac" ‐ mac address of an originator’s source interface + (each line begins with it) +‐> "TQ mac value" ‐ src mac’s link quality towards mac address + of a neighbor originator’s interface which + is being used for routing +‐> "HNA mac" ‐ HNA announced by source mac +‐> "PRIMARY" ‐ this is a primary interface +‐> "SEC mac" ‐ secondary mac address of source + (requires preceding PRIMARY) + +The TQ value has a range from 4 to 255 with 255 being the best. +The HNA entries are showing which hosts are connected to the mesh +via bat0 or being bridged into the mesh network. The PRIMARY/SEC +values are only applied on primary interfaces + + LOGGING/DEBUGGING ------------------ +‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐ -All error messages, warnings and information messages are sent to the -kernel log. Depending on your operating system distribution this can be -read in one of a number of ways. Try using the commands: dmesg, -logread, or looking in the files /var/log/kern.log or -/var/log/syslog. All batman-adv messages are prefixed with -"batman-adv:" So to see just these messages try +All error messages, warnings and information messages are sent to +the kernel log. Depending on your operating system distribution +this can be read in one of a number of ways. Try using the com‐ +mands: dmesg, logread, or looking in the files /var/log/kern.log +or /var/log/syslog. All batman‐adv messages are prefixed with +"batman‐adv:" So to see just these messages try -dmesg | grep batman-adv +# 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 +When investigating problems with your mesh network it is some‐ +times necessary to see more detail debug messages. This must be +enabled when compiling the batman‐adv module. When building bat‐ +man‐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 +#EXTRA_CFLAGS += ‐DCONFIG_BATMAN_ADV_DEBUG -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 -output at module load time, add the module parameter debug=<value>. -<value> can take one of four values. +The additional debug output is by default disabled. It can be en‐ +abled either at kernel modules 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. -0 - All debug output disabled -1 - Enable messages related to routing / flooding / broadcasting -2 - Enable route or hna added / changed / deleted -3 - Enable all messages +0 ‐ All debug output disabled +1 ‐ Enable messages related to routing / flooding / broadcasting +2 ‐ Enable route or hna added / changed / deleted +3 ‐ Enable all messages e.g. -modprobe batman-adv debug=2 +# modprobe batman‐adv debug=2 -will load the module and enable debug messages for when routes or HNAs -change. +will load the module and enable debug messages for when routes or +HNAs change. -The debug output can also be changed at runtime using the file -/sys/module/batman-adv/parameters/debug. e.g. +The debug output can also be changed at runtime using the file +/sys/module/batman‐adv/parameters/debug. e.g. -echo 2 > /sys/module/batman-adv/parameters/debug +# echo 2 > /sys/module/batman‐adv/parameters/debug enables debug messages for when routes or HNAs -The debug output is sent to the kernel logs. So try dmesg, logread etc -to see the debug messages. +The debug output is sent to the kernel logs. So try dmesg, lo‐ +gread, etc 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. +As batman advanced operates on layer 2 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). -batctl is available on http://www.open-mesh.net/ +batctl is available on http://www.open‐mesh.org/ + CONTACT -------- +‐‐‐‐‐‐‐ Please send us comments, experiences, questions, anything :) -IRC: #batman on irc.freenode.org -Mailing-list: b.a.t.m.a.n(a)open-mesh.net -(subscription at https://list.open-mesh.net/mm/listinfo/b.a.t.m.a.n ) +IRC: #batman on irc.freenode.org +Mailing‐list: b.a.t.m.a.n(a)xn--openmesh-3m3d.net (optional subscription + at https://lists.open‐mesh.org/mm/listinfo/b.a.t.m.a.n) You can also contact the Authors: -Marek Lindner <lindner_marek(a)yahoo.de> -Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> +Marek Lindner <lindner_marek(a)yahoo.de> +Simon Wunderlich <siwu(a)hrz.xn--tuchemnitz-rt6e.de> +

1 0

r1650 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 02 May '10

02 May '10

Author: marek Date: 2010-05-03 01:24:27 +0200 (Mon, 03 May 2010) New Revision: 1650 Modified: trunk/batman-adv-kernelland/bat_sysfs.c trunk/batman-adv-kernelland/bat_sysfs.h Log: batman-adv: remove redundant struct declaration The hardif_attr and the bat_attr struct share the same attributes, hence it is not necessary to specify 2 different structs. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv-kernelland/bat_sysfs.c =================================================================== --- trunk/batman-adv-kernelland/bat_sysfs.c 2010-05-02 23:24:21 UTC (rev 1649) +++ trunk/batman-adv-kernelland/bat_sysfs.c 2010-05-02 23:24:27 UTC (rev 1650) @@ -30,22 +30,6 @@ #define to_dev(obj) container_of(obj, struct device, kobj) -struct bat_attribute { - struct attribute attr; - ssize_t (*show)(struct kobject *kobj, struct attribute *attr, - char *buf); - ssize_t (*store)(struct kobject *kobj, struct attribute *attr, - char *buf, size_t count); -}; - -struct hardif_attribute { - struct attribute attr; - ssize_t (*show)(struct kobject *kobj, struct attribute *attr, - char *buf); - ssize_t (*store)(struct kobject *kobj, struct attribute *attr, - char *buf, size_t count); -}; - #define BAT_ATTR(_name, _mode, _show, _store) \ struct bat_attribute bat_attr_##_name = { \ .attr = {.name = __stringify(_name), \ @@ -62,14 +46,6 @@ .write = _write, \ }; -#define HARDIF_ATTR(_name, _mode, _show, _store) \ -struct hardif_attribute hardif_attr_##_name = { \ - .attr = {.name = __stringify(_name), \ - .mode = _mode }, \ - .show = _show, \ - .store = _store, \ -}; - static ssize_t show_aggr_ogm(struct kobject *kobj, struct attribute *attr, char *buff) { @@ -554,20 +530,20 @@ } } -static HARDIF_ATTR(mesh_iface, S_IRUGO | S_IWUSR, - show_mesh_iface, store_mesh_iface); -static HARDIF_ATTR(iface_status, S_IRUGO, show_iface_status, NULL); +static BAT_ATTR(mesh_iface, S_IRUGO | S_IWUSR, + show_mesh_iface, store_mesh_iface); +static BAT_ATTR(iface_status, S_IRUGO, show_iface_status, NULL); -static struct hardif_attribute *batman_attrs[] = { - &hardif_attr_mesh_iface, - &hardif_attr_iface_status, +static struct bat_attribute *batman_attrs[] = { + &bat_attr_mesh_iface, + &bat_attr_iface_status, NULL, }; int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev) { struct kobject *hardif_kobject = &dev->dev.kobj; - struct hardif_attribute **hardif_attr; + struct bat_attribute **bat_attr; int err; *hardif_obj = kobject_create_and_add(SYSFS_IF_BAT_SUBDIR, @@ -579,12 +555,12 @@ goto out; } - for (hardif_attr = batman_attrs; *hardif_attr; ++hardif_attr) { - err = sysfs_create_file(*hardif_obj, &((*hardif_attr)->attr)); + for (bat_attr = batman_attrs; *bat_attr; ++bat_attr) { + err = sysfs_create_file(*hardif_obj, &((*bat_attr)->attr)); if (err) { printk(KERN_ERR "batman-adv:Can't add sysfs file: %s/%s/%s\n", dev->name, SYSFS_IF_BAT_SUBDIR, - ((*hardif_attr)->attr).name); + ((*bat_attr)->attr).name); goto rem_attr; } } @@ -592,8 +568,8 @@ return 0; rem_attr: - for (hardif_attr = batman_attrs; *hardif_attr; ++hardif_attr) - sysfs_remove_file(*hardif_obj, &((*hardif_attr)->attr)); + for (bat_attr = batman_attrs; *bat_attr; ++bat_attr) + sysfs_remove_file(*hardif_obj, &((*bat_attr)->attr)); out: return -ENOMEM; } Modified: trunk/batman-adv-kernelland/bat_sysfs.h =================================================================== --- trunk/batman-adv-kernelland/bat_sysfs.h 2010-05-02 23:24:21 UTC (rev 1649) +++ trunk/batman-adv-kernelland/bat_sysfs.h 2010-05-02 23:24:27 UTC (rev 1650) @@ -20,10 +20,23 @@ */ +#ifndef BAT_SYSFS_H +#define BAT_SYSFS_H + #define SYSFS_IF_MESH_SUBDIR "mesh" #define SYSFS_IF_BAT_SUBDIR "batman_adv" +struct bat_attribute { + struct attribute attr; + ssize_t (*show)(struct kobject *kobj, struct attribute *attr, + char *buf); + ssize_t (*store)(struct kobject *kobj, struct attribute *attr, + char *buf, size_t count); +}; + int sysfs_add_meshif(struct net_device *dev); void sysfs_del_meshif(struct net_device *dev); int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev); void sysfs_del_hardif(struct kobject **hardif_obj); + +#endif

1 0

r1649 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 02 May '10

02 May '10

Author: marek Date: 2010-05-03 01:24:21 +0200 (Mon, 03 May 2010) New Revision: 1649 Modified: trunk/batman-adv-kernelland/originator.c Log: batman-adv: fix originator table output if no neighbor is in range If no neighbor was in range the originator sysfs file would print nothing at all. Now it will print a message saying that no neighbors are in range. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv-kernelland/originator.c =================================================================== --- trunk/batman-adv-kernelland/originator.c 2010-05-02 22:45:33 UTC (rev 1648) +++ trunk/batman-adv-kernelland/originator.c 2010-05-02 23:24:21 UTC (rev 1649) @@ -296,23 +296,22 @@ unsigned long flags; char orig_str[ETH_STR_LEN], router_str[ETH_STR_LEN]; - if (!bat_priv->primary_if) { - if (off == 0) + if ((!bat_priv->primary_if) || + (bat_priv->primary_if->if_status != IF_ACTIVE)) { + if (off > 0) + return 0; + + if (!bat_priv->primary_if) return sprintf(buff, - "BATMAN mesh %s disabled - " - "please specify interfaces to enable it\n", - net_dev->name); + "BATMAN mesh %s disabled - " + "please specify interfaces to enable it\n", + net_dev->name); - return 0; - } - - if (bat_priv->primary_if->if_status != IF_ACTIVE && off == 0) return sprintf(buff, "BATMAN mesh %s " "disabled - primary interface not active\n", net_dev->name); - else if (bat_priv->primary_if->if_status != IF_ACTIVE) - return 0; + } rcu_read_lock(); hdr_len = sprintf(buff,

1 0

r1648 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 02 May '10

02 May '10

Author: marek Date: 2010-05-03 00:45:33 +0200 (Mon, 03 May 2010) New Revision: 1648 Modified: trunk/batman-adv-kernelland/originator.c trunk/batman-adv-kernelland/routing.c trunk/batman-adv-kernelland/send.c Log: batman-adv: Synchronize formating with maint Some changes in "batman-adv: Reduce max characters on a line to 80" for trunk and maint branch were made slightly different and should be synchronized for easier tracking of changes between them. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batman-adv-kernelland/originator.c =================================================================== --- trunk/batman-adv-kernelland/originator.c 2010-05-02 22:45:28 UTC (rev 1647) +++ trunk/batman-adv-kernelland/originator.c 2010-05-02 22:45:33 UTC (rev 1648) @@ -250,6 +250,7 @@ update_bonding_candidates(bat_priv, orig_node); } } + return false; } @@ -310,7 +311,7 @@ "BATMAN mesh %s " "disabled - primary interface not active\n", net_dev->name); - else if (bat_priv->primary_if->if_status) + else if (bat_priv->primary_if->if_status != IF_ACTIVE) return 0; rcu_read_lock(); Modified: trunk/batman-adv-kernelland/routing.c =================================================================== --- trunk/batman-adv-kernelland/routing.c 2010-05-02 22:45:28 UTC (rev 1647) +++ trunk/batman-adv-kernelland/routing.c 2010-05-02 22:45:33 UTC (rev 1648) @@ -641,8 +641,8 @@ if (is_my_oldorig) { bat_dbg(DBG_BATMAN, - "Drop packet: ignoring all rebroadcast echos " - "(sender: %pM)\n", ethhdr->h_source); + "Drop packet: ignoring all rebroadcast echos (sender: " + "%pM)\n", ethhdr->h_source); return; } Modified: trunk/batman-adv-kernelland/send.c =================================================================== --- trunk/batman-adv-kernelland/send.c 2010-05-02 22:45:28 UTC (rev 1647) +++ trunk/batman-adv-kernelland/send.c 2010-05-02 22:45:33 UTC (rev 1648) @@ -152,11 +152,9 @@ "Sending own" : "Forwarding")); bat_dbg(DBG_BATMAN, - "%s %spacket " - "(originator %pM, seqno %d, TQ %d, TTL %d, IDF %s) " - "on interface %s [%s]\n", - fwd_str, - (packet_num > 0 ? "aggregated " : ""), + "%s %spacket (originator %pM, seqno %d, TQ %d, TTL %d," + " IDF %s) on interface %s [%s]\n", + fwd_str, (packet_num > 0 ? "aggregated " : ""), batman_packet->orig, ntohl(batman_packet->seqno), batman_packet->tq, batman_packet->ttl, (batman_packet->flags & DIRECTLINK ?

1 0

r1647 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 02 May '10

02 May '10

Author: marek Date: 2010-05-03 00:45:28 +0200 (Mon, 03 May 2010) New Revision: 1647 Modified: trunk/batman-adv-kernelland/README Log: batman-adv: Merge README with 0.2.1 release Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batman-adv-kernelland/README =================================================================== --- trunk/batman-adv-kernelland/README 2010-05-02 22:45:23 UTC (rev 1646) +++ trunk/batman-adv-kernelland/README 2010-05-02 22:45:28 UTC (rev 1647) @@ -1,4 +1,4 @@ -[state: 01-01-2010] +[state: 22-03-2010] BATMAN-ADV ---------- @@ -15,7 +15,7 @@ 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 +It compiles against and should work with Linux 2.6.20 - 2.6.33. 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. :-) @@ -57,10 +57,11 @@ # ping 192.168.0.2 ... +--- If you want topology visualization, your meshnode must be configured as VIS-server: -# echo "server" > /proc/net/batman-adv/vis +# echo "server" > /proc/net/batman-adv/vis_server Each node is either configured as "server" or as "client" (default: "client"). Clients send their topology data to the server next to them, @@ -71,19 +72,31 @@ When configured as server, you can get a topology snapshot of your mesh: -# cat /proc/net/batman-adv/vis +# cat /proc/net/batman-adv/vis_data -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. +This raw output is intended to be easily parsable and convertable with +other tools. Have a look at the batctl README if you want a vis output +in dot or json format for instance and how those outputs could then be +visualised in an image. -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. +The raw format consists of comma seperated values per entry where each +entry is giving information about a certain source interface. Each entry +can/has to have the following values: +-> "mac" -> mac address of an originator's source interface + (each line begins with it) +-> "TQ mac value" -> src mac's link quality towards mac address of a neighbor + originator's interface which is being used for routing +-> "HNA mac" -> HNA announced by source mac +-> "PRIMARY" -> this is a primary interface +-> "SEC mac" -> secondary mac address of source (requires preceeding +-> PRIMARY) -echo "json" > /proc/net/batman-adv/vis_format +The TQ value has a range from 4 to 255 with 255 being the best. +The HNA entries are showing which hosts are connected to the mesh via bat0 +or being bridged into the mesh network. +The PRIMARY/SEC values are only applied on primary interfaces +--- In very mobile scenarios, you might want to adjust the originator interval to a lower value. This will make the mesh more responsive to topology changes, but will also increase the overhead. Please make sure

1 0

r1646 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 02 May '10

02 May '10

Author: marek Date: 2010-05-03 00:45:23 +0200 (Mon, 03 May 2010) New Revision: 1646 Modified: trunk/batman-adv-kernelland/CHANGELOG Log: batman-adv: Merge CHANGELOG with 0.2.1 release Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batman-adv-kernelland/CHANGELOG =================================================================== --- trunk/batman-adv-kernelland/CHANGELOG 2010-05-01 18:57:32 UTC (rev 1645) +++ trunk/batman-adv-kernelland/CHANGELOG 2010-05-02 22:45:23 UTC (rev 1646) @@ -1,3 +1,17 @@ +batman-adv 0.2.1: + +* support latest kernels (2.6.20 - 2.6.33) +* receive packets directly using skbs, remove old sockets and threads +* fix various regressions in the vis server +* don't disable interrupts while sending +* replace internal logging mechanism with standard kernel logging +* move vis formats into userland, one general format remains in the kernel +* allow MAC address to be set, correctly initialize them +* code refactoring and cleaning for coding style +* many bugs (null pointers, locking, hash iterators) squashed + + -- Sun, 21 Mar 2010 20:46:47 +0100 + batman-adv 0.2: * support latest kernels (2.6.20 - 2.6.31)

1 0

r1645 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 01 May '10

01 May '10

Author: marek Date: 2010-05-01 20:57:32 +0200 (Sat, 01 May 2010) New Revision: 1645 Modified: trunk/batman-adv-kernelland/send.c Log: batman-adv: multiple assignments should be avoided Signed-off-by: Andrea Gelmini <andrea.gelmini(a)gelma.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> Modified: trunk/batman-adv-kernelland/send.c =================================================================== --- trunk/batman-adv-kernelland/send.c 2010-05-01 18:57:27 UTC (rev 1644) +++ trunk/batman-adv-kernelland/send.c 2010-05-01 18:57:32 UTC (rev 1645) @@ -130,7 +130,8 @@ if (batman_if->if_status != IF_ACTIVE) return; - packet_num = buff_pos = 0; + packet_num = 0; + buff_pos = 0; batman_packet = (struct batman_packet *) (forw_packet->packet_buff);

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2010