commits June 2010

commits@lists.open-mesh.org

1 participants
61 discussions

by postmaster＠open-mesh.net

Author: marek Date: 2010-06-21 15:20:12 +0200 (Mon, 21 Jun 2010) New Revision: 1717 Modified: trunk/batctl/debugfs.c trunk/batctl/sys.c Log: batctl: Use NULL instead of 0 for pointers Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batctl/debugfs.c =================================================================== --- trunk/batctl/debugfs.c 2010-06-21 13:20:09 UTC (rev 1716) +++ trunk/batctl/debugfs.c 2010-06-21 13:20:12 UTC (rev 1717) @@ -38,7 +38,7 @@ static const char *debugfs_known_mountpoints[] = { "/sys/kernel/debug/", "/debug/", - 0, + NULL, }; /* use this to force a umount */ Modified: trunk/batctl/sys.c =================================================================== --- trunk/batctl/sys.c 2010-06-21 13:20:09 UTC (rev 1716) +++ trunk/batctl/sys.c 2010-06-21 13:20:12 UTC (rev 1717) @@ -39,14 +39,14 @@ "disable", "1", "0", - 0, + NULL, }; const char *sysfs_param_server[] = { "off", "client", "server", - 0, + NULL, }; static void interface_usage(void)

12 years, 9 months

r1716 - trunk/batctl

by postmaster＠open-mesh.net

Author: marek Date: 2010-06-21 15:20:09 +0200 (Mon, 21 Jun 2010) New Revision: 1716 Modified: trunk/batctl/functions.c trunk/batctl/functions.h Log: batctl: Remove dead code from old sysfs parsing The old batman-adv sysfs files provided all their available options inside their output. This made it necessary to parse the output to analyse it before we accept an input given to batctl. This functionality was removed as it wasn't the correct style according to the sysfs maintainer. Not all code related to that were removed right away when batctl was adopted to the new sysfs handling. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batctl/functions.c =================================================================== --- trunk/batctl/functions.c 2010-06-20 21:13:24 UTC (rev 1715) +++ trunk/batctl/functions.c 2010-06-21 13:20:09 UTC (rev 1716) @@ -303,21 +303,3 @@ close(fd); return res; } - -char *strchr_anyof(const char *s, const char *n) -{ - char *cur, *first = NULL; - size_t i, len; - - if (s == NULL || n == NULL) - return first; - - len = strlen(n); - for (i = 0; i < len; i++) { - cur = strchr(s, n[i]); - if (cur != NULL && (cur < first || first == NULL)) - first = cur; - } - - return first; -} Modified: trunk/batctl/functions.h =================================================================== --- trunk/batctl/functions.h 2010-06-20 21:13:24 UTC (rev 1715) +++ trunk/batctl/functions.h 2010-06-21 13:20:09 UTC (rev 1716) @@ -35,7 +35,6 @@ 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); -char *strchr_anyof(const char *s, const char *n); extern char *line_ptr;

12 years, 9 months

[git] linux integration branch, linux, updated. GregKH-20091208-22753-g89b7f22

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 89b7f227af4a8dbcaf9f17dcfe5ae150b5a00251 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Jun 21 12:53:28 2010 +0200 Staging: batman-adv: Add sysfs abi documentation about bonding Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/drivers/staging/batman-adv/sysfs-class-net-mesh b/drivers/staging/batman-adv/sysfs-class-net-mesh index c75a87b..5aa1912 100644 --- a/drivers/staging/batman-adv/sysfs-class-net-mesh +++ b/drivers/staging/batman-adv/sysfs-class-net-mesh @@ -6,6 +6,14 @@ Description: Indicates whether the batman protocol messages of the mesh <mesh_iface> shall be aggregated or not. +What: /sys/class/net/<mesh_iface>/mesh/bonding +Date: June 2010 +Contact: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> +Description: + Indicates whether the data traffic going through the + mesh will be sent using multiple interfaces at the + same time (if available). + What: /sys/class/net/<mesh_iface>/mesh/orig_interval Date: May 2010 Contact: Marek Lindner <lindner_marek(a)yahoo.de> -- linux integration

12 years, 9 months

r1715 - in trunk: batctl batctl/man batman

by postmaster＠open-mesh.net

Author: marek Date: 2010-06-20 23:13:24 +0200 (Sun, 20 Jun 2010) New Revision: 1715 Modified: trunk/batctl/Makefile trunk/batctl/README trunk/batctl/allocate.h trunk/batctl/bat-hosts.c trunk/batctl/bat-hosts.h trunk/batctl/bisect.c trunk/batctl/bisect.h trunk/batctl/debug.c trunk/batctl/functions.c trunk/batctl/functions.h trunk/batctl/main.c trunk/batctl/main.h trunk/batctl/man/batctl.8 trunk/batctl/ping.c trunk/batctl/ping.h trunk/batctl/tcpdump.c trunk/batctl/tcpdump.h trunk/batctl/traceroute.c trunk/batctl/traceroute.h trunk/batctl/vis.c trunk/batctl/vis.h trunk/batman/hash.c trunk/batman/hash.h trunk/batman/list-batman.c trunk/batman/list-batman.h Log: batctl: Merge differences between v2010.0.0 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> Modified: trunk/batctl/Makefile =================================================================== --- trunk/batctl/Makefile 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/Makefile 2010-06-20 21:13:24 UTC (rev 1715) @@ -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 Modified: trunk/batctl/README =================================================================== --- trunk/batctl/README 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/README 2010-06-20 21:13:24 UTC (rev 1715) @@ -335,7 +335,7 @@ * 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 @@ [ ] 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 Modified: trunk/batctl/allocate.h =================================================================== --- trunk/batctl/allocate.h 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/allocate.h 2010-06-20 21:13:24 UTC (rev 1715) @@ -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> * Modified: trunk/batctl/bat-hosts.c =================================================================== --- trunk/batctl/bat-hosts.c 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/bat-hosts.c 2010-06-20 21:13:24 UTC (rev 1715) @@ -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> * Modified: trunk/batctl/bat-hosts.h =================================================================== --- trunk/batctl/bat-hosts.h 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/bat-hosts.h 2010-06-20 21:13:24 UTC (rev 1715) @@ -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> * Modified: trunk/batctl/bisect.c =================================================================== --- trunk/batctl/bisect.c 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/bisect.c 2010-06-20 21:13:24 UTC (rev 1715) @@ -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> * Modified: trunk/batctl/bisect.h =================================================================== --- trunk/batctl/bisect.h 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/bisect.h 2010-06-20 21:13:24 UTC (rev 1715) @@ -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> * Modified: trunk/batctl/debug.c =================================================================== --- trunk/batctl/debug.c 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/debug.c 2010-06-20 21:13:24 UTC (rev 1715) @@ -100,4 +100,4 @@ 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 +} Modified: trunk/batctl/functions.c =================================================================== --- trunk/batctl/functions.c 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/functions.c 2010-06-20 21:13:24 UTC (rev 1715) @@ -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 @@ 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; Modified: trunk/batctl/functions.h =================================================================== --- trunk/batctl/functions.h 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/functions.h 2010-06-20 21:13:24 UTC (rev 1715) @@ -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_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; Modified: trunk/batctl/main.c =================================================================== --- trunk/batctl/main.c 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/main.c 2010-06-20 21:13:24 UTC (rev 1715) @@ -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> * Modified: trunk/batctl/main.h =================================================================== --- trunk/batctl/main.h 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/main.h 2010-06-20 21:13:24 UTC (rev 1715) @@ -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> * Modified: trunk/batctl/man/batctl.8 =================================================================== --- trunk/batctl/man/batctl.8 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/man/batctl.8 2010-06-20 21:13:24 UTC (rev 1715) @@ -56,16 +56,16 @@ .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]" +.IP "\fBoriginators\fP|\fBo\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" 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. +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 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" +.IP "\fBlog\fP|\fBl\fP [\fBlogfile\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. .br .IP "\fBgw_mode|gw\fP [\fBoff\fP|\fBclient\fP|\fBserver\fP] [\fBgw_class\fP]\fP" @@ -114,10 +114,10 @@ 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. +Display the local translation table. batctl will refresh the list 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. +Display the global translation table. batctl will refresh the list 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. Modified: trunk/batctl/ping.c =================================================================== --- trunk/batctl/ping.c 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/ping.c 2010-06-20 21:13:24 UTC (rev 1715) @@ -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> * Modified: trunk/batctl/ping.h =================================================================== --- trunk/batctl/ping.h 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/ping.h 2010-06-20 21:13:24 UTC (rev 1715) @@ -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> * Modified: trunk/batctl/tcpdump.c =================================================================== --- trunk/batctl/tcpdump.c 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/tcpdump.c 2010-06-20 21:13:24 UTC (rev 1715) @@ -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> * Modified: trunk/batctl/tcpdump.h =================================================================== --- trunk/batctl/tcpdump.h 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/tcpdump.h 2010-06-20 21:13:24 UTC (rev 1715) @@ -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> * Modified: trunk/batctl/traceroute.c =================================================================== --- trunk/batctl/traceroute.c 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/traceroute.c 2010-06-20 21:13:24 UTC (rev 1715) @@ -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> * Modified: trunk/batctl/traceroute.h =================================================================== --- trunk/batctl/traceroute.h 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/traceroute.h 2010-06-20 21:13:24 UTC (rev 1715) @@ -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> * Modified: trunk/batctl/vis.c =================================================================== --- trunk/batctl/vis.c 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/vis.c 2010-06-20 21:13:24 UTC (rev 1715) @@ -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 Modified: trunk/batctl/vis.h =================================================================== --- trunk/batctl/vis.h 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batctl/vis.h 2010-06-20 21:13:24 UTC (rev 1715) @@ -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 Modified: trunk/batman/hash.c =================================================================== --- trunk/batman/hash.c 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batman/hash.c 2010-06-20 21:13:24 UTC (rev 1715) @@ -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 * Modified: trunk/batman/hash.h =================================================================== --- trunk/batman/hash.h 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batman/hash.h 2010-06-20 21:13:24 UTC (rev 1715) @@ -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 * Modified: trunk/batman/list-batman.c =================================================================== --- trunk/batman/list-batman.c 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batman/list-batman.c 2010-06-20 21:13:24 UTC (rev 1715) @@ -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 * Modified: trunk/batman/list-batman.h =================================================================== --- trunk/batman/list-batman.h 2010-06-20 11:49:16 UTC (rev 1714) +++ trunk/batman/list-batman.h 2010-06-20 21:13:24 UTC (rev 1715) @@ -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 *

12 years, 9 months

r1714 - trunk/batctl

by postmaster＠open-mesh.net

Author: marek Date: 2010-06-20 13:49:16 +0200 (Sun, 20 Jun 2010) New Revision: 1714 Modified: trunk/batctl/packet.h Log: batctl: update packet.h link to point to correct folder Reported-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batctl/packet.h =================================================================== --- trunk/batctl/packet.h 2010-06-20 10:22:29 UTC (rev 1713) +++ trunk/batctl/packet.h 2010-06-20 11:49:16 UTC (rev 1714) @@ -1 +1 @@ -link ../batman-adv-kernelland/packet.h \ No newline at end of file +link ../batman-adv/packet.h \ No newline at end of file

12 years, 9 months

r1713 - trunk/batman-adv

by postmaster＠open-mesh.net

Author: marek Date: 2010-06-20 12:22:29 +0200 (Sun, 20 Jun 2010) New Revision: 1713 Modified: trunk/batman-adv/send.c Log: batman-adv: replace manual calculation by msecs_to_jiffies() for better readability Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv/send.c =================================================================== --- trunk/batman-adv/send.c 2010-06-20 09:50:43 UTC (rev 1712) +++ trunk/batman-adv/send.c 2010-06-20 10:22:29 UTC (rev 1713) @@ -44,15 +44,15 @@ /* when do we schedule our own packet to be sent */ static unsigned long own_send_time(struct bat_priv *bat_priv) { - return jiffies + - (((atomic_read(&bat_priv->orig_interval) - JITTER + - (random32() % 2*JITTER)) * HZ) / 1000); + return jiffies + msecs_to_jiffies( + atomic_read(&bat_priv->orig_interval) - + JITTER + (random32() % 2*JITTER)); } /* when do we schedule a forwarded packet to be sent */ static unsigned long forward_send_time(struct bat_priv *bat_priv) { - return jiffies + (((random32() % (JITTER/2)) * HZ) / 1000); + return jiffies + msecs_to_jiffies(random32() % (JITTER/2)); } /* send out an already prepared packet to the given address via the

12 years, 9 months

r1712 - trunk

by postmaster＠open-mesh.net

Author: marek Date: 2010-06-20 11:50:43 +0200 (Sun, 20 Jun 2010) New Revision: 1712 Added: trunk/batman-adv/ Removed: trunk/batman-adv-kernelland/ Log: batman-adv: removing obsolete "kernelland" suffix from folder name Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de>

12 years, 9 months

r1711 - trunk/batman-adv-kernelland

by postmaster＠open-mesh.net

Author: simon Date: 2010-06-20 00:42:39 +0200 (Sun, 20 Jun 2010) New Revision: 1711 Modified: trunk/batman-adv-kernelland/gateway_client.c trunk/batman-adv-kernelland/main.h trunk/batman-adv-kernelland/originator.c trunk/batman-adv-kernelland/translation-table.c trunk/batman-adv-kernelland/vis.c trunk/batman-adv-kernelland/vis.h Log: batman-adv: Lower resolution for timeouts It is enough for our timeouts to keep them in seconds instead of miliseconds. With a too high resolution, we might even risk an integer overflow, so this patch should make things more safe. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Modified: trunk/batman-adv-kernelland/gateway_client.c =================================================================== --- trunk/batman-adv-kernelland/gateway_client.c 2010-06-19 22:23:29 UTC (rev 1710) +++ trunk/batman-adv-kernelland/gateway_client.c 2010-06-19 22:42:39 UTC (rev 1711) @@ -286,7 +286,7 @@ void gw_node_purge_deleted(void) { struct gw_node *gw_node, *gw_node_tmp; - unsigned long timeout = (2 * PURGE_TIMEOUT * HZ) / 1000; + unsigned long timeout = 2 * PURGE_TIMEOUT * HZ; spin_lock(&gw_list_lock); Modified: trunk/batman-adv-kernelland/main.h =================================================================== --- trunk/batman-adv-kernelland/main.h 2010-06-19 22:23:29 UTC (rev 1710) +++ trunk/batman-adv-kernelland/main.h 2010-06-19 22:42:39 UTC (rev 1711) @@ -36,10 +36,10 @@ #define JITTER 20 #define TTL 50 /* Time To Live of broadcast messages */ -#define PURGE_TIMEOUT 200000 /* purge originators after time in ms if no +#define PURGE_TIMEOUT 200 /* purge originators after time in seconds if no * valid packet comes in -> TODO: check * influence on TQ_LOCAL_WINDOW_SIZE */ -#define LOCAL_HNA_TIMEOUT 3600000 +#define LOCAL_HNA_TIMEOUT 3600 /* in seconds */ #define TQ_LOCAL_WINDOW_SIZE 64 /* sliding packet range of received originator * messages in squence numbers (should be a Modified: trunk/batman-adv-kernelland/originator.c =================================================================== --- trunk/batman-adv-kernelland/originator.c 2010-06-19 22:23:29 UTC (rev 1710) +++ trunk/batman-adv-kernelland/originator.c 2010-06-19 22:42:39 UTC (rev 1711) @@ -195,8 +195,7 @@ neigh_node = list_entry(list_pos, struct neigh_node, list); if ((time_after(jiffies, - (neigh_node->last_valid + - ((PURGE_TIMEOUT * HZ) / 1000)))) || + neigh_node->last_valid + PURGE_TIMEOUT * HZ)) || (neigh_node->if_incoming->if_status == IF_TO_BE_REMOVED)) { @@ -233,8 +232,7 @@ struct neigh_node *best_neigh_node; if (time_after(jiffies, - (orig_node->last_valid + - ((2 * PURGE_TIMEOUT * HZ) / 1000)))) { + orig_node->last_valid + 2 * PURGE_TIMEOUT * HZ)) { bat_dbg(DBG_BATMAN, "Originator timeout: originator %pM, last_valid %lu\n", Modified: trunk/batman-adv-kernelland/translation-table.c =================================================================== --- trunk/batman-adv-kernelland/translation-table.c 2010-06-19 22:23:29 UTC (rev 1710) +++ trunk/batman-adv-kernelland/translation-table.c 2010-06-19 22:42:39 UTC (rev 1711) @@ -258,8 +258,7 @@ while (hash_iterate(hna_local_hash, &hashit)) { hna_local_entry = hashit.bucket->data; - timeout = hna_local_entry->last_seen + - ((LOCAL_HNA_TIMEOUT * HZ) / 1000); + timeout = hna_local_entry->last_seen + LOCAL_HNA_TIMEOUT * HZ; if ((!hna_local_entry->never_purge) && time_after(jiffies, timeout)) hna_local_del(hna_local_entry, "address timed out"); Modified: trunk/batman-adv-kernelland/vis.c =================================================================== --- trunk/batman-adv-kernelland/vis.c 2010-06-19 22:23:29 UTC (rev 1710) +++ trunk/batman-adv-kernelland/vis.c 2010-06-19 22:42:39 UTC (rev 1711) @@ -598,7 +598,7 @@ if (info == my_vis_info) /* never purge own data. */ continue; if (time_after(jiffies, - info->first_seen + (VIS_TIMEOUT*HZ)/1000)) { + info->first_seen + VIS_TIMEOUT * HZ)) { hash_remove_bucket(vis_hash, &hashit); send_list_del(info); kref_put(&info->refcount, free_info); Modified: trunk/batman-adv-kernelland/vis.h =================================================================== --- trunk/batman-adv-kernelland/vis.h 2010-06-19 22:23:29 UTC (rev 1710) +++ trunk/batman-adv-kernelland/vis.h 2010-06-19 22:42:39 UTC (rev 1711) @@ -19,7 +19,7 @@ * */ -#define VIS_TIMEOUT 200000 +#define VIS_TIMEOUT 200 /* timeout of vis packets in seconds */ struct vis_info { unsigned long first_seen;

12 years, 9 months

r1710 - trunk/batman-adv-kernelland

by postmaster＠open-mesh.net

Author: simon Date: 2010-06-20 00:23:29 +0200 (Sun, 20 Jun 2010) New Revision: 1710 Modified: trunk/batman-adv-kernelland/translation-table.c Log: batman-adv: Avoid rounding issues for local hna timeout 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?\195?\188ssing <linus.luessing(a)web.de> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Modified: trunk/batman-adv-kernelland/translation-table.c =================================================================== --- trunk/batman-adv-kernelland/translation-table.c 2010-06-19 13:09:59 UTC (rev 1709) +++ trunk/batman-adv-kernelland/translation-table.c 2010-06-19 22:23:29 UTC (rev 1710) @@ -259,7 +259,7 @@ 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");

12 years, 9 months

r1709 - trunk/batman-adv-kernelland

by postmaster＠open-mesh.net

Author: marek Date: 2010-06-19 15:09:59 +0200 (Sat, 19 Jun 2010) New Revision: 1709 Modified: trunk/batman-adv-kernelland/main.c trunk/batman-adv-kernelland/main.h trunk/batman-adv-kernelland/routing.c trunk/batman-adv-kernelland/send.c trunk/batman-adv-kernelland/soft-interface.c trunk/batman-adv-kernelland/soft-interface.h trunk/batman-adv-kernelland/vis.c Log: batman-adv: Convert names from Java to C style Useless but meaningfull patch that converts JavaStyle names into c_style Signed-off-by: Antonio Quartulli <ordex(a)ritirata.org> Modified: trunk/batman-adv-kernelland/main.c =================================================================== --- trunk/batman-adv-kernelland/main.c 2010-06-19 12:08:15 UTC (rev 1708) +++ trunk/batman-adv-kernelland/main.c 2010-06-19 13:09:59 UTC (rev 1709) @@ -48,7 +48,7 @@ struct net_device *soft_device; -unsigned char broadcastAddr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; +unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; atomic_t module_state; static struct packet_type batman_adv_packet_type __read_mostly = { Modified: trunk/batman-adv-kernelland/main.h =================================================================== --- trunk/batman-adv-kernelland/main.h 2010-06-19 12:08:15 UTC (rev 1708) +++ trunk/batman-adv-kernelland/main.h 2010-06-19 13:09:59 UTC (rev 1709) @@ -146,7 +146,7 @@ extern struct net_device *soft_device; -extern unsigned char broadcastAddr[]; +extern unsigned char broadcast_addr[]; extern atomic_t module_state; extern struct workqueue_struct *bat_event_workqueue; Modified: trunk/batman-adv-kernelland/routing.c =================================================================== --- trunk/batman-adv-kernelland/routing.c 2010-06-19 12:08:15 UTC (rev 1708) +++ trunk/batman-adv-kernelland/routing.c 2010-06-19 13:09:59 UTC (rev 1709) @@ -122,7 +122,7 @@ update_HNA(orig_node, hna_buff, hna_buff_len); } -static int isBidirectionalNeigh(struct orig_node *orig_node, +static int is_bidirectional_neigh(struct orig_node *orig_node, struct orig_node *orig_neigh_node, struct batman_packet *batman_packet, struct batman_if *if_incoming) @@ -578,7 +578,7 @@ batman_if->net_dev->dev_addr)) is_my_oldorig = 1; - if (compare_orig(ethhdr->h_source, broadcastAddr)) + if (compare_orig(ethhdr->h_source, broadcast_addr)) is_broadcast = 1; } @@ -688,7 +688,7 @@ return; } - is_bidirectional = isBidirectionalNeigh(orig_node, orig_neigh_node, + is_bidirectional = is_bidirectional_neigh(orig_node, orig_neigh_node, batman_packet, if_incoming); /* update ranking if it is not a duplicate or has the same Modified: trunk/batman-adv-kernelland/send.c =================================================================== --- trunk/batman-adv-kernelland/send.c 2010-06-19 12:08:15 UTC (rev 1708) +++ trunk/batman-adv-kernelland/send.c 2010-06-19 13:09:59 UTC (rev 1709) @@ -176,7 +176,7 @@ send_raw_packet(forw_packet->packet_buff, forw_packet->packet_len, - batman_if, broadcastAddr); + batman_if, broadcast_addr); } /* send a batman packet */ @@ -213,7 +213,7 @@ send_raw_packet(forw_packet->packet_buff, forw_packet->packet_len, forw_packet->if_incoming, - broadcastAddr); + broadcast_addr); return; } @@ -476,7 +476,7 @@ skb1 = skb_copy(forw_packet->skb, GFP_ATOMIC); if (skb1) send_skb_packet(skb1, - batman_if, broadcastAddr); + batman_if, broadcast_addr); } rcu_read_unlock(); Modified: trunk/batman-adv-kernelland/soft-interface.c =================================================================== --- trunk/batman-adv-kernelland/soft-interface.c 2010-06-19 12:08:15 UTC (rev 1708) +++ trunk/batman-adv-kernelland/soft-interface.c 2010-06-19 13:09:59 UTC (rev 1709) @@ -38,7 +38,7 @@ static int32_t skb_packets; static int32_t skb_bad_packets; -unsigned char mainIfAddr[ETH_ALEN]; +unsigned char main_if_addr[ETH_ALEN]; static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd); static void bat_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info); @@ -60,7 +60,7 @@ void set_main_if_addr(uint8_t *addr) { - memcpy(mainIfAddr, addr, ETH_ALEN); + memcpy(main_if_addr, addr, ETH_ALEN); } int my_skb_push(struct sk_buff *skb, unsigned int len) @@ -172,7 +172,7 @@ /* hw address of first interface is the orig mac because only * this mac is known throughout the mesh */ - memcpy(bcast_packet->orig, mainIfAddr, ETH_ALEN); + memcpy(bcast_packet->orig, main_if_addr, ETH_ALEN); /* set broadcast sequence number */ bcast_packet->seqno = htonl(bcast_seqno); Modified: trunk/batman-adv-kernelland/soft-interface.h =================================================================== --- trunk/batman-adv-kernelland/soft-interface.h 2010-06-19 12:08:15 UTC (rev 1708) +++ trunk/batman-adv-kernelland/soft-interface.h 2010-06-19 13:09:59 UTC (rev 1709) @@ -25,4 +25,4 @@ void interface_rx(struct sk_buff *skb, int hdr_size); int my_skb_push(struct sk_buff *skb, unsigned int len); -extern unsigned char mainIfAddr[]; +extern unsigned char main_if_addr[]; Modified: trunk/batman-adv-kernelland/vis.c =================================================================== --- trunk/batman-adv-kernelland/vis.c 2010-06-19 12:08:15 UTC (rev 1708) +++ trunk/batman-adv-kernelland/vis.c 2010-06-19 13:09:59 UTC (rev 1709) @@ -391,7 +391,7 @@ /* Make it a broadcast packet, if required */ if (make_broadcast) - memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); + memcpy(info->packet.target_orig, broadcast_addr, ETH_ALEN); /* repair if entries is longer than packet. */ if (info->packet.entries * sizeof(struct vis_info_entry) > vis_info_len) @@ -525,7 +525,7 @@ info->packet.vis_type = atomic_read(&bat_priv->vis_mode); spin_lock_irqsave(&orig_hash_lock, flags); - memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); + memcpy(info->packet.target_orig, broadcast_addr, ETH_ALEN); info->packet.ttl = TTL; info->packet.seqno = htonl(ntohl(info->packet.seqno) + 1); info->packet.entries = 0; @@ -642,7 +642,7 @@ } spin_unlock_irqrestore(&orig_hash_lock, flags); - memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); + memcpy(info->packet.target_orig, broadcast_addr, ETH_ALEN); } static void unicast_vis_packet(struct vis_info *info, int packet_length) @@ -683,7 +683,7 @@ return; } - memcpy(info->packet.sender_orig, mainIfAddr, ETH_ALEN); + memcpy(info->packet.sender_orig, main_if_addr, ETH_ALEN); info->packet.ttl--; packet_length = sizeof(struct vis_packet) + @@ -764,8 +764,8 @@ INIT_LIST_HEAD(&send_list); - memcpy(my_vis_info->packet.vis_orig, mainIfAddr, ETH_ALEN); - memcpy(my_vis_info->packet.sender_orig, mainIfAddr, ETH_ALEN); + memcpy(my_vis_info->packet.vis_orig, main_if_addr, ETH_ALEN); + memcpy(my_vis_info->packet.sender_orig, main_if_addr, ETH_ALEN); if (hash_add(vis_hash, my_vis_info) < 0) { printk(KERN_ERR

12 years, 9 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2010