B.A.T.M.A.N June 2010

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

24 participants
44 discussions

[B.A.T.M.A.N.] [PATCH] batctl: Merge differences between v2010.0.0
by Sven Eckelmann 20 Jun '10

20 Jun '10

batctl started to diverge when the batctl-0.2.x (later batctl-maint) was created. Even when not all changes inside the batctl branch has to be in the batctl-maint branch, it must be ensured that all changes in batctl-maint are also part of batctl. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batctl/Makefile | 2 +- batctl/README | 79 ++++++++++++++++++++++++++- batctl/allocate.h | 2 +- batctl/bat-hosts.c | 2 +- batctl/bat-hosts.h | 2 +- batctl/bisect.c | 2 +- batctl/bisect.h | 2 +- batctl/debug.c | 2 +- batctl/functions.c | 4 +- batctl/functions.h | 3 +- batctl/main.c | 2 +- batctl/main.h | 2 +- batctl/man/batctl.8 | 150 ++++++++++++++++++++------------------------------ batctl/ping.c | 2 +- batctl/ping.h | 2 +- batctl/tcpdump.c | 2 +- batctl/tcpdump.h | 2 +- batctl/traceroute.c | 2 +- batctl/traceroute.h | 2 +- batctl/vis.c | 4 +- batctl/vis.h | 4 +- batman/hash.c | 2 +- batman/hash.h | 2 +- batman/list-batman.c | 2 +- batman/list-batman.h | 2 +- 25 files changed, 166 insertions(+), 116 deletions(-) diff --git a/batctl/Makefile b/batctl/Makefile index c70e578..ab9c075 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 BATMAN contributors +# Copyright (C) 2006-2010 BATMAN contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public diff --git a/batctl/README b/batctl/README index a234799..8f22eb1 100644 --- a/batctl/README +++ b/batctl/README @@ -335,7 +335,7 @@ Globally announced HNAs received via the mesh (translation table): * ca:a1:5b:e5:00:00 via fe:fe:00:00:06:01 batctl vis_server -================ +================= display or modify the status of the VIS server @@ -348,4 +348,81 @@ $ batctl vis_server [ ] server mode (server enabled) +batctl vis_data +=============== +display the VIS data in dot or JSON format + + +Usage: + +batctl vis dot {-h}{--no-HNA|-H} {--no-2nd|-2} {--numbers|-n} +or +batctl vis json {-h}{--no-HNA|-H} {--no-2nd|-2} {--numbers|-n} + + +Example: +(A <- 100% -> B,B-if2 <- 50% -> C) + +$ batctl vis_data dot +digraph { + "A" -> "B" [label="1.00"] + "A" -> "00:ff:f3:cc:68:ac" [label="HNA"] + subgraph "cluster_A" { + "A" [peripheries=2] + } + "B" -> "A" [label="1.00"] + "B-if2" -> "C" [label="2.00"] + "B" -> "22:ff:f3:cc:68:ac" [label="HNA"] + subgraph "cluster_B" { + "B" [peripheries=2] + "B-if2" + } + "C" -> "B-if2" [label="2.00"] + "C" -> "44:ff:f3:cc:68:ac" [label="HNA"] + subgraph "cluster_C" { + "C" [peripheries=2] + } +} + + +Explanation: + +The vis dot (or json) output is adding an entry for each link between two +originator's interfaces which are being used for internal routing in batman. +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. + +A host's mac address which is currently connected to the interface of a mesh +node (either the mesh node itself or hosts being bridged into the mesh) is +being displayed with an "HNA"-label. (--no-hna omits this output) + +To still have the information about which interfaces belong to which mesh node +a subgraph/cluster is being added. The subpgraph is being labeled with a mesh +nodes primary interface mac (= Originator MAC). It also has an additional tag +[peripheries=2] to make this important MAC address visible, for instance in an +image. (--no-2nd omits this output) +After the conversion to a png file with graphviz-tools' fdp, all interfaces of +a node would be combined in a visual box (see below for details). + + +vis-dot to png +-------------- + +The vis dot output could then further be converted to an image of the topology +graph, e.g. with the help of the graphviz-tools. The according commands could +then look like this: + +$ batctl vis_data dot > /tmp/graph.dot +$ fdp -Tpng /tmp/graph.dot > graph.png + +Meaning of the shapes in this image file: +* Ellipses: All BATMAN-node and host interfaces can be found in here + labeled with the according interface MAC-address. +* Boxes: interfaces belonging to one BATMAN-node +* double circled interfaces: the primary interface of a BATMAN-node + (which is known to other BATMAN-nodes only, except direct neighbours) +* Ellipses with an HNA-arrow: mesh clients (this can be a BATMAN-node itself + with its bat0 interface or computers/devices being bridged into the mesh) +* Arrows with numbers: the transmit quality (in the form 1/TQ) from one + BATMAN interface to another BATMAN interface diff --git a/batctl/allocate.h b/batctl/allocate.h index 8347373..5584767 100644 --- a/batctl/allocate.h +++ b/batctl/allocate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/batctl/bat-hosts.c b/batctl/bat-hosts.c index 1ffe96a..8948892 100644 --- a/batctl/bat-hosts.c +++ b/batctl/bat-hosts.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/batctl/bat-hosts.h b/batctl/bat-hosts.h index 41fbd0a..0f019f9 100644 --- a/batctl/bat-hosts.h +++ b/batctl/bat-hosts.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/batctl/bisect.c b/batctl/bisect.c index b57afa3..2fa15f0 100644 --- a/batctl/bisect.c +++ b/batctl/bisect.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/batctl/bisect.h b/batctl/bisect.h index 71b6f32..70673e8 100644 --- a/batctl/bisect.h +++ b/batctl/bisect.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/batctl/debug.c b/batctl/debug.c index e8edb9d..0e877fa 100644 --- a/batctl/debug.c +++ b/batctl/debug.c @@ -100,4 +100,4 @@ int handle_debug_table(int argc, char **argv, char *file_path, void table_usage( debugfs_make_path(DEBUG_BATIF_PATH "/", full_path, sizeof(full_path)); return read_file(full_path, file_path, read_opt); -} \ No newline at end of file +} diff --git a/batctl/functions.c b/batctl/functions.c index 4e742b0..3bcb0b2 100644 --- a/batctl/functions.c +++ b/batctl/functions.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * @@ -99,7 +99,7 @@ char *get_name_by_macstr(char *mac_str, int read_opt) return get_name_by_macaddr(mac_addr, read_opt); } -int check_proc_dir(char *dir) +static int check_proc_dir(char *dir) { struct stat st; diff --git a/batctl/functions.h b/batctl/functions.h index 4f3a995..847a482 100644 --- a/batctl/functions.h +++ b/batctl/functions.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * @@ -35,7 +35,6 @@ char *get_name_by_macaddr(struct ether_addr *mac_addr, int read_opt); char *get_name_by_macstr(char *mac_str, int read_opt); int read_file(char *dir, char *path, int read_opt); int write_file(char *dir, char *fname, char *arg1, char *arg2); -int check_proc_dir(char *dir); char *strchr_anyof(const char *s, const char *n); extern char *line_ptr; diff --git a/batctl/main.c b/batctl/main.c index a225489..0506dce 100644 --- a/batctl/main.c +++ b/batctl/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/batctl/main.h b/batctl/main.h index 2fe603e..af2a8ca 100644 --- a/batctl/main.h +++ b/batctl/main.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/batctl/man/batctl.8 b/batctl/man/batctl.8 index ad165bf..301cdb2 100644 --- a/batctl/man/batctl.8 +++ b/batctl/man/batctl.8 @@ -53,115 +53,85 @@ protocol. .br .TP .I \fBcommands: -.IP "\fBinterface\fP|\fBif\fP [\fBadd\fP|\fBdel iface(s)\fP]" -If no parameter is given or the first parameter is neither "add" nor "del" the current interface settings are displayed. In order to add or delete interfaces specify "add" or "del" as first argument and append the interface names you wish to add or delete. -.br -.IP "\fBoriginators\fP|\fBo\fP [\fB\-b\fP][\fB\-n\fP]" -Once started batctl will display the list of announced gateways in the network. Use the "\-w" option to let batctl refresh the list every second. If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. -.br -.IP "\fBinterval\fP|\fBit\fP [\fBorig_interval\fP]" -If no parameter is given the current originator interval setting is displayed otherwise the parameter is used to set the originator interval. The interval is in units of milliseconds. -.br -.IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP]" -If no parameter is given the current log level settings are displayed otherwise the parameter is used to set the log level. Level 0 disables all logging. Level 1 enables messages related to routing / flooding / broadcasting. Level 2 enables messages related to route or hna added / changed / deleted. Level 3 enables all messages. The messages are sent to the kernel log. Use \fBdmesg\fP(1) to see them. Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options won't be available. -.br -.IP "\fBlog\fP|\fBl\fP [\fBlogfile\fP][\fB\-b\fP][\fB\-n\fP]\fP" -batctl will read the file logfile, or stdin if the logfile parameter is not given, applying filtering so only the B.A.T.M.A.N. Advanced messages are displayed. Once the end of the file has been reached batctl will exit unless the option "\-w" was specified which causes batctl to continue reading the file and print log output whenever new log data has been appended to the file. -.br -.IP "\fBgw_mode|gw\fP [\fBoff\fP|\fBclient\fP|\fBserver\fP] [\fBgw_class\fP]\fP" -If no parameter is given the current gateway mode is displayed otherwise the parameter is used to set the gateway mode. The second (optional) argument specifies the gateway class. Its function depends on whether the node is a server or a client. If the node is a server this parameter is used to inform other nodes in the network about this node's internet connection bandwidth. Just enter any number (optionally followed by "kbit" or "mbit") and the batman-adv module will guess your appropriate gateway class. Use "/" to separate the down\(hy and upload rates. You can omit the upload rate and the module will assume an upload of download / 5. -.RS 17 -default: 2000 \-> gateway class 20 -.RE -.RS 16 -examples: 5000 \-> gateway class 49 -.RE -.RS 25 - 5000kbit - 5mbit - 5mbit/1024 - 5mbit/1024kbit - 5mbit/1mbit -.RE -.RS 7 -If the node is a gateway client the parameter will decide which criterias to consider when the batman-adv module has to choose between different internet connections announced by the aforementioned servers. -.RE -.RS 17 -default: 20 \-> late switch (TQ 20) -.RE -.RS 16 -examples: 1 -> fast connection -.RS 16 -consider the gateway's advertised throughput as well as the link quality towards the gateway -.RE -.RE -.RS 25 - 2 \-> stable connection -.RS 7 -chooses the gateway with the best link quality and stick with it (ignore the advertised throughput) -.RE - 3 \-> fast switch connection -.RS 7 -chooses the gateway with the best link quality but switches to another gateway as soon as a better one is found -.RE - XX \-> late switch connection -.RS 7 -chooses the gateway with the best link quality but switches to another gateway as soon as a better one is found which is at least XX TQ better than the currently selected gateway (XX has to be a number between 3 and 256). -.RE -.RE -.br -.IP "\fBgateways|gwl\fP [\fB\-w\fP][\fB\-n\fP]" -Once started batctl will display the list of announced gateways in the network. Use the "\-w" option to let batctl refresh the list every second. If "\-n" was given batctl will not replace the mac addresses with bat\-host names in the output. -.br -.IP "\fBtranslocal\fP|\fBtl\fP [\fB\-w\fP][\fB\-n\fP]" -Display the local translation table. batctl will refresh the displayed table every second if the "\-w" option was given. Use "\-n" to let batctl not replace the MAC addresses with bat\-host names in the output. -.br -.IP "\fBtransglobal\fP|\fBtg\fP [\fB\-w\fP][\fB\-n\fP]" -Display the global translation table. batctl will refresh the displayed table every second if the "\-w" option was given. Use "\-n" to let batctl not replace the MAC addresses with bat\-host names in the output. -.br -.IP "\fBvis_mode|vm\fP [\fBmode\fP]\fP" -If no parameter is given the current vis mode is displayed otherwise the parameter is used to set the vis mode. -.br -.IP "\fBvis_data|vd dot\fP [\fB\-n\fP|\fB\-\-numbers\fP][\fB\-H\fP|\fB\-\-no-HNA\fP][\fB\-2\fP|\fB\-\-no-2nd\fP]" -Display the visualisation data in graphviz \fBdot\fP(1) format. If -"\-\-numbers" or "\-n" is given batctl will not replace the MAC -addresses with bat-host names in the output. With "\-\-no-HNA" or -"\-H" the HNA entries are not displayed, so the pure mesh topology can -be seen. With "\-\-no-2nd" or "\-2" a dot cluster is not formed around -primary and secondary addresses from the same device. -.br -.IP "\fBvis_data|vd json\fP [\fB\-n\fP|\fB\-\-numbers\fP][\fB\-H\fP|\fB\-\-no-HNA\fP][\fB\-2\fP|\fB\-\-no-2nd\fP]" -Display the visualisation data in JSON format. If "\-\-numbers" or +.IP "\fBinterface\fP|\fBif\fP [\fBnone\fP|\fIinterface\fP]" +If no parameter is given the current interface settings are displayed +otherwise the parameter(s) are added as new interfaces. Use the "none" +keyword to deactivate all interfaces. +.br +.IP "\fBoriginators\fP|\fBo\fP [\fB\-w\fP][\fB\-n\fP]" +Once started batctl will display the originator table. Use the "\-w" +option to let batctl refresh the list every second. If "\-n" is +given batctl will not replace the MAC addresses with bat\-host names +in the output. +.br +.IP "\fBinterval\fP|\fBit\fP [\fIorig_interval\fP]" +If no parameter is given the current originator interval setting is +displayed otherwise the parameter is used to set the originator +interval. The interval is in units of milliseconds. +.br +.IP "\fBloglevel\fP|\fBll\fP [\fIlevel\fP]" +If no parameter is given the current log level settings are displayed +otherwise the parameter is used to set the log level. Level 0 disables +all verbose logging. Level 1 enables messages related to routing / flooding / broadcasting. +Level 2 enables messages related to route or hna added / changed / deleted. +Level 3 enables all messages. The messages are sent to the kernel log. +Use \fBdmesg\fP(1) to see them. Make sure to have debugging output +enabled when compiling the module otherwise the verbose logging output as +well as the loglevel options won't be available. +.br +.IP "\fBlog\fP|\fBl\fP [\fIlogfile\fP][\fB\-w\fP][\fB\-n\fP]\fP" +batctl will read the file logfile, or stdin if the logfile parameter +is not given, applying filtering so only the B.A.T.M.A.N. Advanced +messages are displayed. Once the end of the file has been reached batctl +will exit unless the option "\-w" was specified which causes batctl to +continue reading the file and print log output whenever new log data has +been appended to the file. If "\-n" is given batctl will not replace the +MAC addresses with bat\-host names in the output. +.br +.IP "\fBtranslocal\fP|\fBtl\fP [\fB\-w\fP][\fB\-n\fP]" +Display the local translation table. Use the "\-w" option to let batctl +refresh the list every second. If "\-n" is given batctl will not replace +the MAC addresses with bat\-host names in the output. +.br +.IP "\fBtransglobal\fP|\fBtg\fP [\fB\-w\fP][\fB\-n\fP]" +Display the global translation table. Use the "\-w" option to let batctl +refresh the list every second. If "\-n" is given batctl will not replace +the MAC addresses with bat\-host names in the output. +.br +.IP "\fBvis_server\fP|\fBvs\fP [\fBenabled\fP|\fBdisabled\fP]" +If no parameter is given the current vis server setting is displayed. +Otherwise the parameter is used to enable or disable the vis server. +.br +.IP "\fBvis_data\fP|\fBvd\fP \fBdot|\fBjson [\fB\-n\fP|\fB\-\-numbers\fP][\fB\-H\fP|\fB\-\-no-HNA\fP][\fB\-2\fP|\fB\-\-no-2nd\fP]" +Display the visualisation data in \fBdot\fP(1) or JSON format. If "\-\-numbers" or "\-n" is given batctl will not replace the MAC addresses with bat-host names in the output. With "\-\-no-HNA" or "\-H" the HNA entries are not displayed, so the pure mesh topology can be seen. With "\-\-no-2nd" or "\-2" a dot cluster is not formed around primary and secondary addresses from the same device. .br -.IP "\fBaggregation\fP|\fBag\fP [\fB1\fP|\fB0\fP]" -If no parameter is given the current aggregation setting is displayed. Otherwise the parameter is used to enable or disable packet aggregation. +.IP "\fBaggregation\fP|\fBag\fP [\fB1\fP|\fB0\fP]" +If no parameter is given the current aggregation setting is displayed. +Otherwise the parameter is used to enable or disable packet +aggregation. .br -.IP "\fBbonding\fP|\fBb\fP [\fB1\fP|\fB0\fP]" -If no parameter is given the current bonding mode setting is displayed. Otherwise the parameter is used to enable or disable the bonding mode. -.br -.IP "\fBping\fP|\fBp\fP [\fB\-c count\fP][\fB\-i interval\fP][\fB\-t time\fP][\fB\-R\fP] \fBMAC_address\fP|\fBbat\-host_name\fP" +.IP "\fBping\fP|\fBp\fP [\fB\-c \fP\fIcount\fP][\fB\-i \fP\fIinterval\fP][\fB\-t \fP\fItime\fP] \fIMAC_address\fP|\fIbat\-host_name\fP" Layer 2 ping of a MAC address or bat\-host name. batctl will try to find the bat\-host name if the given parameter was not a MAC address. The "\-c" option tells batctl how man pings should be sent before the program exits. Without the "\-c" option batctl will continue pinging without end. Use CTRL + C to stop it. With "\-i" and "\-t" you can set the default interval between pings and the timeout time -for replies, both in seconds. When run with "\-R", the route taken by -the ping messages will be recorded. +for replies, both in seconds. .br -.IP "\fBtraceroute\fP|\fBtr\fP [\fB\-n\fP] \fBMAC_address\fP|\fBbat\-host_name\fP" +.IP "\fBtraceroute\fP|\fBtr\fP [\fB\-n\fP] \fIMAC_address\fP|\fBbat\-host_name\fP" Layer 2 traceroute to a MAC address or bat\-host name. batctl will try to find the bat\-host name if the given parameter was not a MAC address. batctl will send 3 packets to each host and display the response time. If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. .br -.IP "\fBtcpdump\fP|\fBtd\fP [\fB\-p filter\fP][\fB\-n\fP] \fBinterface ...\fP" +.IP "\fBtcpdump\fP|\fBtd\fP [\fB\-p \fP\fIfilter\fP][\fB\-n\fP] \fBinterface ...\fP" batctl will display all packets that are seen on the given interface(s). The "\-p" options allows the filtering of certain packet types: 1 - batman ogm packets, 2 - batman icmp packets, 4 - unicast @@ -171,7 +141,7 @@ type, e.g. use "\-p 3" to display batman ogm packets and batman icmp packets only. If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. .br -.IP "\fBbisect\fP [\fB\-l MAC\fP][\fB\-t MAC\fP][\fB\-r MAC\fP][\fB\-s min\fP [\fB\- max\fP]][\fB\-o MAC\fP][\fB\-n\fP] \fBlogfile1\fP [\fBlogfile2\fP ... \fBlogfileN\fP]" +.IP "\fBbisect\fP [\fB\-l \fP\fIMAC\fP][\fB\-t \fP\fIMAC\fP][\fB\-r \fP\fIMAC\fP][\fB\-s \fP\fImin\fP [\fB\- \fP\fImax\fP]][\fB\-o \fP\fIMAC\fP][\fB\-n\fP] \fIlogfile1\fP [\fIlogfile2\fP ... \fIlogfileN\fP]" Analyses the logfiles to build a small internal database of all sent sequence numbers and routing table changes. This database can then be analyzed in a number of different ways. With "\-l" the database can be diff --git a/batctl/ping.c b/batctl/ping.c index ce0673e..7820e32 100644 --- a/batctl/ping.c +++ b/batctl/ping.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/batctl/ping.h b/batctl/ping.h index 672e8b9..d578f2a 100644 --- a/batctl/ping.h +++ b/batctl/ping.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/batctl/tcpdump.c b/batctl/tcpdump.c index c550f0d..77286c1 100644 --- a/batctl/tcpdump.c +++ b/batctl/tcpdump.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de> * diff --git a/batctl/tcpdump.h b/batctl/tcpdump.h index db32865..91b839c 100644 --- a/batctl/tcpdump.h +++ b/batctl/tcpdump.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/batctl/traceroute.c b/batctl/traceroute.c index 00fcd89..f5b63f9 100644 --- a/batctl/traceroute.c +++ b/batctl/traceroute.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/batctl/traceroute.h b/batctl/traceroute.h index ed5f4f4..f1a2dd2 100644 --- a/batctl/traceroute.h +++ b/batctl/traceroute.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/batctl/vis.c b/batctl/vis.c index c06beb1..36152cf 100644 --- a/batctl/vis.c +++ b/batctl/vis.c @@ -1,4 +1,6 @@ -/* Copyright (C) 2009 B.A.T.M.A.N. contributors: +/* + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: + * * Andrew Lunn <andrew(a)lunn.ch> * * This program is free software; you can redistribute it and/or diff --git a/batctl/vis.h b/batctl/vis.h index 8a7511a..7e6b85f 100644 --- a/batctl/vis.h +++ b/batctl/vis.h @@ -1,4 +1,6 @@ -/* Copyright (C) 2009 B.A.T.M.A.N. contributors: +/* + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: + * * Andrew Lunn <andrew(a)lunn.ch> * * This program is free software; you can redistribute it and/or diff --git a/batman/hash.c b/batman/hash.c index 7a8b4a7..1dccafa 100644 --- a/batman/hash.c +++ b/batman/hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/batman/hash.h b/batman/hash.h index 52328d1..56b5b1a 100644 --- a/batman/hash.h +++ b/batman/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/batman/list-batman.c b/batman/list-batman.c index 9f8be53..f521834 100644 --- a/batman/list-batman.c +++ b/batman/list-batman.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/batman/list-batman.h b/batman/list-batman.h index 7e2669b..cbacd7d 100644 --- a/batman/list-batman.h +++ b/batman/list-batman.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: * * Marek Lindner * -- 1.7.1

2 3

[B.A.T.M.A.N.] [PATCH] batman-adv: permit setting ogm interval to JITTER*2
by Linus Lüssing 19 Jun '10

19 Jun '10

When trying to set the originator interval to 40ms, we are asked to set it to a minimum value of 40ms. This patch permits setting an originator interval of JITTER*20 (40ms by default) now. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- bat_sysfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bat_sysfs.c b/bat_sysfs.c index 05703c1..68ce453 100644 --- a/bat_sysfs.c +++ b/bat_sysfs.c @@ -259,7 +259,7 @@ static ssize_t store_orig_interval(struct kobject *kobj, struct attribute *attr, return -EINVAL; } - if (orig_interval_tmp <= JITTER * 2) { + if (orig_interval_tmp < JITTER * 2) { printk(KERN_INFO "batman-adv:New originator interval too small: %li (min: %i)\n", orig_interval_tmp, JITTER * 2); return -EINVAL; -- 1.7.1

2 2

[B.A.T.M.A.N.] still jiffies - msecs mixup?
by Linus Lüssing 19 Jun '10

19 Jun '10

Hmm, while scanning through the code, there were some things that looked a little odd to me... --- chedule_own_packet() (/ schedule_forward_packet() ) -> send_time = own_global_send_time(bat_priv) (/forward_send_time(bat_priv)) <- returns current jiffies + orig_interval(in ms!) from bat_priv + jitter(in ms?) -> can_aggregate_with(send_time) -> converts MAX_AGGREGATION_MS to jiffies, seems to expect send_time to be in jiffies format -> new_aggregated_packet(send_time) -> queue_delayed_work(send_time - jiffies), -> so, queue_delayed_work(orig_interval + jitter - time_diff_in_jiffies + MAX_AGGREGATION(in jiffies))? --- Looks like we'd have some portions in the send_time still in jiffies format, though it should be a time purely in msecs for queue_delayed_work if I'm not mistaken. If this is really a bug, would it be better to deal with jiffies in these places (so converting orig_interval to jiffies) and convert it back when queueing the work, or better convert the jiffies variable to msecs and skipping all the other msecs_to_jiffies conversions? Cheers, Linus

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Avoid rounding issues for local hna timeout
by Linus Lüssing 19 Jun '10

19 Jun '10

With the current default values, this patch is not critical, as LOCAL_HNA_TIMEOUT is a multiple of 1000 anyway. However, if someone would like to change this #define, the person could have some unexpected rounding issues. Therefore doing the multiplication before the division now. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- translation-table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/translation-table.c b/translation-table.c index 619a9a8..cf37cc4 100644 --- a/translation-table.c +++ b/translation-table.c @@ -259,7 +259,7 @@ static void hna_local_purge(struct work_struct *work) hna_local_entry = hashit.bucket->data; timeout = hna_local_entry->last_seen + - ((LOCAL_HNA_TIMEOUT / 1000) * HZ); + ((LOCAL_HNA_TIMEOUT * HZ) / 1000); if ((!hna_local_entry->never_purge) && time_after(jiffies, timeout)) hna_local_del(hna_local_entry, "address timed out"); -- 1.7.1

2 1

[B.A.T.M.A.N.] batman-adv 2010.0.0 released
by Marek Lindner 19 Jun '10

19 Jun '10

The B.A.T.M.A.N. team today announces the release of the latest batman-adv milestone which brings API changes, new features as well as bugfixes and linux coding style compliance. As the kernel module always depends on the Linux kernel it was 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.net/batman/releases/batman-adv-2010.0.0/ as well as prepackaged binaries in your distribution. Important changes ---------------- The batman-adv version numbering has been adapted to better reflect our release / feature cycle (the detailed explanation can be found here: https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2010-June/002875.html). The first part of the number represents the year of the release, the second part is the release number per year and the last digit is the bugfix release counter. Because this release is the first of its kind in 2010 we chose "2010.0.0" as its name. Furthermore, all batman-adv options residing in the proc filesystem have been migrated to the sys filesystem, therefore all scripts accessing these options directly need to be adjusted. Scripts using batctl are (almost) not affected by this transition as the batctl commandline parameters are unchanged. More details can be found below as well as in our documentation. Thanks ---------------- Thanks to all people sending in patches: * Andrea Gelmini <andrea.gelmini(a)gelma.net> * Andrew Lunn <andrew(a)lunn.ch> * Dan Carpenter <error27(a)gmail.com> * Daniel Seither <post(a)tiwoc.de> * Jiri Pirko <jpirko(a)redhat.com> * Joe Perches <joe(a)perches.com> * Linus Lüssing <linus.luessing(a)web.de> * Luis de Bethencourt <luisbg(a)ubuntu.com> * Marek Lindner <lindner_marek(a)yahoo.de> * Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> * Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> * Sven Eckelmann <sven.eckelmann(a)gmx.de> * Tejun Heo <tj(a)kernel.org> batman-adv ---------------- This release contains a complete rework of the configuration interface, formerly to be found in the proc filesystem. The options have been split into the mesh wide settings and per interface settings. It is now possible to activate/deactivate individual interfaces via their respective folder within sysfs which fullfills an often wanted feature request. In addition, the kernel module will automatically detect & avoid non-compatible interfaces such as non-ethernet or mesh interfaces. During this transition many smaller & bigger annoyances have been cleaned up and prepared the way for features yet to come. Details regarding the new settings interface can be found in our documentation. Explicit netfilter support has been added that allows to filter batman's layer2 traffic and protocol messages with e.g. ebtables, the broadcast traffic code has been restructered to deal with broadcast storms and the internal sequence number handling has been revamped fixing several bugs. Linux coding style compliance was a big topic too in order to ensure the code is "checkpatch clean". batctl ---------------- Most of the work went into the sysfs changes to make sure the new API is properly handled. When using batctl you won't notice the difference except for the interface handling. Since you can activate and deactivate interfaces one by one, the parameter list had to be adjusted. Also, batctl parses your input before configuring the kernel module and warns if the input is not correct which saves you from having to consult the kernel logs. Some bugfixes in ping and traceroute complete this release. Happy routing, The B.A.T.M.A.N. team

1 0

[B.A.T.M.A.N.] Staging: batman-adv for 2.6.36 (renewed)
by Sven Eckelmann 19 Jun '10

19 Jun '10

Hi, here are patches targetted for 2.6.36. These replace all patches send to you for 2.6.36 in mails following 1275850985-27105-1-git-send-email-sven.eckelmann(a)gmx.de due to conflicting changes for 2.6.35 from Dan Carpenter and Javier Martinez Canillas. There are also 3 new patches (7-9). Maybe we could time our patches for upcoming kernels. Is there a specific point where you start to insert new patches for the next kernel into staging-next? Currently we know that it should be at least a week before a kernel is released to allow other people to test changes in linux-next. Best regards, Sven drivers/staging/batman-adv/Makefile | 2 +- drivers/staging/batman-adv/bat_debugfs.c | 148 ++++++++ drivers/staging/batman-adv/bat_debugfs.h | 33 ++ drivers/staging/batman-adv/bat_sysfs.c | 151 ++------- drivers/staging/batman-adv/bat_sysfs.h | 13 + drivers/staging/batman-adv/device.c | 354 -------------------- drivers/staging/batman-adv/device.h | 36 -- drivers/staging/batman-adv/hard-interface.c | 14 +- drivers/staging/batman-adv/icmp_socket.c | 328 ++++++++++++++++++ drivers/staging/batman-adv/icmp_socket.h | 28 ++ drivers/staging/batman-adv/main.c | 27 +- drivers/staging/batman-adv/main.h | 6 +- drivers/staging/batman-adv/originator.c | 64 +--- drivers/staging/batman-adv/originator.h | 3 +- drivers/staging/batman-adv/routing.c | 4 +- drivers/staging/batman-adv/send.c | 9 +- .../staging/batman-adv/sysfs-class-net-batman-adv | 14 + drivers/staging/batman-adv/sysfs-class-net-mesh | 25 ++ drivers/staging/batman-adv/translation-table.c | 132 ++++---- drivers/staging/batman-adv/translation-table.h | 6 +- drivers/staging/batman-adv/types.h | 5 +- drivers/staging/batman-adv/vis.c | 115 +++++-- drivers/staging/batman-adv/vis.h | 3 +- 23 files changed, 821 insertions(+), 699 deletions(-) Joe Perches (1): Staging: batman-adv: Convert MAC_FMT to %pM Linus Lüssing (1): Staging: batman-adv: Adding netfilter-bridge hooks Marek Lindner (4): 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 Staging: batman-adv: remove superfluous hint to "translation table" Simon Wunderlich (1): Staging: batman-adv: convert vis_interval into define Sven Eckelmann (2): Staging: batman-adv: Move device for icmp injection to debugfs Staging: batman-adv: Move tables from sysfs to debugfs

2 14

[B.A.T.M.A.N.] [PATCH-trunk] batman-adv: Convert names from Java to C style
by Antonio Quartulli 19 Jun '10

19 Jun '10

Useless but meaningfull patch that converts JavaStyle names into c_style Signed-off-by: Antonio Quartulli <ordex(a)ritirata.org> ---

2 1

[B.A.T.M.A.N.] MTU/connection problem
by Clemens John 18 Jun '10

18 Jun '10

Hi, I have a problem to connect to the Internet. We are using Batman advanced 0.2.1 and IPv4 here in oldenburg. Our setup looks like this: Laptop-[wifi]->Fonera-[wifi]->Dir300-->OpenVPN--> virtual OpenWrt machine-->internet. The default route of the laptop goes to the virtual OpenWrt machine wich provides an Internet connection. I can acces google (wget google.de) but not heise.de or golem.de. I´m not verry familar with network configurations but I heared that this might be an mtu problem. All devices in the network (tap0, ath0, ath1, wifi0) have an mtu of 1524 except bat0 and br-mesh which have an mtu of 1500. Our routers are configured to bridge connections from non batman devices (like the laptop) to bat0. This is done in the device "br-mesh". Everythink works fine, except I can´t connect to internet websites that are not google.de. When I decrease the mtu of the wireless device of the laptop to 1476 everything works fine. But I have to do this by hand and on a client this is bad. Does anybody know what I´m doing wrong? Greetings Clemens

5 14

[B.A.T.M.A.N.] [PATCH] batman-adv: use rx_handler_data pointer to store net_bridge_port pointer
by Sven Eckelmann 17 Jun '10

17 Jun '10

From: Jiri Pirko <jpirko(a)redhat.com> Register net_bridge_port pointer as rx_handler data pointer. As br_port is removed from struct net_device, another netdev priv_flag is added to indicate the device serves as a bridge port. Also rcuized pointers are now correctly dereferenced in br_fdb.c and in netfilter parts. Signed-off-by: Jiri Pirko <jpirko(a)redhat.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv-kernelland/hard-interface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv-kernelland/hard-interface.c b/batman-adv-kernelland/hard-interface.c index 70fd314..0773420 100644 --- a/batman-adv-kernelland/hard-interface.c +++ b/batman-adv-kernelland/hard-interface.c @@ -74,7 +74,7 @@ static int is_valid_iface(struct net_device *net_dev) #endif /* Device is being bridged */ - /* if (net_dev->br_port != NULL) + /* if (net_dev->priv_flags & IFF_BRIDGE_PORT) return 0; */ return 1; -- 1.7.1

3 6

[B.A.T.M.A.N.] [PATCH] drivers/staging/batman-adv: Use (pr|netdev)_<level> macro helpers
by Joe Perches 15 Jun '10

15 Jun '10

Compile tested only Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove "batman-adv:" from format strings Use pr_<level> Use netdev_<level> Signed-off-by: Joe Perches <joe(a)perches.com> --- drivers/staging/batman-adv/aggregation.c | 2 + drivers/staging/batman-adv/bat_sysfs.c | 53 ++++++++++++----------- drivers/staging/batman-adv/bitarray.c | 2 + drivers/staging/batman-adv/device.c | 19 ++++---- drivers/staging/batman-adv/hard-interface.c | 31 +++++-------- drivers/staging/batman-adv/main.c | 17 +++---- drivers/staging/batman-adv/main.h | 18 ++++---- drivers/staging/batman-adv/originator.c | 17 +++---- drivers/staging/batman-adv/routing.c | 14 +++---- drivers/staging/batman-adv/send.c | 11 ++--- drivers/staging/batman-adv/translation-table.c | 8 ++-- drivers/staging/batman-adv/vis.c | 11 +++-- 12 files changed, 98 insertions(+), 105 deletions(-) diff --git a/drivers/staging/batman-adv/aggregation.c b/drivers/staging/batman-adv/aggregation.c index ce8b8a6..66ee09e 100644 --- a/drivers/staging/batman-adv/aggregation.c +++ b/drivers/staging/batman-adv/aggregation.c @@ -19,6 +19,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "main.h" #include "aggregation.h" #include "send.h" diff --git a/drivers/staging/batman-adv/bat_sysfs.c b/drivers/staging/batman-adv/bat_sysfs.c index e2c000b..5da7b92 100644 --- a/drivers/staging/batman-adv/bat_sysfs.c +++ b/drivers/staging/batman-adv/bat_sysfs.c @@ -19,6 +19,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "main.h" #include "bat_sysfs.h" #include "translation-table.h" @@ -99,18 +101,19 @@ static ssize_t store_aggr_ogm(struct kobject *kobj, struct attribute *attr, if (buff[count - 1] == '\n') buff[count - 1] = '\0'; - printk(KERN_INFO "batman-adv:Invalid parameter for 'aggregate OGM' setting on mesh %s received: %s\n", - net_dev->name, buff); + netdev_info(net_dev, + "Invalid parameter for 'aggregate OGM' setting on mesh received: %s\n", + buff); return -EINVAL; } if (atomic_read(&bat_priv->aggregation_enabled) == aggr_tmp) return count; - printk(KERN_INFO "batman-adv:Changing aggregation from: %s to: %s on mesh: %s\n", - atomic_read(&bat_priv->aggregation_enabled) == 1 ? - "enabled" : "disabled", aggr_tmp == 1 ? "enabled" : "disabled", - net_dev->name); + netdev_info(net_dev, "Changing aggregation from: %s to: %s on mesh\n", + atomic_read(&bat_priv->aggregation_enabled) == 1 ? + "enabled" : "disabled", + aggr_tmp == 1 ? "enabled" : "disabled"); atomic_set(&bat_priv->aggregation_enabled, (unsigned)aggr_tmp); return count; @@ -152,18 +155,18 @@ static ssize_t store_vis_mode(struct kobject *kobj, struct attribute *attr, if (buff[count - 1] == '\n') buff[count - 1] = '\0'; - printk(KERN_INFO "batman-adv:Invalid parameter for 'vis mode' setting on mesh %s received: %s\n", - net_dev->name, buff); + netdev_info(net_dev, "Invalid parameter for 'vis mode' setting on mesh received: %s\n", + buff); return -EINVAL; } if (atomic_read(&bat_priv->vis_mode) == vis_mode_tmp) return count; - printk(KERN_INFO "batman-adv:Changing vis mode from: %s to: %s on mesh: %s\n", - atomic_read(&bat_priv->vis_mode) == VIS_TYPE_CLIENT_UPDATE ? - "client" : "server", vis_mode_tmp == VIS_TYPE_CLIENT_UPDATE ? - "client" : "server", net_dev->name); + netdev_info(net_dev, "Changing vis mode from: %s to: %s on mesh\n", + atomic_read(&bat_priv->vis_mode) == VIS_TYPE_CLIENT_UPDATE ? + "client" : "server", + vis_mode_tmp == VIS_TYPE_CLIENT_UPDATE ? "client" : "server"); atomic_set(&bat_priv->vis_mode, (unsigned)vis_mode_tmp); return count; @@ -190,23 +193,23 @@ static ssize_t store_orig_interval(struct kobject *kobj, struct attribute *attr, ret = strict_strtoul(buff, 10, &orig_interval_tmp); if (ret) { - printk(KERN_INFO "batman-adv:Invalid parameter for 'orig_interval' setting on mesh %s received: %s\n", - net_dev->name, buff); + netdev_info(net_dev, "Invalid parameter for 'orig_interval' setting on mesh received: %s\n", + buff); return -EINVAL; } if (orig_interval_tmp <= JITTER * 2) { - printk(KERN_INFO "batman-adv:New originator interval too small: %li (min: %i)\n", - orig_interval_tmp, JITTER * 2); + netdev_info(net_dev, "New originator interval too small: %li (min: %i)\n", + orig_interval_tmp, JITTER * 2); return -EINVAL; } if (atomic_read(&bat_priv->orig_interval) == orig_interval_tmp) return count; - printk(KERN_INFO "batman-adv:Changing originator interval from: %i to: %li on mesh: %s\n", - atomic_read(&bat_priv->orig_interval), - orig_interval_tmp, net_dev->name); + netdev_info(net_dev, "Changing originator interval from: %i to: %li on mesh\n", + atomic_read(&bat_priv->orig_interval), + orig_interval_tmp); atomic_set(&bat_priv->orig_interval, orig_interval_tmp); return count; @@ -297,7 +300,7 @@ int sysfs_add_meshif(struct net_device *dev) bat_priv->mesh_obj = kobject_create_and_add(SYSFS_IF_MESH_SUBDIR, batif_kobject); if (!bat_priv->mesh_obj) { - printk(KERN_ERR "batman-adv:Can't add sysfs directory: %s/%s\n", + pr_err("Can't add sysfs directory: %s/%s\n", dev->name, SYSFS_IF_MESH_SUBDIR); goto out; } @@ -306,7 +309,7 @@ int sysfs_add_meshif(struct net_device *dev) err = sysfs_create_file(bat_priv->mesh_obj, &((*bat_attr)->attr)); if (err) { - printk(KERN_ERR "batman-adv:Can't add sysfs file: %s/%s/%s\n", + pr_err("Can't add sysfs file: %s/%s/%s\n", dev->name, SYSFS_IF_MESH_SUBDIR, ((*bat_attr)->attr).name); goto rem_attr; @@ -316,7 +319,7 @@ int sysfs_add_meshif(struct net_device *dev) for (bin_attr = mesh_bin_attrs; *bin_attr; ++bin_attr) { err = sysfs_create_bin_file(bat_priv->mesh_obj, (*bin_attr)); if (err) { - printk(KERN_ERR "batman-adv:Can't add sysfs file: %s/%s/%s\n", + pr_err("Can't add sysfs file: %s/%s/%s\n", dev->name, SYSFS_IF_MESH_SUBDIR, ((*bin_attr)->attr).name); goto rem_bin_attr; @@ -390,7 +393,7 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr, if (buff[count - 1] == '\n') buff[count - 1] = '\0'; - printk(KERN_ERR "batman-adv:Invalid parameter for 'mesh_iface' setting received: %s\n", + pr_err("Invalid parameter for 'mesh_iface' setting received: %s\n", buff); return -EINVAL; } @@ -453,7 +456,7 @@ int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev) hardif_kobject); if (!*hardif_obj) { - printk(KERN_ERR "batman-adv:Can't add sysfs directory: %s/%s\n", + pr_err("Can't add sysfs directory: %s/%s\n", dev->name, SYSFS_IF_BAT_SUBDIR); goto out; } @@ -461,7 +464,7 @@ int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev) for (hardif_attr = batman_attrs; *hardif_attr; ++hardif_attr) { err = sysfs_create_file(*hardif_obj, &((*hardif_attr)->attr)); if (err) { - printk(KERN_ERR "batman-adv:Can't add sysfs file: %s/%s/%s\n", + pr_err("Can't add sysfs file: %s/%s/%s\n", dev->name, SYSFS_IF_BAT_SUBDIR, ((*hardif_attr)->attr).name); goto rem_attr; diff --git a/drivers/staging/batman-adv/bitarray.c b/drivers/staging/batman-adv/bitarray.c index 2fef6e3..d493625 100644 --- a/drivers/staging/batman-adv/bitarray.c +++ b/drivers/staging/batman-adv/bitarray.c @@ -19,6 +19,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "main.h" #include "bitarray.h" diff --git a/drivers/staging/batman-adv/device.c b/drivers/staging/batman-adv/device.c index 7eb6559..d4c4e7d 100644 --- a/drivers/staging/batman-adv/device.c +++ b/drivers/staging/batman-adv/device.c @@ -19,6 +19,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/device.h> #include <linux/slab.h> #include "main.h" @@ -57,17 +59,15 @@ int bat_device_setup(void) /* register our device - kernel assigns a free major number */ tmp_major = register_chrdev(0, DRIVER_DEVICE, &fops); if (tmp_major < 0) { - printk(KERN_ERR "batman-adv:" - "Registering the character device failed with %d\n", - tmp_major); + pr_err("Registering the character device failed with %d\n", + tmp_major); return 0; } batman_class = class_create(THIS_MODULE, "batman-adv"); if (IS_ERR(batman_class)) { - printk(KERN_ERR "batman-adv:" - "Could not register class 'batman-adv'\n"); + pr_err("Could not register class 'batman-adv'\n"); return 0; } @@ -110,8 +110,7 @@ int bat_device_open(struct inode *inode, struct file *file) } if (i == ARRAY_SIZE(device_client_hash)) { - printk(KERN_ERR "batman-adv:" - "Error - can't add another packet client: " + pr_err("Error - can't add another packet client: " "maximum number of clients reached\n"); kfree(device_client); return -EXFULL; @@ -213,7 +212,7 @@ ssize_t bat_device_write(struct file *file, const char __user *buff, unsigned long flags; if (len < sizeof(struct icmp_packet)) { - bat_dbg(DBG_BATMAN, "batman-adv:" + bat_dbg(DBG_BATMAN, "Error - can't send packet from char device: " "invalid packet size\n"); return -EINVAL; @@ -226,14 +225,14 @@ ssize_t bat_device_write(struct file *file, const char __user *buff, return -EFAULT; if (icmp_packet.packet_type != BAT_ICMP) { - bat_dbg(DBG_BATMAN, "batman-adv:" + bat_dbg(DBG_BATMAN, "Error - can't send packet from char device: " "got bogus packet type (expected: BAT_ICMP)\n"); return -EINVAL; } if (icmp_packet.msg_type != ECHO_REQUEST) { - bat_dbg(DBG_BATMAN, "batman-adv:" + bat_dbg(DBG_BATMAN, "Error - can't send packet from char device: " "got bogus message type (expected: ECHO_REQUEST)\n"); return -EINVAL; diff --git a/drivers/staging/batman-adv/hard-interface.c b/drivers/staging/batman-adv/hard-interface.c index 7a582e8..1c6cdd7 100644 --- a/drivers/staging/batman-adv/hard-interface.c +++ b/drivers/staging/batman-adv/hard-interface.c @@ -19,6 +19,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "main.h" #include "hard-interface.h" #include "soft-interface.h" @@ -149,12 +151,9 @@ static void check_known_mac_addr(uint8_t *addr) if (!compare_orig(batman_if->net_dev->dev_addr, addr)) continue; - printk(KERN_WARNING "batman-adv:" - "The newly added mac address (%pM) already exists on: %s\n", - addr, batman_if->dev); - printk(KERN_WARNING "batman-adv:" - "It is strongly recommended to keep mac addresses unique" - "to avoid problems!\n"); + pr_warning("The newly added mac address (%pM) already exists on: %s\n", + addr, batman_if->dev); + pr_warning("It is strongly recommended to keep mac addresses unique to avoid problems!\n"); } rcu_read_unlock(); } @@ -206,8 +205,7 @@ static void hardif_activate_interface(struct bat_priv *bat_priv, if (!bat_priv->primary_if) set_primary_if(bat_priv, batman_if); - printk(KERN_INFO "batman-adv:Interface activated: %s\n", - batman_if->dev); + pr_info("Interface activated: %s\n", batman_if->dev); if (atomic_read(&module_state) == MODULE_INACTIVE) activate_module(); @@ -226,8 +224,7 @@ static void hardif_deactivate_interface(struct batman_if *batman_if) batman_if->if_status = IF_INACTIVE; - printk(KERN_INFO "batman-adv:Interface deactivated: %s\n", - batman_if->dev); + pr_info("Interface deactivated: %s\n", batman_if->dev); update_min_mtu(); } @@ -245,8 +242,7 @@ int hardif_enable_interface(struct batman_if *batman_if) batman_if->packet_buff = kmalloc(batman_if->packet_len, GFP_ATOMIC); if (!batman_if->packet_buff) { - printk(KERN_ERR "batman-adv:" - "Can't add interface packet (%s): out of memory\n", + pr_err("Can't add interface packet (%s): out of memory\n", batman_if->dev); goto err; } @@ -265,14 +261,12 @@ int hardif_enable_interface(struct batman_if *batman_if) orig_hash_add_if(batman_if, bat_priv->num_ifaces); atomic_set(&batman_if->seqno, 1); - printk(KERN_INFO "batman-adv:Adding interface: %s\n", batman_if->dev); + pr_info("Adding interface: %s\n", batman_if->dev); if (hardif_is_iface_up(batman_if)) hardif_activate_interface(bat_priv, batman_if); else - printk(KERN_ERR "batman-adv:" - "Not using interface %s " - "(retrying later): interface not active\n", + pr_err("Not using interface %s (retrying later): interface not active\n", batman_if->dev); /* begin scheduling originator messages on that interface */ @@ -296,7 +290,7 @@ void hardif_disable_interface(struct batman_if *batman_if) if (batman_if->if_status != IF_INACTIVE) return; - printk(KERN_INFO "batman-adv:Removing interface: %s\n", batman_if->dev); + pr_info("Removing interface: %s\n", batman_if->dev); bat_priv->num_ifaces--; orig_hash_del_if(batman_if, bat_priv->num_ifaces); @@ -323,8 +317,7 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev) batman_if = kmalloc(sizeof(struct batman_if), GFP_ATOMIC); if (!batman_if) { - printk(KERN_ERR "batman-adv:" - "Can't add interface (%s): out of memory\n", + pr_err("Can't add interface (%s): out of memory\n", net_dev->name); goto out; } diff --git a/drivers/staging/batman-adv/main.c b/drivers/staging/batman-adv/main.c index 72851cd..46682c0 100644 --- a/drivers/staging/batman-adv/main.c +++ b/drivers/staging/batman-adv/main.c @@ -19,6 +19,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "main.h" #include "bat_sysfs.h" #include "routing.h" @@ -99,16 +101,14 @@ int init_module(void) interface_setup); if (!soft_device) { - printk(KERN_ERR "batman-adv:" - "Unable to allocate the batman interface\n"); + pr_err("Unable to allocate the batman interface\n"); goto end; } retval = register_netdev(soft_device); if (retval < 0) { - printk(KERN_ERR "batman-adv:" - "Unable to register the batman interface: %i\n", retval); + pr_err("Unable to register the batman interface: %i\n", retval); goto free_soft_device; } @@ -120,9 +120,8 @@ int init_module(void) register_netdevice_notifier(&hard_if_notifier); dev_add_pack(&batman_adv_packet_type); - printk(KERN_INFO "batman-adv:" - "B.A.T.M.A.N. advanced %s%s (compatibility version %i) loaded\n", - SOURCE_VERSION, REVISION_VERSION_STR, COMPAT_VERSION); + pr_info("B.A.T.M.A.N. advanced %s%s (compatibility version %i) loaded\n", + SOURCE_VERSION, REVISION_VERSION_STR, COMPAT_VERSION); return 0; @@ -182,9 +181,7 @@ void activate_module(void) goto end; err: - printk(KERN_ERR "batman-adv:" - "Unable to allocate memory for mesh information structures: " - "out of mem ?\n"); + pr_err("Unable to allocate memory for mesh information structures: out of mem ?\n"); deactivate_module(); end: return; diff --git a/drivers/staging/batman-adv/main.h b/drivers/staging/batman-adv/main.h index 5f8343d..afc322d 100644 --- a/drivers/staging/batman-adv/main.h +++ b/drivers/staging/batman-adv/main.h @@ -85,15 +85,17 @@ extern int debug; extern int bat_debug_type(int type); -#define bat_dbg(type, fmt, arg...) do { \ - if (bat_debug_type(type)) \ - printk(KERN_DEBUG "batman-adv:" fmt, ## arg); \ - } \ - while (0) +#define bat_dbg(type, fmt, arg...) \ +do { \ + if (bat_debug_type(type)) \ + printk(KERN_DEBUG pr_fmt(fmt), ##arg); \ +} while (0) #else /* !CONFIG_BATMAN_ADV_DEBUG */ -#define bat_dbg(type, fmt, arg...) do { \ - } \ - while (0) +#define bat_dbg(type, fmt, arg...) \ +do { \ + if (0) \ + printk(KERN_DEBUG pr_fmt(fmt), ##arg); \ +} while (0) #endif /* diff --git a/drivers/staging/batman-adv/originator.c b/drivers/staging/batman-adv/originator.c index 568aef8..1a61887 100644 --- a/drivers/staging/batman-adv/originator.c +++ b/drivers/staging/batman-adv/originator.c @@ -19,6 +19,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + /* increase the reference counter for this originator */ #include "main.h" @@ -163,8 +165,7 @@ struct orig_node *get_orig_node(uint8_t *addr) swaphash = hash_resize(orig_hash, orig_hash->size * 2); if (swaphash == NULL) - printk(KERN_ERR - "batman-adv:Couldn't resize orig hash table\n"); + pr_err("Couldn't resize orig hash table\n"); else orig_hash = swaphash; } @@ -373,8 +374,7 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num) data_ptr = kmalloc(max_if_num * sizeof(TYPE_OF_WORD) * NUM_WORDS, GFP_ATOMIC); if (!data_ptr) { - printk(KERN_ERR - "batman-adv:Can't resize orig: out of memory\n"); + pr_err("Can't resize orig: out of memory\n"); return -1; } @@ -385,8 +385,7 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num) data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); if (!data_ptr) { - printk(KERN_ERR - "batman-adv:Can't resize orig: out of memory\n"); + pr_err("Can't resize orig: out of memory\n"); return -1; } @@ -435,8 +434,7 @@ static int orig_node_del_if(struct orig_node *orig_node, chunk_size = sizeof(TYPE_OF_WORD) * NUM_WORDS; data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC); if (!data_ptr) { - printk(KERN_ERR - "batman-adv:Can't resize orig: out of memory\n"); + pr_err("Can't resize orig: out of memory\n"); return -1; } @@ -457,8 +455,7 @@ free_bcast_own: data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); if (!data_ptr) { - printk(KERN_ERR - "batman-adv:Can't resize orig: out of memory\n"); + pr_err("Can't resize orig: out of memory\n"); return -1; } diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c index 066dc8b..b04ddcb 100644 --- a/drivers/staging/batman-adv/routing.c +++ b/drivers/staging/batman-adv/routing.c @@ -19,6 +19,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "main.h" #include "routing.h" #include "send.h" @@ -731,10 +733,8 @@ static int recv_icmp_ttl_exceeded(struct sk_buff *skb) /* send TTL exceeded if packet is an echo request (traceroute) */ if (icmp_packet->msg_type != ECHO_REQUEST) { - printk(KERN_WARNING "batman-adv:" - "Warning - can't forward icmp packet from %pM to %pM: " - "ttl exceeded\n", - icmp_packet->orig, icmp_packet->dst); + pr_warning("Warning - can't forward icmp packet from %pM to %pM: ttl exceeded\n", + icmp_packet->orig, icmp_packet->dst); return NET_RX_DROP; } @@ -899,10 +899,8 @@ int recv_unicast_packet(struct sk_buff *skb) /* TTL exceeded */ if (unicast_packet->ttl < 2) { - printk(KERN_WARNING "batman-adv:Warning - " - "can't forward unicast packet from %pM to %pM: " - "ttl exceeded\n", - ethhdr->h_source, unicast_packet->dest); + pr_warning("Warning - can't forward unicast packet from %pM to %pM: ttl exceeded\n", + ethhdr->h_source, unicast_packet->dest); return NET_RX_DROP; } diff --git a/drivers/staging/batman-adv/send.c b/drivers/staging/batman-adv/send.c index ac69ed8..f5d6b69 100644 --- a/drivers/staging/batman-adv/send.c +++ b/drivers/staging/batman-adv/send.c @@ -19,6 +19,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "main.h" #include "send.h" #include "routing.h" @@ -64,10 +66,8 @@ int send_skb_packet(struct sk_buff *skb, goto send_skb_err; if (!(batman_if->net_dev->flags & IFF_UP)) { - printk(KERN_WARNING - "batman-adv:Interface %s " - "is not up - can't send packet via that interface!\n", - batman_if->dev); + pr_warning("Interface %s is not up - can't send packet via that interface!\n", + batman_if->dev); goto send_skb_err; } @@ -179,8 +179,7 @@ static void send_packet(struct forw_packet *forw_packet) unsigned char directlink = (batman_packet->flags & DIRECTLINK ? 1 : 0); if (!forw_packet->if_incoming) { - printk(KERN_ERR "batman-adv: Error - can't forward packet: " - "incoming iface not specified\n"); + pr_err("Error - can't forward packet: incoming iface not specified\n"); return; } diff --git a/drivers/staging/batman-adv/translation-table.c b/drivers/staging/batman-adv/translation-table.c index 63d0967..a41bedd 100644 --- a/drivers/staging/batman-adv/translation-table.c +++ b/drivers/staging/batman-adv/translation-table.c @@ -19,6 +19,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "main.h" #include "translation-table.h" #include "soft-interface.h" @@ -111,8 +113,7 @@ void hna_local_add(uint8_t *addr) hna_local_hash->size * 2); if (swaphash == NULL) - printk(KERN_ERR "batman-adv:" - "Couldn't resize local hna hash table\n"); + pr_err("Couldn't resize local hna hash table\n"); else hna_local_hash = swaphash; } @@ -364,8 +365,7 @@ void hna_global_add_orig(struct orig_node *orig_node, hna_global_hash->size * 2); if (swaphash == NULL) - printk(KERN_ERR "batman-adv:" - "Couldn't resize global hna hash table\n"); + pr_err("Couldn't resize global hna hash table\n"); else hna_global_hash = swaphash; } diff --git a/drivers/staging/batman-adv/vis.c b/drivers/staging/batman-adv/vis.c index 1d3d954..380e996 100644 --- a/drivers/staging/batman-adv/vis.c +++ b/drivers/staging/batman-adv/vis.c @@ -19,6 +19,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "main.h" #include "send.h" #include "translation-table.h" @@ -628,7 +630,7 @@ static void send_vis_packet(struct vis_info *info) int packet_length; if (info->packet.ttl < 2) { - printk(KERN_WARNING "batman-adv: Error - can't send vis packet: ttl exceeded\n"); + pr_warning("Error - can't send vis packet: ttl exceeded\n"); return; } @@ -690,13 +692,13 @@ int vis_init(void) vis_hash = hash_new(256, vis_info_cmp, vis_info_choose); if (!vis_hash) { - printk(KERN_ERR "batman-adv:Can't initialize vis_hash\n"); + pr_err("Can't initialize vis_hash\n"); goto err; } my_vis_info = kmalloc(1000, GFP_ATOMIC); if (!my_vis_info) { - printk(KERN_ERR "batman-adv:Can't initialize vis packet\n"); + pr_err("Can't initialize vis packet\n"); goto err; } @@ -717,8 +719,7 @@ int vis_init(void) memcpy(my_vis_info->packet.sender_orig, mainIfAddr, ETH_ALEN); if (hash_add(vis_hash, my_vis_info) < 0) { - printk(KERN_ERR - "batman-adv:Can't add own vis packet into hash\n"); + pr_err("Can't add own vis packet into hash\n"); /* not in hash, need to remove it manually. */ kref_put(&my_vis_info->refcount, free_info); goto err;

2 8

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N June 2010