B.A.T.M.A.N December 2012

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

19 participants
40 discussions

Re: [B.A.T.M.A.N.] RFC: Removing one indirection layer for patches
by Marek Lindner 05 Dec '12

05 Dec '12

Hi, [trimmed long explanation of how things are done today] > Antonio already showed that he can handle adhoc pull requests very well. > Therefore, the idea would be to remove the two month extra waiting time. > Here are just two random branch names: > > * next - new patches are excepted here - so it is something like net-next > for batman-adv. Antonio will gather some patches and then sent them to > David. Davids reaction will come heavy and hard... but the effort for an > reaction is reduced. > * master - bugfix gathering place. So it is like net for batman-adv. > Patches will end up really fast in Linus' tree. I am a little confused here. Our "next" branch will be the new "master" and the new "master" will be what "maint" is today ? I also don't see the implementation of the new merge policy yet. David can only receive what we merged before but how do we determine what patch to merge when and how ? Up to now there was a simple rule (spawned from your head iirc): Features into master, cleanups into master, fixes for next into next and very critical stuff into maint. How is that supposed to work in the future? One very vocal voice keeps telling me: Just merge everything into the "new next" - the rest will fall into place. No need to worry. However, it would be great if your suggestion could be contemplated by such a merge policy. I don't see it yet. It would be even better if those who believe to know how it all will work out stepped up and took the job of collecting & merging the patches into the "new next". I certainly would not mind. Cheers, Marek

2 2

[B.A.T.M.A.N.] RFC: Removing one indirection layer for patches
by Sven Eckelmann 05 Dec '12

05 Dec '12

Hi, I am here to think loud about the batman-adv way of dealing with patches. I think everybody knows how it works right now [1]. Patches will be accepted by Marek and applied on master (we ignore some exceptions for now). From time to time a new kernel is released, this is the time when next is used to create a new release which is more or less the stuff also in the released^W"next to be released" kernel. Now all the stuff in master is merged into next and Antonio will use the stuff in next to create pull requests for David S. Miller. In case he accepts it in net-next (this isn't as easy as it sounds), this stuff will be part of the next+1 kernel. This concept of "let everything wait in master until it is smells funny" worked perfectly in the past and helped a lot to organize some things. But it seems more and more problematic to continue to work with it because David S. Miller isn't the most easy person and therefore a lot of things got pushed back or got rejected. So, what happens when something gets rejected or has to be reworked? Yes, some people have to run around and do a lot of magic. These things will end up in next (because this is were Antonio is working when he sends patches to David) and all the new stuff in master has to be rebased later on top of the new things in next [did I just loose most of my audience or is this snoring coming out of my PC?]. To make it short: An extra release cycle waiting time for feature patches is added and creates an extra burden for the involved maintainers because they have to rebase/revert/move/... patches when something unexpected happens (or we can say: "when David happens"). I will just remind everyone of the DAT fun. The big question is: Is this extra waiting time for new feature patches really useful in the current situation and does batman-adv benefit from it in a special/irreplaceable way? My personal observation is rather negative. Most problems are detected by people using the release and by people checking the patches (on the b.a.t.m.a.n. mailing list and on netdev... this includes "i am really really angry about what you did" David). But of course, my impressions could be slightly biased. I think Antonio can give more insights about it because he has to squash all the stuff together. Here just a calculation for a new feature patch: * Send to b.a.t.m.a.n(a)lists.open-mesh.org at the beginning of the first month * accepted by Marek in the middle of the first month (had to be resent or so) * will be part of next in the middle of the third month * will be sent to David in the middle of the third month (uh, fast Antonio) * will be send to Linus by David at the the beginning of the fifth month * will be released as a separate kernel module in the middle of the fifth month * will be released in a kernel at the beginning of the seventh month Or it could easily happen that the author of the patches get a late "sry, it will not be accepted" in months three-five by David. Of course, it can also happen after month five, but this is rather unlikely because it already passed the fuzzy Heimdall reincarnation David. Antonio already showed that he can handle adhoc pull requests very well. Therefore, the idea would be to remove the two month extra waiting time. Here are just two random branch names: * next - new patches are excepted here - so it is something like net-next for batman-adv. Antonio will gather some patches and then sent them to David. Davids reaction will come heavy and hard... but the effort for an reaction is reduced. * master - bugfix gathering place. So it is like net for batman-adv. Patches will end up really fast in Linus' tree. But I would still say it is a good idea to create releases from next because more people will test it and therefore it is easier to get bugfixes to Linus' instead through the stable queue. .1 releases from master can still be created when necessary. So, why bringing this up now? We currently have 12 Patches in master and Linux 3.7 will be released soon. So switching the patch strategy will not break loose hell. And as a nice side effect: it is not too tragic when C.A.T.W.O.M.A.N. is not merged right now. But what would it mean for the next release? Hm, the next release would be created from next, but then we propably have to use some tricks. Right now master is too far ahead because it has the role of next+1. We would have to move the patches to next (simple merge) and reset master to the release. Further .0 releases would just be made on next and then master merges the release. Additional fixes in master can "simply" be merged in next. Let the fight begin... Kind regards, Sven [1] http://www.open-mesh.org/projects/batman-adv/wiki/Release-todo?version=133

4 10

[B.A.T.M.A.N.] [PATCH] batctl: output errors to stderr
by Moritz Warning 05 Dec '12

05 Dec '12

batctl outputs many errors to stdout instead of stderr. This patch corrects this behavior by redirecting errors and the usage texts to stderr. Signed-off-by: Moritz Warning <moritzwarning at web.de> --- From: Moritz Warning <moritzwarning(a)web.de> Date: Wed, 5 Dec 2012 00:59:21 +0100 Subject: [PATCH] batctl: output errors to stderr Context: http://www.open-mesh.org/issues/167 --- bisect_iv.c | 34 ++++++++++++------------- debug.c | 36 +++++++++++++------------- debugfs.c | 2 +- functions.c | 18 ++++++------- ioctl.c | 10 ++++---- main.c | 68 +++++++++++++++++++++++++------------------------ ping.c | 30 +++++++++++----------- sys.c | 80 +++++++++++++++++++++++++++++----------------------------- tcpdump.c | 34 ++++++++++++------------- traceroute.c | 28 ++++++++++---------- translate.c | 2 +- vis.c | 8 +++--- 12 files changed, 176 insertions(+), 174 deletions(-) diff --git a/bisect_iv.c b/bisect_iv.c index 09171fb..49fcb9e 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -37,15 +37,15 @@ static struct bat_node *curr_bat_node = NULL; static void bisect_iv_usage(void) { - printf("Usage: batctl bisect_iv [parameters] <file1> <file2> .. <fileN>\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf(" \t -l run a loop detection of given mac address or bat-host (default)\n"); - printf(" \t -n don't convert addresses to bat-host names\n"); - printf(" \t -o only display orig events that affect given mac address or bat-host\n"); - printf(" \t -r print routing tables of given mac address or bat-host\n"); - printf(" \t -s seqno range to limit the output\n"); - printf(" \t -t trace seqnos of given mac address or bat-host\n"); + fprintf(stderr, "Usage: batctl bisect_iv [parameters] <file1> <file2> .. <fileN>\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -l run a loop detection of given mac address or bat-host (default)\n"); + fprintf(stderr, " \t -n don't convert addresses to bat-host names\n"); + fprintf(stderr, " \t -o only display orig events that affect given mac address or bat-host\n"); + fprintf(stderr, " \t -r print routing tables of given mac address or bat-host\n"); + fprintf(stderr, " \t -s seqno range to limit the output\n"); + fprintf(stderr, " \t -t trace seqnos of given mac address or bat-host\n"); } static int compare_name(void *data1, void *data2) @@ -1425,7 +1425,7 @@ static int get_orig_addr(char *orig_name, char *orig_addr) orig_mac = ether_aton(orig_name_tmp); if (!orig_mac) { - printf("Error - the originator is not a mac address or bat-host name: %s\n", orig_name); + fprintf(stderr, "Error - the originator is not a mac address or bat-host name: %s\n", orig_name); goto err; } @@ -1509,7 +1509,7 @@ int bisect_iv(int argc, char **argv) } if (argc <= found_args + 1) { - printf("Error - need at least 2 log files to compare\n"); + fprintf(stderr, "Error - need at least 2 log files to compare\n"); bisect_iv_usage(); goto err; } @@ -1517,7 +1517,7 @@ int bisect_iv(int argc, char **argv) node_hash = hash_new(64, compare_name, choose_name); if (!node_hash) { - printf("Error - could not create node hash table\n"); + fprintf(stderr, "Error - could not create node hash table\n"); goto err; } @@ -1525,13 +1525,13 @@ int bisect_iv(int argc, char **argv) num_parsed_files = 0; if ((rt_orig_ptr) && (trace_orig_ptr)) { - printf("Error - the 'print routing table' option can't be used together with the the 'trace seqno' option\n"); + fprintf(stderr, "Error - the 'print routing table' option can't be used together with the the 'trace seqno' option\n"); goto err; } else if ((loop_orig_ptr) && (trace_orig_ptr)) { - printf("Error - the 'loop detection' option can't be used together with the the 'trace seqno' option\n"); + fprintf(stderr, "Error - the 'loop detection' option can't be used together with the the 'trace seqno' option\n"); goto err; } else if ((loop_orig_ptr) && (rt_orig_ptr)) { - printf("Error - the 'loop detection' option can't be used together with the the 'print routing table' option\n"); + fprintf(stderr, "Error - the 'loop detection' option can't be used together with the the 'print routing table' option\n"); goto err; } else if (rt_orig_ptr) { res = get_orig_addr(rt_orig_ptr, orig); @@ -1555,7 +1555,7 @@ int bisect_iv(int argc, char **argv) seqno_max = seqno_min; if (seqno_min > seqno_max) { - printf("Error - the sequence range minimum (%lli) should be smaller than the maximum (%lli)\n", + fprintf(stderr, "Error - the sequence range minimum (%lli) should be smaller than the maximum (%lli)\n", seqno_min, seqno_max); goto err; } @@ -1577,7 +1577,7 @@ int bisect_iv(int argc, char **argv) } if (num_parsed_files < 2) { - printf("Error - need at least 2 log files to compare\n"); + fprintf(stderr, "Error - need at least 2 log files to compare\n"); goto err; } diff --git a/debug.c b/debug.c index 260448b..cdcbd39 100644 --- a/debug.c +++ b/debug.c @@ -80,16 +80,16 @@ const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { void debug_table_usage(int debug_table) { - printf("Usage: batctl [options] %s|%s [parameters]\n", + fprintf(stderr, "Usage: batctl [options] %s|%s [parameters]\n", batctl_debug_tables[debug_table].opt_long, batctl_debug_tables[debug_table].opt_short); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf(" \t -n don't replace mac addresses with bat-host names\n"); - printf(" \t -H don't show the header\n"); - printf(" \t -w [interval] watch mode - refresh the table continuously\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -n don't replace mac addresses with bat-host names\n"); + fprintf(stderr, " \t -H don't show the header\n"); + fprintf(stderr, " \t -w [interval] watch mode - refresh the table continuously\n"); if (debug_table == BATCTL_TABLE_ORIGINATORS) - printf(" \t -t timeout interval - don't print originators not seen for x.y seconds \n"); + fprintf(stderr, " \t -t timeout interval - don't print originators not seen for x.y seconds \n"); } int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) @@ -117,20 +117,20 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) } if (!sscanf(optarg, "%f", &watch_interval)) { - printf("Error - provided argument of '-%c' is not a number\n", optchar); + fprintf(stderr, "Error - provided argument of '-%c' is not a number\n", optchar); return EXIT_FAILURE; } break; case 't': if (debug_table != BATCTL_TABLE_ORIGINATORS) { - printf("Error - unrecognised option '-%c'\n", optchar); + fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); debug_table_usage(debug_table); return EXIT_FAILURE; } read_opt |= NO_OLD_ORIGS; if (!sscanf(optarg, "%f", &orig_timeout)) { - printf("Error - provided argument of '-%c' is not a number\n", optchar); + fprintf(stderr, "Error - provided argument of '-%c' is not a number\n", optchar); return EXIT_FAILURE; } break; @@ -139,14 +139,14 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) break; case '?': if (optopt == 't') - printf("Error - option '-t' needs a number as argument\n"); + fprintf(stderr, "Error - option '-t' needs a number as argument\n"); else if (optopt == 'w') { read_opt |= CLR_CONT_READ; break; } else - printf("Error - unrecognised option: '-%c'\n", optopt); + fprintf(stderr, "Error - unrecognised option: '-%c'\n", optopt); return EXIT_FAILURE; default: @@ -157,7 +157,7 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); return EXIT_FAILURE; } @@ -169,10 +169,10 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) static void log_usage(void) { - printf("Usage: batctl [options] log [parameters]\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf(" \t -n don't replace mac addresses with bat-host names\n"); + fprintf(stderr, "Usage: batctl [options] log [parameters]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -n don't replace mac addresses with bat-host names\n"); } int log_print(char *mesh_iface, int argc, char **argv) @@ -197,7 +197,7 @@ int log_print(char *mesh_iface, int argc, char **argv) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); return EXIT_FAILURE; } diff --git a/debugfs.c b/debugfs.c index 9fc6f42..bfedcfe 100644 --- a/debugfs.c +++ b/debugfs.c @@ -85,7 +85,7 @@ const char *debugfs_find_mountpoint(void) /* give up and parse /proc/mounts */ fp = fopen("/proc/mounts", "r"); if (fp == NULL) { - printf("Error - can't open /proc/mounts for read: %s\n", + fprintf(stderr, "Error - can't open /proc/mounts for read: %s\n", strerror(errno)); return NULL; } diff --git a/functions.c b/functions.c index 57c2bba..516d29f 100644 --- a/functions.c +++ b/functions.c @@ -130,20 +130,20 @@ static void file_open_problem_dbg(char *dir, char *fname, char *full_path) if (strstr(dir, "/sys/")) { if (stat("/sys/", &st) != 0) { - printf("Error - the folder '/sys/' was not found on the system\n"); - printf("Please make sure that the sys filesystem is properly mounted\n"); + fprintf(stderr, "Error - the folder '/sys/' was not found on the system\n"); + fprintf(stderr, "Please make sure that the sys filesystem is properly mounted\n"); return; } } if (!file_exists(module_ver_path)) { - printf("Error - batman-adv module has not been loaded\n"); + fprintf(stderr, "Error - batman-adv module has not been loaded\n"); return; } if (!file_exists(dir)) { - printf("Error - mesh has not been enabled yet\n"); - printf("Activate your mesh by adding interfaces to batman-adv\n"); + fprintf(stderr, "Error - mesh has not been enabled yet\n"); + fprintf(stderr, "Activate your mesh by adding interfaces to batman-adv\n"); return; } @@ -154,10 +154,10 @@ static void file_open_problem_dbg(char *dir, char *fname, char *full_path) break; } - printf("Error - can't open file '%s': %s\n", full_path, strerror(errno)); + fprintf(stderr, "Error - can't open file '%s': %s\n", full_path, strerror(errno)); if (*ptr) { - printf("The option you called seems not to be compiled into your batman-adv kernel module.\n"); - printf("Consult the README if you wish to learn more about compiling options into batman-adv.\n"); + fprintf(stderr, "The option you called seems not to be compiled into your batman-adv kernel module.\n"); + fprintf(stderr, "Consult the README if you wish to learn more about compiling options into batman-adv.\n"); } } @@ -318,7 +318,7 @@ int write_file(char *dir, char *fname, char *arg1, char *arg2) write_len = write(fd, arg1, strlen(arg1) + 1); if (write_len < 0) { - printf("Error - can't write to file '%s': %s\n", full_path, strerror(errno)); + fprintf(stderr, "Error - can't write to file '%s': %s\n", full_path, strerror(errno)); goto out; } diff --git a/ioctl.c b/ioctl.c index 5056d2f..4347c20 100644 --- a/ioctl.c +++ b/ioctl.c @@ -50,7 +50,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) ifr->ifr_data = (caddr_t)&drvinfo; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { - printf("Error - can't open driver information: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't open driver information: %s\n", strerror(errno)); goto out; } @@ -64,7 +64,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) strings = calloc(1, sz_str + sizeof(struct ethtool_gstrings)); stats = calloc(1, sz_stats + sizeof(struct ethtool_stats)); if (!strings || !stats) { - printf("Error - out of memory\n"); + fprintf(stderr, "Error - out of memory\n"); goto out; } @@ -74,7 +74,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) ifr->ifr_data = (caddr_t)strings; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { - printf("Error - can't get stats strings information: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't get stats strings information: %s\n", strerror(errno)); goto out; } @@ -83,7 +83,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) ifr->ifr_data = (caddr_t) stats; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { - printf("Error - can't get stats information: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't get stats information: %s\n", strerror(errno)); goto out; } @@ -111,7 +111,7 @@ int ioctl_statistics_get(char *mesh_iface) fd = socket(AF_INET, SOCK_DGRAM, 0); if (fd < 0) { - printf("Error - can't open socket: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't open socket: %s\n", strerror(errno)); goto out; } diff --git a/main.c b/main.c index 5d85d8b..ea83bbf 100644 --- a/main.c +++ b/main.c @@ -48,47 +48,47 @@ void print_usage(void) { int i, opt_indent; - printf("Usage: batctl [options] command|debug table [parameters]\n"); - printf("options:\n"); - printf(" \t-m mesh interface (default 'bat0')\n"); - printf(" \t-h print this help (or 'batctl <command|debug table> -h' for the parameter help)\n"); - printf(" \t-v print version\n"); - printf("\n"); - - printf("commands:\n"); - printf(" \tinterface|if [add|del iface(s)]\tdisplay or modify the interface settings\n"); + fprintf(stderr, "Usage: batctl [options] command|debug table [parameters]\n"); + fprintf(stderr, "options:\n"); + fprintf(stderr, " \t-m mesh interface (default 'bat0')\n"); + fprintf(stderr, " \t-h print this help (or 'batctl <command|debug table> -h' for the parameter help)\n"); + fprintf(stderr, " \t-v print version\n"); + fprintf(stderr, "\n"); + + fprintf(stderr, "commands:\n"); + fprintf(stderr, " \tinterface|if [add|del iface(s)]\tdisplay or modify the interface settings\n"); for (i = 0; i < BATCTL_SETTINGS_NUM; i++) { - printf(" \t%s|%s", batctl_settings[i].opt_long, batctl_settings[i].opt_short); + fprintf(stderr, " \t%s|%s", batctl_settings[i].opt_long, batctl_settings[i].opt_short); opt_indent = strlen(batctl_settings[i].opt_long) + strlen(batctl_settings[i].opt_short); if (batctl_settings[i].params == sysfs_param_enable) - printf("%*s display or modify %s setting\n", + fprintf(stderr, "%*s display or modify %s setting\n", 31 - opt_indent, "[0|1]", batctl_settings[i].opt_long); else if (batctl_settings[i].params == sysfs_param_server) - printf("%*s display or modify %s setting\n", + fprintf(stderr, "%*s display or modify %s setting\n", 41 - opt_indent, "[client|server]", batctl_settings[i].opt_long); else - printf(" display or modify %s setting\n", + fprintf(stderr, " display or modify %s setting\n", batctl_settings[i].opt_long); } - printf(" \tloglevel|ll [level] \tdisplay or modify the log level\n"); - printf(" \tlog|l \tread the log produced by the kernel module\n"); - printf(" \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); - printf(" \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); - printf("\n"); + fprintf(stderr, " \tloglevel|ll [level] \tdisplay or modify the log level\n"); + fprintf(stderr, " \tlog|l \tread the log produced by the kernel module\n"); + fprintf(stderr, " \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); + fprintf(stderr, " \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); + fprintf(stderr, "\n"); - printf("debug tables: \tdisplay the corresponding debug table\n"); + fprintf(stderr, "debug tables: \tdisplay the corresponding debug table\n"); for (i = 0; i < BATCTL_TABLE_NUM; i++) - printf(" \t%s|%s\n", batctl_debug_tables[i].opt_long, batctl_debug_tables[i].opt_short); - - printf("\n"); - printf(" \tstatistics|s \tprint mesh statistics\n"); - printf(" \tping|p <destination> \tping another batman adv host via layer 2\n"); - printf(" \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); - printf(" \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); - printf(" \ttranslate|t <destination> \ttranslate a destination to the originator responsible for it\n"); + fprintf(stderr, " \t%s|%s\n", batctl_debug_tables[i].opt_long, batctl_debug_tables[i].opt_short); + + fprintf(stderr, "\n"); + fprintf(stderr, " \tstatistics|s \tprint mesh statistics\n"); + fprintf(stderr, " \tping|p <destination> \tping another batman adv host via layer 2\n"); + fprintf(stderr, " \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); + fprintf(stderr, " \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); + fprintf(stderr, " \ttranslate|t <destination> \ttranslate a destination to the originator responsible for it\n"); #ifdef BATCTL_BISECT - printf(" \tbisect_iv <file1> .. <fileN>\tanalyze given batman iv log files for routing stability\n"); + fprintf(stderr, " \tbisect_iv <file1> .. <fileN>\tanalyze given batman iv log files for routing stability\n"); #endif } @@ -99,7 +99,7 @@ int main(int argc, char **argv) if ((argc > 1) && (strcmp(argv[1], "-m") == 0)) { if (argc < 3) { - printf("Error - the option '-m' needs a parameter\n"); + fprintf(stderr, "Error - the option '-m' needs a parameter\n"); goto err; } @@ -110,12 +110,14 @@ int main(int argc, char **argv) } if (argc < 2) { - printf("Error - no command specified\n"); + fprintf(stderr, "Error - no command specified\n"); goto err; } - if (strcmp(argv[1], "-h") == 0) - goto err; + if (strcmp(argv[1], "-h") == 0) { + print_usage(); + exit(EXIT_SUCCESS); + } if (strcmp(argv[1], "-v") == 0) { printf("batctl %s [batman-adv: ", SOURCE_VERSION); @@ -206,7 +208,7 @@ int main(int argc, char **argv) goto out; } - printf("Error - no valid command or debug table specified: %s\n", argv[1]); + fprintf(stderr, "Error - no valid command or debug table specified: %s\n", argv[1]); print_usage(); } diff --git a/ping.c b/ping.c index 51d18e8..4f52c66 100644 --- a/ping.c +++ b/ping.c @@ -44,14 +44,14 @@ char is_aborted = 0; void ping_usage(void) { - printf("Usage: batctl [options] ping [parameters] mac|bat-host|host_name|IPv4_address \n"); - printf("parameters:\n"); - printf(" \t -c ping packet count \n"); - printf(" \t -h print this help\n"); - printf(" \t -i interval in seconds\n"); - printf(" \t -t timeout in seconds\n"); - printf(" \t -R record route\n"); - printf(" \t -T don't try to translate mac to originator address\n"); + fprintf(stderr, "Usage: batctl [options] ping [parameters] mac|bat-host|host_name|IPv4_address \n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -c ping packet count \n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -i interval in seconds\n"); + fprintf(stderr, " \t -t timeout in seconds\n"); + fprintf(stderr, " \t -R record route\n"); + fprintf(stderr, " \t -T don't try to translate mac to originator address\n"); } void sig_handler(int sig) @@ -124,7 +124,7 @@ int ping(char *mesh_iface, int argc, char **argv) } if (argc <= found_args) { - printf("Error - target mac address or bat-host name not specified\n"); + fprintf(stderr, "Error - target mac address or bat-host name not specified\n"); ping_usage(); return EXIT_FAILURE; } @@ -140,7 +140,7 @@ int ping(char *mesh_iface, int argc, char **argv) dst_mac = resolve_mac(dst_string); if (!dst_mac) { - printf("Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); + fprintf(stderr, "Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); goto out; } } @@ -154,7 +154,7 @@ int ping(char *mesh_iface, int argc, char **argv) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); goto out; } @@ -163,7 +163,7 @@ int ping(char *mesh_iface, int argc, char **argv) ping_fd = open(icmp_socket, O_RDWR); if (ping_fd < 0) { - printf("Error - can't open a connection to the batman adv kernel module via the socket '%s': %s\n", + fprintf(stderr, "Error - can't open a connection to the batman adv kernel module via the socket '%s': %s\n", icmp_socket, strerror(errno)); printf("Check whether the module is loaded and active.\n"); goto out; @@ -203,7 +203,7 @@ int ping(char *mesh_iface, int argc, char **argv) icmp_packet_out.seqno = htons(++seq_counter); if (write(ping_fd, (char *)&icmp_packet_out, packet_len) < 0) { - printf("Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); + fprintf(stderr, "Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); goto sleep; } @@ -231,7 +231,7 @@ read_packet: read_len = read(ping_fd, (char *)&icmp_packet_in, packet_len); if (read_len < 0) { - printf("Error - can't read from batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); + fprintf(stderr, "Error - can't read from batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); goto sleep; } @@ -298,7 +298,7 @@ read_packet: printf("From %s: Time to live exceeded (icmp_seq %hu)\n", dst_string, ntohs(icmp_packet_in.seqno)); break; case BATADV_PARAMETER_PROBLEM: - printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", + fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", icmp_packet_in.header.version, BATADV_COMPAT_VERSION); printf("Please make sure to use compatible versions!\n"); goto out; diff --git a/sys.c b/sys.c index e4112b7..f628363 100644 --- a/sys.c +++ b/sys.c @@ -103,9 +103,9 @@ const struct settings_data batctl_settings[BATCTL_SETTINGS_NUM] = { static void interface_usage(void) { - printf("Usage: batctl [options] interface [parameters] [add|del iface(s)]\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); + fprintf(stderr, "Usage: batctl [options] interface [parameters] [add|del iface(s)]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); } static int print_interfaces(char *mesh_iface) @@ -116,21 +116,21 @@ static int print_interfaces(char *mesh_iface) int res; if (!file_exists(module_ver_path)) { - printf("Error - batman-adv module has not been loaded\n"); + fprintf(stderr, "Error - batman-adv module has not been loaded\n"); goto err; } path_buff = malloc(PATH_BUFF_LEN); if (!path_buff) { - printf("Error - could not allocate path buffer: out of memory ?\n"); + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); goto err; } iface_base_dir = opendir(SYS_IFACE_PATH); if (!iface_base_dir) { - printf("Error - the directory '%s' could not be read: %s\n", + fprintf(stderr, "Error - the directory '%s' could not be read: %s\n", SYS_IFACE_PATH, strerror(errno)); - printf("Is the batman-adv module loaded and sysfs mounted ?\n"); + fprintf(stderr, "Is the batman-adv module loaded and sysfs mounted ?\n"); goto err_buff; } @@ -157,7 +157,7 @@ static int print_interfaces(char *mesh_iface) path_buff[PATH_BUFF_LEN - 1] = '\0'; res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); if (res != EXIT_SUCCESS) { - printf("<error reading status>\n"); + fprintf(stderr, "<error reading status>\n"); continue; } @@ -199,20 +199,20 @@ int interface(char *mesh_iface, int argc, char **argv) if ((strcmp(argv[1], "add") != 0) && (strcmp(argv[1], "a") != 0) && (strcmp(argv[1], "del") != 0) && (strcmp(argv[1], "d") != 0)) { - printf("Error - unknown argument specified: %s\n", argv[1]); + fprintf(stderr, "Error - unknown argument specified: %s\n", argv[1]); interface_usage(); goto err; } if (argc == 2) { - printf("Error - missing interface name(s) after '%s'\n", argv[1]); + fprintf(stderr, "Error - missing interface name(s) after '%s'\n", argv[1]); interface_usage(); goto err; } path_buff = malloc(PATH_BUFF_LEN); if (!path_buff) { - printf("Error - could not allocate path buffer: out of memory ?\n"); + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); goto err; } @@ -225,16 +225,16 @@ int interface(char *mesh_iface, int argc, char **argv) path_buff[PATH_BUFF_LEN - 1] = '\0'; if (!file_exists(path_buff)) { - printf("Error - interface does not exist: %s\n", argv[i]); + fprintf(stderr, "Error - interface does not exist: %s\n", argv[i]); continue; } if (!file_exists(module_ver_path)) { - printf("Error - batman-adv module has not been loaded\n"); + fprintf(stderr, "Error - batman-adv module has not been loaded\n"); goto err; } - printf("Error - interface type not supported by batman-adv: %s\n", argv[i]); + fprintf(stderr, "Error - interface type not supported by batman-adv: %s\n", argv[i]); continue; } @@ -258,17 +258,17 @@ err: static void log_level_usage(void) { - printf("Usage: batctl [options] loglevel [parameters] [level[ level[ level]]...]\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf("levels:\n"); - printf(" \t none Debug logging is disabled\n"); - printf(" \t all Print messages from all below\n"); - printf(" \t batman Messages related to routing / flooding / broadcasting\n"); - printf(" \t routes Messages related to route added / changed / deleted\n"); - printf(" \t tt Messages related to translation table operations\n"); - printf(" \t bla Messages related to bridge loop avoidance\n"); - printf(" \t dat Messages related to arp snooping and distributed arp table\n"); + fprintf(stderr, "Usage: batctl [options] loglevel [parameters] [level[ level[ level]]...]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, "levels:\n"); + fprintf(stderr, " \t none Debug logging is disabled\n"); + fprintf(stderr, " \t all Print messages from all below\n"); + fprintf(stderr, " \t batman Messages related to routing / flooding / broadcasting\n"); + fprintf(stderr, " \t routes Messages related to route added / changed / deleted\n"); + fprintf(stderr, " \t tt Messages related to translation table operations\n"); + fprintf(stderr, " \t bla Messages related to bridge loop avoidance\n"); + fprintf(stderr, " \t dat Messages related to arp snooping and distributed arp table\n"); } int handle_loglevel(char *mesh_iface, int argc, char **argv) @@ -352,18 +352,18 @@ out: static void settings_usage(int setting) { - printf("Usage: batctl [options] %s|%s [parameters]", + fprintf(stderr, "Usage: batctl [options] %s|%s [parameters]", (char *)batctl_settings[setting].opt_long, (char *)batctl_settings[setting].opt_short); if (batctl_settings[setting].params == sysfs_param_enable) - printf(" [0|1]\n"); + fprintf(stderr, " [0|1]\n"); else if (batctl_settings[setting].params == sysfs_param_server) - printf(" [client|server]\n"); + fprintf(stderr, " [client|server]\n"); else - printf("\n"); + fprintf(stderr, "\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); } int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) @@ -404,12 +404,12 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) ptr++; } - printf("Error - the supplied argument is invalid: %s\n", argv[1]); - printf("The following values are allowed:\n"); + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + fprintf(stderr, "The following values are allowed:\n"); ptr = batctl_settings[setting].params; while (*ptr) { - printf(" * %s\n", *ptr); + fprintf(stderr, " * %s\n", *ptr); ptr++; } @@ -426,9 +426,9 @@ out: static void gw_mode_usage(void) { - printf("Usage: batctl [options] gw_mode [mode] [sel_class|bandwidth]\n"); - printf("options:\n"); - printf(" \t -h print this help\n"); + fprintf(stderr, "Usage: batctl [options] gw_mode [mode] [sel_class|bandwidth]\n"); + fprintf(stderr, "options:\n"); + fprintf(stderr, " \t -h print this help\n"); } int handle_gw_setting(char *mesh_iface, int argc, char **argv) @@ -533,12 +533,12 @@ int handle_gw_setting(char *mesh_iface, int argc, char **argv) goto out; opt_err: - printf("Error - the supplied argument is invalid: %s\n", argv[1]); - printf("The following values are allowed:\n"); + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + fprintf(stderr, "The following values are allowed:\n"); ptr = sysfs_param_server; while (*ptr) { - printf(" * %s\n", *ptr); + fprintf(stderr, " * %s\n", *ptr); ptr++; } diff --git a/tcpdump.c b/tcpdump.c index 4424dfd..d9aa6a8 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -62,23 +62,23 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read static void tcpdump_usage(void) { - printf("Usage: batctl tcpdump [parameters] interface [interface]\n"); - printf("parameters:\n"); - printf(" \t -c compat filter - only display packets matching own compat version (%i)\n", BATADV_COMPAT_VERSION); - printf(" \t -h print this help\n"); - printf(" \t -n don't convert addresses to bat-host names\n"); - printf(" \t -p dump specific packet type\n"); - printf(" \t -x dump all packet types except specified\n"); - printf("packet types:\n"); - printf(" \t\t%3d - batman ogm packets\n", DUMP_TYPE_BATOGM); - printf(" \t\t%3d - batman icmp packets\n", DUMP_TYPE_BATICMP); - printf(" \t\t%3d - batman unicast packets\n", DUMP_TYPE_BATUCAST); - printf(" \t\t%3d - batman broadcast packets\n", DUMP_TYPE_BATBCAST); - printf(" \t\t%3d - batman vis packets\n", DUMP_TYPE_BATVIS); - printf(" \t\t%3d - batman fragmented packets\n", DUMP_TYPE_BATFRAG); - printf(" \t\t%3d - batman tt / roaming packets\n", DUMP_TYPE_BATTT); - printf(" \t\t%3d - non batman packets\n", DUMP_TYPE_NONBAT); - printf(" \t\t%3d - batman ogm & non batman packets\n", DUMP_TYPE_BATOGM | DUMP_TYPE_NONBAT); + fprintf(stderr, "Usage: batctl tcpdump [parameters] interface [interface]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -c compat filter - only display packets matching own compat version (%i)\n", BATADV_COMPAT_VERSION); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -n don't convert addresses to bat-host names\n"); + fprintf(stderr, " \t -p dump specific packet type\n"); + fprintf(stderr, " \t -x dump all packet types except specified\n"); + fprintf(stderr, "packet types:\n"); + fprintf(stderr, " \t\t%3d - batman ogm packets\n", DUMP_TYPE_BATOGM); + fprintf(stderr, " \t\t%3d - batman icmp packets\n", DUMP_TYPE_BATICMP); + fprintf(stderr, " \t\t%3d - batman unicast packets\n", DUMP_TYPE_BATUCAST); + fprintf(stderr, " \t\t%3d - batman broadcast packets\n", DUMP_TYPE_BATBCAST); + fprintf(stderr, " \t\t%3d - batman vis packets\n", DUMP_TYPE_BATVIS); + fprintf(stderr, " \t\t%3d - batman fragmented packets\n", DUMP_TYPE_BATFRAG); + fprintf(stderr, " \t\t%3d - batman tt / roaming packets\n", DUMP_TYPE_BATTT); + fprintf(stderr, " \t\t%3d - non batman packets\n", DUMP_TYPE_NONBAT); + fprintf(stderr, " \t\t%3d - batman ogm & non batman packets\n", DUMP_TYPE_BATOGM | DUMP_TYPE_NONBAT); } static int print_time(void) diff --git a/traceroute.c b/traceroute.c index ac2f1fa..9da9bf6 100644 --- a/traceroute.c +++ b/traceroute.c @@ -43,11 +43,11 @@ void traceroute_usage(void) { - printf("Usage: batctl [options] traceroute [parameters] mac|bat-host|host_name|IPv4_address \n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf(" \t -n don't convert addresses to bat-host names\n"); - printf(" \t -T don't try to translate mac to originator address\n"); + fprintf(stderr, "Usage: batctl [options] traceroute [parameters] mac|bat-host|host_name|IPv4_address \n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -n don't convert addresses to bat-host names\n"); + fprintf(stderr, " \t -T don't try to translate mac to originator address\n"); } int traceroute(char *mesh_iface, int argc, char **argv) @@ -86,7 +86,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) } if (argc <= found_args) { - printf("Error - target mac address or bat-host name not specified\n"); + fprintf(stderr, "Error - target mac address or bat-host name not specified\n"); traceroute_usage(); return EXIT_FAILURE; } @@ -102,7 +102,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) dst_mac = resolve_mac(dst_string); if (!dst_mac) { - printf("Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); + fprintf(stderr, "Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); goto out; } } @@ -114,7 +114,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); goto out; } @@ -123,9 +123,9 @@ int traceroute(char *mesh_iface, int argc, char **argv) trace_fd = open(icmp_socket, O_RDWR); if (trace_fd < 0) { - printf("Error - can't open a connection to the batman adv kernel module via the socket '%s': %s\n", + fprintf(stderr, "Error - can't open a connection to the batman adv kernel module via the socket '%s': %s\n", icmp_socket, strerror(errno)); - printf("Check whether the module is loaded and active.\n"); + fprintf(stderr, "Check whether the module is loaded and active.\n"); goto out; } @@ -148,7 +148,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) time_delta[i] = 0.0; if (write(trace_fd, (char *)&icmp_packet_out, sizeof(icmp_packet_out)) < 0) { - printf("Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); + fprintf(stderr, "Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); continue; } @@ -169,7 +169,7 @@ read_packet: read_len = read(trace_fd, (char *)&icmp_packet_in, sizeof(icmp_packet_in)); if (read_len < 0) { - printf("Error - can't read from batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); + fprintf(stderr, "Error - can't read from batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); continue; } @@ -202,9 +202,9 @@ read_packet: printf("%s: Destination Host Unreachable\n", dst_string); goto out; case BATADV_PARAMETER_PROBLEM: - printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", + fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", icmp_packet_in.header.version, BATADV_COMPAT_VERSION); - printf("Please make sure to use compatible versions!\n"); + fprintf(stderr, "Please make sure to use compatible versions!\n"); goto out; default: printf("Unknown message type %d len %zd received\n", icmp_packet_in.msg_type, read_len); diff --git a/translate.c b/translate.c index 2d6ede9..bf33e90 100644 --- a/translate.c +++ b/translate.c @@ -31,7 +31,7 @@ static void translate_usage(void) { - printf("Usage: batctl [options] translate mac|bat-host|host_name|IPv4_address\n"); + fprintf(stderr, "Usage: batctl [options] translate mac|bat-host|host_name|IPv4_address\n"); } int translate(char *mesh_iface, int argc, char **argv) diff --git a/vis.c b/vis.c index b040497..f42d85a 100644 --- a/vis.c +++ b/vis.c @@ -58,9 +58,9 @@ static bool with_names = true; static void usage(void) { - printf("batctl vis_data dot {-h}{--no-TT|-T} {--no-2nd|-2} {--numbers|-n}\n"); - printf("or\n"); - printf("batctl vis_data json {-h}{--no-TT|-T} {--no-2nd|-2} {--numbers|-n}\n"); + fprintf(stderr, "batctl vis_data dot {-h}{--no-TT|-T} {--no-2nd|-2} {--numbers|-n}\n"); + fprintf(stderr, "or\n"); + fprintf(stderr, "batctl vis_data json {-h}{--no-TT|-T} {--no-2nd|-2} {--numbers|-n}\n"); } static void dot_print_tq(char *orig, char *from, const long tq) @@ -171,7 +171,7 @@ static FILE *open_vis(char *mesh_iface) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); return NULL; }

2 2

[B.A.T.M.A.N.] [PATCH] net: fix possible deadlocks in rtnl_trylock/unlock
by Simon Wunderlich 03 Dec '12

03 Dec '12

If rtnl_trylock() is used to prevent circular dependencies, rtnl_unlock() may destroy this attempt because it first unlocks rtnl_mutex but may lock it again later. The callgraph roughly looks like: rtnl_unlock() netdev_run_todo() __rtnl_unlock() netdev_wait_allrefs() rtnl_lock() ... __rtnl_unlock() There are two users which have possible deadlocks and are fixed in this patch: batman-adv and bridge. Their problematic access pattern is the same: notifier_call handler: * holds rtnl lock when called * calls sysfs code at some point (acquiring sysfs locks) sysfs code: * holds sysfs lock when called * calls rtnl_trylock() and rtnl_unlock(), rtnl_unlock() calls rtnl_lock implicitly Fix this by exporting __rtnl_unlock() to just unlock the mutex without implicitly locking again. Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- Of course, an alternative would be to not lock again after unlocking within rtnl_unlock(), or put the todo handling into the locked section. I'm not familiar enough with this code to know what would be best. There are others using rtnl_trylock(), but I'm not sure if they are affected. --- net/batman-adv/sysfs.c | 2 +- net/bridge/br_sysfs_br.c | 2 +- net/bridge/br_sysfs_if.c | 2 +- net/core/rtnetlink.c | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 66518c7..41b74aa 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -635,7 +635,7 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj, ret = batadv_hardif_enable_interface(hard_iface, buff); unlock: - rtnl_unlock(); + __rtnl_unlock(); out: batadv_hardif_free_ref(hard_iface); return ret; diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index c5c0593..c122782 100644 --- a/net/bridge/br_sysfs_br.c +++ b/net/bridge/br_sysfs_br.c @@ -142,7 +142,7 @@ static ssize_t store_stp_state(struct device *d, if (!rtnl_trylock()) return restart_syscall(); br_stp_set_enabled(br, val); - rtnl_unlock(); + __rtnl_unlock(); return len; } diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index 13b36bd..d99f394 100644 --- a/net/bridge/br_sysfs_if.c +++ b/net/bridge/br_sysfs_if.c @@ -223,7 +223,7 @@ static ssize_t brport_store(struct kobject * kobj, if (ret == 0) ret = count; } - rtnl_unlock(); + __rtnl_unlock(); } return ret; } diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index fad649a..d95ba6f 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -72,6 +72,7 @@ void __rtnl_unlock(void) { mutex_unlock(&rtnl_mutex); } +EXPORT_SYMBOL(__rtnl_unlock); void rtnl_unlock(void) { -- 1.7.10.4

4 8

[B.A.T.M.A.N.] [PATCH] batman-adv: don't compile the BLA switch if not requested
by Antonio Quartulli 01 Dec '12

01 Dec '12

When the Bridge Loop Avoidance component is not compiled-in, its boolean switch should be not compiled as well. This patch surrounds the switch with a proper ifdef. This behaviour was introduced by 9fd6b0615b5499b270d39a92b8790e206cf75833 ("batman-adv: add bridge loop avoidance compile option") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- soft-interface.c | 2 ++ types.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/soft-interface.c b/soft-interface.c index 8000639..aa34267 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -480,7 +480,9 @@ struct net_device *batadv_softif_create(const char *name) atomic_set(&bat_priv->aggregated_ogms, 1); atomic_set(&bat_priv->bonding, 0); +#ifdef CONFIG_BATMAN_ADV_BLA atomic_set(&bat_priv->bridge_loop_avoidance, 0); +#endif #ifdef CONFIG_BATMAN_ADV_DAT atomic_set(&bat_priv->distributed_arp_table, 1); #endif diff --git a/types.h b/types.h index ae9ac9a..030ce41 100644 --- a/types.h +++ b/types.h @@ -273,7 +273,9 @@ struct batadv_priv { atomic_t bonding; /* boolean */ atomic_t fragmentation; /* boolean */ atomic_t ap_isolation; /* boolean */ +#ifdef CONFIG_BATMAN_ADV_BLA atomic_t bridge_loop_avoidance; /* boolean */ +#endif #ifdef CONFIG_BATMAN_ADV_DAT atomic_t distributed_arp_table; /* boolean */ #endif -- 1.8.0

3 2

[B.A.T.M.A.N.] [PATCHv2] batman-adv: don't print the last_seen time for bat0 TT local entry
by Antonio Quartulli 01 Dec '12

01 Dec '12

bat0 MAC address will never deleted from the local translation table, therefore printing its last_Seen time is useless and will also produce ugly output and eventually a variable overflow. This was introduced by 59cb0861498776c62bd17584c31f34477fa301a0 ("batman-adv: improve local translation table output") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- translation-table.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/translation-table.c b/translation-table.c index 1335294..5f44232 100644 --- a/translation-table.c +++ b/translation-table.c @@ -478,6 +478,8 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) int last_seen_secs; int last_seen_msecs; unsigned long last_seen_jiffies; + bool no_purge; + uint16_t np_flag = BATADV_TT_CLIENT_NOPURGE; primary_if = batadv_seq_print_text_primary_if_get(seq); if (!primary_if) @@ -504,19 +506,21 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) last_seen_secs = last_seen_msecs / 1000; last_seen_msecs = last_seen_msecs % 1000; + no_purge = tt_common_entry->flags & np_flag; + seq_printf(seq, " * %pM [%c%c%c%c%c] %3u.%03u\n", tt_common_entry->addr, (tt_common_entry->flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'), - (tt_common_entry->flags & - BATADV_TT_CLIENT_NOPURGE ? 'P' : '.'), + no_purge ? 'P' : '.', (tt_common_entry->flags & BATADV_TT_CLIENT_NEW ? 'N' : '.'), (tt_common_entry->flags & BATADV_TT_CLIENT_PENDING ? 'X' : '.'), (tt_common_entry->flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), - last_seen_secs, last_seen_msecs); + no_purge ? last_seen_secs : 0, + no_purge ? last_seen_msecs : 0); } rcu_read_unlock(); } -- 1.8.0

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: remove useless NULL check
by Antonio Quartulli 01 Dec '12

01 Dec '12

debugfs_remove_recursive() checks whether its argument is not null on its own, therefore it is possible to remove the external check. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- debugfs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/debugfs.c b/debugfs.c index 6f58ddd..9df070c 100644 --- a/debugfs.c +++ b/debugfs.c @@ -397,10 +397,8 @@ err: void batadv_debugfs_destroy(void) { - if (batadv_debugfs) { - debugfs_remove_recursive(batadv_debugfs); - batadv_debugfs = NULL; - } + debugfs_remove_recursive(batadv_debugfs); + batadv_debugfs = NULL; } int batadv_debugfs_add_meshif(struct net_device *dev) -- 1.8.0

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: remove useless blank lines before and after brackets
by Antonio Quartulli 01 Dec '12

01 Dec '12

Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- bat_iv_ogm.c | 6 ------ bridge_loop_avoidance.c | 4 ---- debugfs.c | 1 - originator.c | 3 --- routing.c | 4 ---- send.c | 2 -- translation-table.c | 7 ------- unicast.c | 2 -- 8 files changed, 29 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 662743e..83dfcb4 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -183,7 +183,6 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet, /* adjust all flags and log packets */ while (batadv_iv_ogm_aggr_packet(buff_pos, forw_packet->packet_len, batadv_ogm_packet->tt_num_changes)) { - /* we might have aggregated direct link packets with an * ordinary base packet */ @@ -261,7 +260,6 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet) */ if ((directlink && (batadv_ogm_packet->header.ttl == 1)) || (forw_packet->own && (forw_packet->if_incoming != primary_if))) { - /* FIXME: what about aggregated packets ? */ batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "%s packet (originator %pM, seqno %u, TTL %d) on interface %s [%pM]\n", @@ -325,7 +323,6 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet, if (time_before(send_time, forw_packet->send_time) && time_after_eq(aggregation_end_time, forw_packet->send_time) && (aggregated_bytes <= BATADV_MAX_AGGREGATION_BYTES)) { - /* check aggregation compatibility * -> direct link packets are broadcasted on * their interface only @@ -815,7 +812,6 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, rcu_read_lock(); hlist_for_each_entry_rcu(tmp_neigh_node, node, &orig_neigh_node->neigh_list, list) { - if (!batadv_compare_eth(tmp_neigh_node->addr, orig_neigh_node->orig)) continue; @@ -949,7 +945,6 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, rcu_read_lock(); hlist_for_each_entry_rcu(tmp_neigh_node, node, &orig_node->neigh_list, list) { - is_duplicate |= batadv_test_bit(tmp_neigh_node->real_bits, orig_node->last_real_seqno, seqno); @@ -1223,7 +1218,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, /* is single hop (direct) neighbor */ if (is_single_hop_neigh) { - /* mark direct link on incoming interface */ batadv_iv_ogm_forward(orig_node, ethhdr, batadv_ogm_packet, is_single_hop_neigh, diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index ec12c79..724adf0 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -235,7 +235,6 @@ batadv_bla_del_backbone_claims(struct batadv_backbone_gw *backbone_gw) spin_lock_bh(list_lock); hlist_for_each_entry_safe(claim, node, node_tmp, head, hash_entry) { - if (claim->backbone_gw != backbone_gw) continue; @@ -338,7 +337,6 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, "bla_send_claim(): REQUEST of %pM to %pMon vid %d\n", ethhdr->h_source, ethhdr->h_dest, vid); break; - } if (vid != -1) @@ -539,7 +537,6 @@ static void batadv_bla_send_announce(struct batadv_priv *bat_priv, batadv_bla_send_claim(bat_priv, mac, backbone_gw->vid, BATADV_CLAIM_TYPE_ANNOUNCE); - } /** @@ -598,7 +595,6 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN); batadv_backbone_gw_free_ref(claim->backbone_gw); - } /* set (new) backbone gw */ atomic_inc(&backbone_gw->refcount); diff --git a/debugfs.c b/debugfs.c index 6f58ddd..0049837 100644 --- a/debugfs.c +++ b/debugfs.c @@ -164,7 +164,6 @@ static ssize_t batadv_log_read(struct file *file, char __user *buf, buf++; i++; - } spin_unlock_bh(&debug_log->lock); diff --git a/originator.c b/originator.c index 8c32cf1..812de81 100644 --- a/originator.c +++ b/originator.c @@ -178,7 +178,6 @@ void batadv_originator_free(struct batadv_priv *bat_priv) spin_lock_bh(list_lock); hlist_for_each_entry_safe(orig_node, node, node_tmp, head, hash_entry) { - hlist_del_rcu(node); batadv_orig_node_free_ref(orig_node); } @@ -285,7 +284,6 @@ batadv_purge_orig_neighbors(struct batadv_priv *bat_priv, /* for all neighbors towards this originator ... */ hlist_for_each_entry_safe(neigh_node, node, node_tmp, &orig_node->neigh_list, list) { - last_seen = neigh_node->last_seen; if_incoming = neigh_node->if_incoming; @@ -293,7 +291,6 @@ batadv_purge_orig_neighbors(struct batadv_priv *bat_priv, (if_incoming->if_status == BATADV_IF_INACTIVE) || (if_incoming->if_status == BATADV_IF_NOT_IN_USE) || (if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) { - if ((if_incoming->if_status == BATADV_IF_INACTIVE) || (if_incoming->if_status == BATADV_IF_NOT_IN_USE) || (if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) diff --git a/routing.c b/routing.c index 1aa1722..db89238 100644 --- a/routing.c +++ b/routing.c @@ -80,7 +80,6 @@ static void _batadv_update_route(struct batadv_priv *bat_priv, /* route added */ } else if ((!curr_router) && (neigh_node)) { - batadv_dbg(BATADV_DBG_ROUTES, bat_priv, "Adding route towards: %pM (via %pM)\n", orig_node->orig, neigh_node->addr); @@ -172,7 +171,6 @@ void batadv_bonding_candidate_add(struct batadv_orig_node *orig_node, */ hlist_for_each_entry_rcu(tmp_neigh_node, node, &orig_node->neigh_list, list) { - if (tmp_neigh_node == neigh_node) continue; @@ -836,7 +834,6 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, if (unicast_packet->header.packet_type == BATADV_UNICAST_FRAG && batadv_frag_can_reassemble(skb, neigh_node->if_incoming->net_dev->mtu)) { - ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb); if (ret == NET_RX_DROP) @@ -1103,7 +1100,6 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb, /* packet for me */ if (batadv_is_my_mac(unicast_packet->dest)) { - ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb); if (ret == NET_RX_DROP) diff --git a/send.c b/send.c index 4425af9..89810ce 100644 --- a/send.c +++ b/send.c @@ -330,7 +330,6 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, spin_lock_bh(&bat_priv->forw_bcast_list_lock); hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node, &bat_priv->forw_bcast_list, list) { - /* if purge_outstanding_packets() was called with an argument * we delete only packets belonging to the given interface */ @@ -357,7 +356,6 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, spin_lock_bh(&bat_priv->forw_bat_list_lock); hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node, &bat_priv->forw_bat_list, list) { - /* if purge_outstanding_packets() was called with an argument * we delete only packets belonging to the given interface */ diff --git a/translation-table.c b/translation-table.c index 1335294..0e9ae64 100644 --- a/translation-table.c +++ b/translation-table.c @@ -112,7 +112,6 @@ batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const void *data) struct batadv_tt_global_entry, common); return tt_global_entry; - } static void @@ -249,7 +248,6 @@ static void batadv_tt_global_free(struct batadv_priv *bat_priv, batadv_hash_remove(bat_priv->tt.global_hash, batadv_compare_tt, batadv_choose_orig, tt_global->common.addr); batadv_tt_global_entry_free_ref(tt_global); - } void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, @@ -641,7 +639,6 @@ static void batadv_tt_local_purge(struct batadv_priv *bat_priv) batadv_tt_local_purge_list(bat_priv, head); spin_unlock_bh(list_lock); } - } static void batadv_tt_local_table_free(struct batadv_priv *bat_priv) @@ -1065,7 +1062,6 @@ batadv_tt_global_del_orig_list(struct batadv_tt_global_entry *tt_global_entry) batadv_tt_orig_list_entry_free_ref(orig_entry); } spin_unlock_bh(&tt_global_entry->list_lock); - } static void @@ -1841,7 +1837,6 @@ out: if (!ret) kfree_skb(skb); return ret; - } static bool @@ -2368,7 +2363,6 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv) } spin_unlock_bh(list_lock); } - } static int batadv_tt_commit_changes(struct batadv_priv *bat_priv, @@ -2565,7 +2559,6 @@ bool batadv_tt_local_client_is_roaming(struct batadv_priv *bat_priv, batadv_tt_local_entry_free_ref(tt_local_entry); out: return ret; - } bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, diff --git a/unicast.c b/unicast.c index 10aff49..f56bccf 100644 --- a/unicast.c +++ b/unicast.c @@ -133,7 +133,6 @@ batadv_frag_search_packet(struct list_head *head, is_head = !!(up->flags & BATADV_UNI_FRAG_HEAD); list_for_each_entry(tfp, head, list) { - if (!tfp->skb) continue; @@ -162,7 +161,6 @@ void batadv_frag_list_free(struct list_head *head) struct batadv_frag_packet_list_entry *pf, *tmp_pf; if (!list_empty(head)) { - list_for_each_entry_safe(pf, tmp_pf, head, list) { kfree_skb(pf->skb); list_del(&pf->list); -- 1.8.0

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Initialize lockdep class keys for hashes
by Antonio Quartulli 01 Dec '12

01 Dec '12

Different hashes have the same class key key because they get initialised with the same one. For this reason lockdep can create false warning when they are used recursively. Re-initialise the key for each hash after the invocation to hash_new() to avoid this problem. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- originator.c | 6 ++++++ translation-table.c | 10 ++++++++++ vis.c | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/originator.c b/originator.c index 8c32cf1..109081c 100644 --- a/originator.c +++ b/originator.c @@ -29,6 +29,9 @@ #include "soft-interface.h" #include "bridge_loop_avoidance.h" +/* hash class keys */ +static struct lock_class_key batadv_orig_hash_lock_class_key; + static void batadv_purge_orig(struct work_struct *work); static void batadv_start_purge_timer(struct batadv_priv *bat_priv) @@ -57,6 +60,9 @@ int batadv_originator_init(struct batadv_priv *bat_priv) if (!bat_priv->orig_hash) goto err; + batadv_hash_set_lock_class(bat_priv->orig_hash, + &batadv_orig_hash_lock_class_key); + batadv_start_purge_timer(bat_priv); return 0; diff --git a/translation-table.c b/translation-table.c index 4657d9e..1bcb705 100644 --- a/translation-table.c +++ b/translation-table.c @@ -29,6 +29,10 @@ #include <linux/crc16.h> +/* hash class keys */ +static struct lock_class_key batadv_tt_local_hash_lock_class_key; +static struct lock_class_key batadv_tt_global_hash_lock_class_key; + static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client, struct batadv_orig_node *orig_node); static void batadv_tt_purge(struct work_struct *work); @@ -235,6 +239,9 @@ static int batadv_tt_local_init(struct batadv_priv *bat_priv) if (!bat_priv->tt.local_hash) return -ENOMEM; + batadv_hash_set_lock_class(bat_priv->tt.local_hash, + &batadv_tt_local_hash_lock_class_key); + return 0; } @@ -691,6 +698,9 @@ static int batadv_tt_global_init(struct batadv_priv *bat_priv) if (!bat_priv->tt.global_hash) return -ENOMEM; + batadv_hash_set_lock_class(bat_priv->tt.global_hash, + &batadv_tt_global_hash_lock_class_key); + return 0; } diff --git a/vis.c b/vis.c index 0f65a9d..60eb9b7 100644 --- a/vis.c +++ b/vis.c @@ -28,6 +28,9 @@ #define BATADV_MAX_VIS_PACKET_SIZE 1000 +/* hash class keys */ +static struct lock_class_key batadv_vis_hash_lock_class_key; + static void batadv_start_vis_timer(struct batadv_priv *bat_priv); /* free the info */ @@ -852,6 +855,9 @@ int batadv_vis_init(struct batadv_priv *bat_priv) goto err; } + batadv_hash_set_lock_class(bat_priv->vis.hash, + &batadv_vis_hash_lock_class_key); + bat_priv->vis.my_info = kmalloc(BATADV_MAX_VIS_PACKET_SIZE, GFP_ATOMIC); if (!bat_priv->vis.my_info) goto err; -- 1.8.0

3 4

[B.A.T.M.A.N.] [PATCH 0/6] CATWOMAN: Network coding in batman-adv
by Martin Hundebøll 01 Dec '12

01 Dec '12

I hereby bring you network coding in batman-adv. (Changed accoring to Antonios partlial review). This allows a relay to send two packets (to two destinations) in a single transmission. Tests[1] have shown an increase in throughput up to 1.6 under the right circumstances. For this to work, you will need to compile batman-adv with CONFIG_BATMAN_ADV_NC=y and a wireless interface with working promiscuous mode. The rest is taken care of by batman-adv and the following patches. [1] http://www.open-mesh.org/projects/open-mesh/wiki/2011-08-18-network-coding-… Martin Hundebøll (6): batman-adv: Add the initial code for network coding. batman-adv: Detect coding nodes and remove these after timeout batman-adv: Buffer unicast packets before forward. batman-adv: Code and transmit packets if possible. batman-adv: Save overheard and tx packets for decoding. batman-adv: Receive coded packets and decode them. Makefile | 2 + Makefile.kbuild | 1 + bat_iv_ogm.c | 5 + compat.c | 10 + compat.h | 1 + debugfs.c | 18 + gen-compat-autoconf.sh | 1 + main.c | 6 + main.h | 13 +- network-coding.c | 1817 ++++++++++++++++++++++++++++++++++++++++++++++++ network-coding.h | 123 ++++ originator.c | 6 + packet.h | 33 + routing.c | 26 +- send.c | 5 + soft-interface.c | 14 + sysfs-class-net-mesh | 8 + sysfs.c | 6 + types.h | 123 ++++ 19 files changed, 2209 insertions(+), 9 deletions(-) create mode 100644 network-coding.c create mode 100644 network-coding.h -- 1.8.0.1

3 12

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N December 2012