commits March 2014

commits@lists.open-mesh.org

1 participants
69 discussions

[batctl] master: batctl: add switch for setting multicast_mode (6a0489b)
by postmaster＠open-mesh.org 13 Mar '14

13 Mar '14

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 6a0489b48854c18f983bcf13e9199c0d07988cba Author: Linus Lüssing <linus.luessing(a)web.de> Date: Tue Mar 11 21:04:32 2014 +0100 batctl: add switch for setting multicast_mode This patch adds a switch for the new multicast_mode setting in batman-adv. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 6a0489b48854c18f983bcf13e9199c0d07988cba README | 7 +++++++ debug.c | 33 ++++++++++++++++++++++++++++++++- functions.c | 22 ++++++++++++++++++++++ functions.h | 2 ++ man/batctl.8 | 6 ++++++ sys.c | 6 ++++++ sys.h | 1 + 7 files changed, 76 insertions(+), 1 deletion(-) diff --git a/README b/README index facc82e..b5fd259 100644 --- a/README +++ b/README @@ -417,6 +417,13 @@ Usage: batctl network_coding|nc [0|1] Note that network coding requires a working promiscuous mode on all interfaces. +batctl multicast_mode +===================== + +display or modify the multicast mode setting + +Usage: batctl multicast_mode|mm [0|1] + batctl aggregation ================== diff --git a/debug.c b/debug.c index 04b2c6d..e7f463d 100644 --- a/debug.c +++ b/debug.c @@ -94,6 +94,11 @@ static void debug_table_usage(int debug_table) fprintf(stderr, " \t -t timeout interval - don't print originators not seen for x.y seconds \n"); fprintf(stderr, " \t -i [interface] - show multiif originator table for a specific interface\n"); } + + if (debug_table == BATCTL_TABLE_TRANSLOCAL || + debug_table == BATCTL_TABLE_TRANSGLOBAL) { + fprintf(stderr, " \t -u|-m print unicast or multicast mac addresses only\n"); + } } int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) @@ -106,7 +111,7 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) float watch_interval = 1; opterr = 0; - while ((optchar = getopt(argc, argv, "hnw:t:Hi:")) != -1) { + while ((optchar = getopt(argc, argv, "hnw:t:Humi:")) != -1) { switch (optchar) { case 'h': debug_table_usage(debug_table); @@ -142,6 +147,26 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) case 'H': read_opt |= SKIP_HEADER; break; + case 'u': + if (debug_table != BATCTL_TABLE_TRANSLOCAL && + debug_table != BATCTL_TABLE_TRANSGLOBAL) { + fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); + debug_table_usage(debug_table); + return EXIT_FAILURE; + } + + read_opt |= UNICAST_ONLY; + break; + case 'm': + if (debug_table != BATCTL_TABLE_TRANSLOCAL && + debug_table != BATCTL_TABLE_TRANSGLOBAL) { + fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); + debug_table_usage(debug_table); + return EXIT_FAILURE; + } + + read_opt |= MULTICAST_ONLY; + break; case 'i': if (debug_table != BATCTL_TABLE_ORIGINATORS) { fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); @@ -173,6 +198,12 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) } } + if (read_opt & UNICAST_ONLY && read_opt & MULTICAST_ONLY) { + fprintf(stderr, "Error - '-u' and '-m' are exclusive options\n"); + debug_table_usage(debug_table); + return EXIT_FAILURE; + } + debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { fprintf(stderr, "Error - can't mount or find debugfs\n"); diff --git a/functions.c b/functions.c index 36804bd..117dcff 100644 --- a/functions.c +++ b/functions.c @@ -175,6 +175,14 @@ static void file_open_problem_dbg(const char *dir, const char *fname, } } +static int str_is_mcast_addr(char *addr) +{ + struct ether_addr *mac_addr = ether_aton(addr); + + return !mac_addr ? 0 : + mac_addr->ether_addr_octet[0] & 0x01; +} + int read_file(const char *dir, const char *fname, int read_opt, float orig_timeout, float watch_interval, size_t header_lines) { @@ -224,6 +232,20 @@ read: && (last_seen > orig_timeout)) continue; + /* translation table: skip multicast */ + if (line > header_lines && + read_opt & UNICAST_ONLY && + strlen(line_ptr) > strlen(" * xx:xx:xx:") && + str_is_mcast_addr(line_ptr+3)) + continue; + + /* translation table: skip unicast */ + if (line > header_lines && + read_opt & MULTICAST_ONLY && + strlen(line_ptr) > strlen(" * xx:xx:xx:") && + !str_is_mcast_addr(line_ptr+3)) + continue; + if (!(read_opt & USE_BAT_HOSTS)) { printf("%s", line_ptr); continue; diff --git a/functions.h b/functions.h index 14ba525..43c3d9c 100644 --- a/functions.h +++ b/functions.h @@ -57,6 +57,8 @@ enum { NO_OLD_ORIGS = 0x40, COMPAT_FILTER = 0x80, SKIP_HEADER = 0x100, + UNICAST_ONLY = 0x200, + MULTICAST_ONLY = 0x400, }; #endif diff --git a/man/batctl.8 b/man/batctl.8 index 8ef1123..110020e 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -88,6 +88,10 @@ disable fragmentation. If no parameter is given the current network coding mode setting is displayed. Otherwise the parameter is used to enable or disable network coding. .br +.IP "\fBmulticast_mode\fP|\fBmm\fP [\fB0\fP|\fB1\fP]" +If no parameter is given the current multicast mode setting is displayed. Otherwise the parameter is used to enable or +disable multicast optimizations (i.e. disabling means always sending own multicast frames via classic flooding). +.br .IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. @@ -196,6 +200,8 @@ for the specified amount of seconds (with optional decimal places). It furthermo interface for which the originator table should be printed. If this parameter is not supplied, the default originator table is printed. +The local and global translation tables also support the "\-u" and "\-m" option to only display unicast or multicast translation table announcements respectively. + List of debug tables: .RS 10 \- originators|o diff --git a/sys.c b/sys.c index 14c3cf5..676bef1 100644 --- a/sys.c +++ b/sys.c @@ -103,6 +103,12 @@ const struct settings_data batctl_settings[BATCTL_SETTINGS_NUM] = { .sysfs_name = "isolation_mark", .params = NULL, }, + { + .opt_long = "multicast_mode", + .opt_short = "mm", + .sysfs_name = "multicast_mode", + .params = sysfs_param_enable, + }, }; static void interface_usage(void) diff --git a/sys.h b/sys.h index 8296bd4..3859253 100644 --- a/sys.h +++ b/sys.h @@ -47,6 +47,7 @@ enum batctl_settings_list { BATCTL_SETTINGS_FRAGMENTATION, BATCTL_SETTINGS_NETWORK_CODING, BATCTL_SETTINGS_ISOLATION_MARK, + BATCTL_SETTINGS_MULTICAST_MODE, BATCTL_SETTINGS_NUM, };

1 0

[batctl] master: Merge remote-tracking branch 'origin/next' (52e8dd2)
by postmaster＠open-mesh.org 13 Mar '14

13 Mar '14

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 52e8dd2f1899fc293913ab12a642a13c61238113 Merge: a71b546 62f87ce Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Mar 13 11:54:25 2014 +0100 Merge remote-tracking branch 'origin/next' >--------------------------------------------------------------- 52e8dd2f1899fc293913ab12a642a13c61238113 README | 25 +++++++++++++++++++++++++ debug.c | 32 ++++++++++++++++++++++++++------ main.c | 30 ++++++++++++++++-------------- man/batctl.8 | 4 +++- sys.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sys.h | 2 ++ 6 files changed, 130 insertions(+), 21 deletions(-)

1 0

[batctl] master: batctl: improve the TT flags documentation (53ea1bf)
by postmaster＠open-mesh.org 13 Mar '14

13 Mar '14

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 53ea1bf4d139f2a22c92ca8b84cefa3988776787 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Sat Feb 22 16:48:14 2014 +0100 batctl: improve the TT flags documentation Convert the current documentation for the TT flags in proper kerneldoc and improve it by adding an explanation for each of the flags. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 53ea1bf4d139f2a22c92ca8b84cefa3988776787 packet.h | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/packet.h b/packet.h index c7f6eef..34e096d 100644 --- a/packet.h +++ b/packet.h @@ -119,10 +119,30 @@ enum batadv_tt_data_flags { BATADV_TT_FULL_TABLE = BIT(4), }; -/* BATADV_TT_CLIENT flags. - * Flags from BIT(0) to BIT(7) are sent on the wire, while flags from BIT(8) to - * BIT(15) are used for local computation only. - * Flags from BIT(4) to BIT(7) are kept in sync with the rest of the network. +/** + * enum batadv_tt_client_flags - TT client specific flags + * @BATADV_TT_CLIENT_DEL: the client has to be deleted from the table + * @BATADV_TT_CLIENT_ROAM: the client roamed to/from another node and the new + * update telling its new real location has not been received/sent yet + * @BATADV_TT_CLIENT_WIFI: this client is connected through a wifi interface. + * This information is used by the "AP Isolation" feature + * @BATADV_TT_CLIENT_ISOLA: this client is considered "isolated". This + * information is used by the Extended Isolation feature + * @BATADV_TT_CLIENT_NOPURGE: this client should never be removed from the table + * @BATADV_TT_CLIENT_NEW: this client has been added to the local table but has + * not been announced yet + * @BATADV_TT_CLIENT_PENDING: this client is marked for removal but it is kept + * in the table for one more originator interval for consistency purposes + * @BATADV_TT_CLIENT_TEMP: this global client has been detected to be part of + * the network but no nnode has already announced it + * + * Bits from 0 to 7 are called _remote flags_ because they are sent on the wire. + * Bits from 8 to 15 are called _local flags_ because they are used for local + * computations only. + * + * Bits from 4 to 7 - a subset of remote flags - are ensured to be in sync with + * the other nodes in the network. To achieve this goal these flags are included + * in the TT CRC computation. */ enum batadv_tt_client_flags { BATADV_TT_CLIENT_DEL = BIT(0),

1 0

[batctl] master: batctl: properly align constant assignments (b2d9ddb)
by postmaster＠open-mesh.org 13 Mar '14

13 Mar '14

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit b2d9ddb12688525428f08c6b06ddd02d3b9441d3 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sat Feb 22 16:20:06 2014 +0100 batctl: properly align constant assignments All the assignments in packet.h are properly aligned. Also the multicast constants have to have a similar shape. Introduced by 1c090349e2f65d19a7f356cc0b61f13644c53bb6 ("batman-adv: Add IPv4 link-local/IPv6-ll-all-nodes multicast support") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- b2d9ddb12688525428f08c6b06ddd02d3b9441d3 packet.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packet.h b/packet.h index feaa336..c7f6eef 100644 --- a/packet.h +++ b/packet.h @@ -97,9 +97,9 @@ enum batadv_icmp_packettype { * @BATADV_MCAST_WANT_ALL_IPV6: we want all IPv6 multicast packets */ enum batadv_mcast_flags { - BATADV_MCAST_WANT_ALL_UNSNOOPABLES = BIT(0), - BATADV_MCAST_WANT_ALL_IPV4 = BIT(1), - BATADV_MCAST_WANT_ALL_IPV6 = BIT(2), + BATADV_MCAST_WANT_ALL_UNSNOOPABLES = BIT(0), + BATADV_MCAST_WANT_ALL_IPV4 = BIT(1), + BATADV_MCAST_WANT_ALL_IPV6 = BIT(2), }; /* tt data subtypes */

1 0

[batctl] next: batctl: add option for multiif orig table (62f87ce)
by postmaster＠open-mesh.org 12 Mar '14

12 Mar '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 62f87ceab5c23161eed404775919b4a02077d5d7 Author: Simon Wunderlich <simon(a)open-mesh.com> Date: Wed Mar 12 17:04:48 2014 +0100 batctl: add option for multiif orig table This patch adds batctl support for the recently introduced mesh wide multi interface optimization in batman-adv. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 62f87ceab5c23161eed404775919b4a02077d5d7 README | 25 +++++++++++++++++++++++++ debug.c | 32 ++++++++++++++++++++++++++------ man/batctl.8 | 4 +++- sys.c | 28 ++++++++++++++++++++++++++++ sys.h | 1 + 5 files changed, 83 insertions(+), 7 deletions(-) diff --git a/README b/README index a4507b7..facc82e 100644 --- a/README +++ b/README @@ -305,6 +305,31 @@ fe:fe:00:00:06:01 0.830s (213) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00: fe:fe:00:00:02:01 0.240s (255) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 81) fe:fe:00:00:02:01 (255) fe:fe:00:00:07:01 0.670s (200) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 68) fe:fe:00:00:02:01 (200) +Since 2014.1.0, each batman interface has an individual originator table as well which is only used for routing. +These table explain to which neighbor a packet is forwarded when the packet is received on the specified interface. + +Example: + +$ batctl originators -i eth0 +[B.A.T.M.A.N. adv master-b82b9b2, IF/MAC: eth0/fe:f0:00:00:02:01 (bat0 BATMAN_IV)] + Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ... +fe:f1:00:00:03:01 0.170s (255) fe:f1:00:00:03:01 [ eth1]: fe:f1:00:00:03:01 (255) +fe:f1:00:00:01:01 0.510s (253) fe:f1:00:00:01:01 [ eth1]: fe:f1:00:00:01:01 (253) +fe:f0:00:00:05:01 0.660s (222) fe:f1:00:00:03:01 [ eth1]: fe:f0:00:00:03:01 (198) fe:f1:00:00:03:01 (222) +fe:f0:00:00:03:01 0.560s (252) fe:f1:00:00:03:01 [ eth1]: fe:f1:00:00:03:01 (252) fe:f0:00:00:03:01 (240) +fe:f0:00:00:04:01 0.250s (240) fe:f1:00:00:03:01 [ eth1]: fe:f1:00:00:03:01 (240) fe:f0:00:00:03:01 (211) +fe:f0:00:00:01:01 0.850s (255) fe:f1:00:00:01:01 [ eth1]: fe:f1:00:00:01:01 (255) fe:f0:00:00:01:01 (238) +$ batctl originators -i eth1 +[B.A.T.M.A.N. adv master-b82b9b2, IF/MAC: eth1/fe:f1:00:00:02:01 (bat0 BATMAN_IV)] + Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ... +fe:f1:00:00:03:01 0.880s (240) fe:f1:00:00:03:01 [ eth1]: fe:f1:00:00:03:01 (240) +fe:f1:00:00:01:01 0.250s (239) fe:f1:00:00:01:01 [ eth1]: fe:f1:00:00:01:01 (239) +fe:f0:00:00:05:01 0.340s (211) fe:f1:00:00:03:01 [ eth1]: fe:f0:00:00:03:01 (210) fe:f1:00:00:03:01 (211) +fe:f0:00:00:03:01 0.260s (253) fe:f0:00:00:03:01 [ eth0]: fe:f1:00:00:03:01 (240) fe:f0:00:00:03:01 (253) +fe:f0:00:00:04:01 0.010s (225) fe:f0:00:00:03:01 [ eth0]: fe:f1:00:00:03:01 (224) fe:f0:00:00:03:01 (225) +fe:f0:00:00:01:01 0.510s (255) fe:f0:00:00:01:01 [ eth0]: fe:f1:00:00:01:01 (240) fe:f0:00:00:01:01 (255) + + batctl interface ================ diff --git a/debug.c b/debug.c index d57324d..2d932f5 100644 --- a/debug.c +++ b/debug.c @@ -27,6 +27,7 @@ #include "debug.h" #include "debugfs.h" #include "functions.h" +#include "sys.h" const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { { @@ -89,8 +90,10 @@ static void debug_table_usage(int debug_table) 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) + if (debug_table == BATCTL_TABLE_ORIGINATORS) { fprintf(stderr, " \t -t timeout interval - don't print originators not seen for x.y seconds \n"); + fprintf(stderr, " \t -i [interface] - show multiif originator table for a specific interface\n"); + } } int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) @@ -98,11 +101,12 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) int optchar, read_opt = USE_BAT_HOSTS; char full_path[MAX_PATH+1]; char *debugfs_mnt; + char *orig_iface = NULL; float orig_timeout; float watch_interval = 1; opterr = 0; - while ((optchar = getopt(argc, argv, "hnw:t:H")) != -1) { + while ((optchar = getopt(argc, argv, "hnw:t:Hi:")) != -1) { switch (optchar) { case 'h': debug_table_usage(debug_table); @@ -138,11 +142,24 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) case 'H': read_opt |= SKIP_HEADER; break; + case 'i': + if (debug_table != BATCTL_TABLE_ORIGINATORS) { + fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); + debug_table_usage(debug_table); + return EXIT_FAILURE; + } + + if (check_mesh_iface_ownership(mesh_iface, optarg) != EXIT_SUCCESS) + return EXIT_FAILURE; + + orig_iface = optarg; + break; case '?': - if (optopt == 't') + if (optopt == 't') { fprintf(stderr, "Error - option '-t' needs a number as argument\n"); - - else if (optopt == 'w') { + } else if (optopt == 'i') { + fprintf(stderr, "Error - option '-i' needs an interface as argument\n"); + } else if (optopt == 'w') { read_opt |= CLR_CONT_READ; break; } @@ -162,7 +179,10 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) return EXIT_FAILURE; } - debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", mesh_iface, full_path, sizeof(full_path)); + if (orig_iface) + debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", orig_iface, full_path, sizeof(full_path)); + else + debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", mesh_iface, full_path, sizeof(full_path)); return read_file(full_path, (char *)batctl_debug_tables[debug_table].debugfs_name, read_opt, orig_timeout, watch_interval, batctl_debug_tables[debug_table].header_lines); diff --git a/man/batctl.8 b/man/batctl.8 index b808293..8ef1123 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -192,7 +192,9 @@ All of the debug tables support the following options: .RS 7 The originator table also supports the "\-t" filter option to remove all originators from the output that have not been seen -for the specified amount of seconds (with optional decimal places). +for the specified amount of seconds (with optional decimal places). It furthermore supports the "\-i" parameter to specify an +interface for which the originator table should be printed. If this parameter is not supplied, the default originator table +is printed. List of debug tables: .RS 10 diff --git a/sys.c b/sys.c index 0b98d82..14c3cf5 100644 --- a/sys.c +++ b/sys.c @@ -596,3 +596,31 @@ out: return ret; } + +int check_mesh_iface_ownership(char *mesh_iface, char *hard_iface) +{ + char path_buff[PATH_BUFF_LEN]; + int res; + + /* check if this device actually belongs to the mesh interface */ + snprintf(path_buff, sizeof(path_buff), SYS_MESH_IFACE_FMT, hard_iface); + path_buff[sizeof(path_buff) - 1] = '\0'; + res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); + if (res != EXIT_SUCCESS) { + fprintf(stderr, "Error - the directory '%s' could not be read: %s\n", + path_buff, strerror(errno)); + fprintf(stderr, "Is the batman-adv module loaded and sysfs mounted ?\n"); + return EXIT_FAILURE; + } + + if (line_ptr[strlen(line_ptr) - 1] == '\n') + line_ptr[strlen(line_ptr) - 1] = '\0'; + + if (strcmp(line_ptr, mesh_iface) != 0) { + fprintf(stderr, "Error - interface %s is part of batman network %s, not %s\n", + hard_iface, line_ptr, mesh_iface); + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; +} diff --git a/sys.h b/sys.h index 5aec020..8296bd4 100644 --- a/sys.h +++ b/sys.h @@ -72,5 +72,6 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv); int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv); int handle_gw_setting(char *mesh_iface, int argc, char **argv); int check_mesh_iface(char *mesh_iface); +int check_mesh_iface_ownership(char *mesh_iface, char *hard_iface); #endif

1 0

[batctl] next: batctl: check for batman interface (da65d62)
by postmaster＠open-mesh.org 12 Mar '14

12 Mar '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit da65d627f798672428c6e5b3dae920469f82066c Author: Simon Wunderlich <simon(a)open-mesh.com> Date: Wed Mar 12 17:04:47 2014 +0100 batctl: check for batman interface Check if the interface supplied by -m (or bat0 by default) is actually a batman interface. The check is performed by testing if the sysfs path is available. This change is required since debugfs now contains originator tables per hard interface. This might be confusing for users as batctl -m eth0 o will now (accidently) print these tables without eth0 beeing a batman interface, assuming eth0 is a hard interface used by batman-adv. Some reordering of commands were required to first allow commands which don't depend on a (correctly set up) mesh interface, like bisect or interface. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- da65d627f798672428c6e5b3dae920469f82066c main.c | 30 ++++++++++++++++-------------- sys.c | 30 ++++++++++++++++++++++++++++++ sys.h | 1 + 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/main.c b/main.c index a37c0b7..44cf49b 100644 --- a/main.c +++ b/main.c @@ -137,21 +137,29 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } - if ((strcmp(argv[1], "ping") == 0) || (strcmp(argv[1], "p") == 0)) { + if ((strcmp(argv[1], "interface") == 0) || (strcmp(argv[1], "if") == 0)) { - ret = ping(mesh_iface, argc - 1, argv + 1); - - } else if ((strcmp(argv[1], "traceroute") == 0) || (strcmp(argv[1], "tr") == 0)) { - - ret = traceroute(mesh_iface, argc - 1, argv + 1); + ret = interface(mesh_iface, argc - 1, argv + 1); } else if ((strcmp(argv[1], "tcpdump") == 0) || (strcmp(argv[1], "td") == 0)) { ret = tcpdump(argc - 1, argv + 1); - } else if ((strcmp(argv[1], "interface") == 0) || (strcmp(argv[1], "if") == 0)) { +#ifdef BATCTL_BISECT + } else if ((strcmp(argv[1], "bisect_iv") == 0)) { - ret = interface(mesh_iface, argc - 1, argv + 1); + ret = bisect_iv(argc - 1, argv + 1); +#endif + } else if (check_mesh_iface(mesh_iface) < 0) { + fprintf(stderr, "Error - interface %s is not present or not a batman-adv interface\n", mesh_iface); + exit(EXIT_FAILURE); + } else if ((strcmp(argv[1], "ping") == 0) || (strcmp(argv[1], "p") == 0)) { + + ret = ping(mesh_iface, argc - 1, argv + 1); + + } else if ((strcmp(argv[1], "traceroute") == 0) || (strcmp(argv[1], "tr") == 0)) { + + ret = traceroute(mesh_iface, argc - 1, argv + 1); } else if ((strcmp(argv[1], "loglevel") == 0) || (strcmp(argv[1], "ll") == 0)) { @@ -179,12 +187,6 @@ int main(int argc, char **argv) ret = translate(mesh_iface, argc - 1, argv + 1); -#ifdef BATCTL_BISECT - } else if ((strcmp(argv[1], "bisect_iv") == 0)) { - - ret = bisect_iv(argc - 1, argv + 1); -#endif - } else { for (i = 0; i < BATCTL_SETTINGS_NUM; i++) { diff --git a/sys.c b/sys.c index fd6e107..0b98d82 100644 --- a/sys.c +++ b/sys.c @@ -566,3 +566,33 @@ out: free(path_buff); return res; } + +int check_mesh_iface(char *mesh_iface) +{ + char *base_dev = NULL; + char path_buff[PATH_BUFF_LEN]; + int ret = -1, vid; + DIR *dir; + + /* use the parent interface if this is a VLAN */ + vid = vlan_get_link(mesh_iface, &base_dev); + if (vid >= 0) + snprintf(path_buff, PATH_BUFF_LEN, SYS_VLAN_PATH, base_dev, vid); + else + snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + path_buff[PATH_BUFF_LEN - 1] = '\0'; + + /* try to open the mesh sys directory */ + dir = opendir(path_buff); + if (!dir) + goto out; + + closedir(dir); + + ret = 0; +out: + if (base_dev) + free(base_dev); + + return ret; +} diff --git a/sys.h b/sys.h index 5633822..5aec020 100644 --- a/sys.h +++ b/sys.h @@ -71,5 +71,6 @@ int interface(char *mesh_iface, int argc, char **argv); int handle_loglevel(char *mesh_iface, int argc, char **argv); int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv); int handle_gw_setting(char *mesh_iface, int argc, char **argv); +int check_mesh_iface(char *mesh_iface); #endif

1 0

[batctl] master: batctl: add unicast/multicast address filter option for TT output (6202831)
by postmaster＠open-mesh.org 12 Mar '14

12 Mar '14

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 620283195f7d82febf0c21f6dccc82630eabf311 Author: Linus Lüssing <linus.luessing(a)web.de> Date: Tue Mar 11 21:04:33 2014 +0100 batctl: add unicast/multicast address filter option for TT output This patch adds the new "-u" and "-m" options for the local and global translation table output to only display announced unicast or multicast mac addresses to enhance readability. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 620283195f7d82febf0c21f6dccc82630eabf311 debug.c | 32 +++++++++++++++++++++++++++++++- functions.c | 22 ++++++++++++++++++++++ functions.h | 2 ++ man/batctl.8 | 2 ++ 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/debug.c b/debug.c index 6836857..acf452b 100644 --- a/debug.c +++ b/debug.c @@ -91,6 +91,10 @@ static void debug_table_usage(int debug_table) if (debug_table == BATCTL_TABLE_ORIGINATORS) fprintf(stderr, " \t -t timeout interval - don't print originators not seen for x.y seconds \n"); + if (debug_table == BATCTL_TABLE_TRANSLOCAL || + debug_table == BATCTL_TABLE_TRANSGLOBAL) { + fprintf(stderr, " \t -u|-m print unicast or multicast mac addresses only\n"); + } } int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) @@ -102,7 +106,7 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) float watch_interval = 1; opterr = 0; - while ((optchar = getopt(argc, argv, "hnw:t:H")) != -1) { + while ((optchar = getopt(argc, argv, "hnw:t:Hum")) != -1) { switch (optchar) { case 'h': debug_table_usage(debug_table); @@ -138,6 +142,26 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) case 'H': read_opt |= SKIP_HEADER; break; + case 'u': + if (debug_table != BATCTL_TABLE_TRANSLOCAL && + debug_table != BATCTL_TABLE_TRANSGLOBAL) { + fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); + debug_table_usage(debug_table); + return EXIT_FAILURE; + } + + read_opt |= UNICAST_ONLY; + break; + case 'm': + if (debug_table != BATCTL_TABLE_TRANSLOCAL && + debug_table != BATCTL_TABLE_TRANSGLOBAL) { + fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); + debug_table_usage(debug_table); + return EXIT_FAILURE; + } + + read_opt |= MULTICAST_ONLY; + break; case '?': if (optopt == 't') fprintf(stderr, "Error - option '-t' needs a number as argument\n"); @@ -156,6 +180,12 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) } } + if (read_opt & UNICAST_ONLY && read_opt & MULTICAST_ONLY) { + fprintf(stderr, "Error - '-u' and '-m' are exclusive options\n"); + debug_table_usage(debug_table); + return EXIT_FAILURE; + } + debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { fprintf(stderr, "Error - can't mount or find debugfs\n"); diff --git a/functions.c b/functions.c index 36804bd..117dcff 100644 --- a/functions.c +++ b/functions.c @@ -175,6 +175,14 @@ static void file_open_problem_dbg(const char *dir, const char *fname, } } +static int str_is_mcast_addr(char *addr) +{ + struct ether_addr *mac_addr = ether_aton(addr); + + return !mac_addr ? 0 : + mac_addr->ether_addr_octet[0] & 0x01; +} + int read_file(const char *dir, const char *fname, int read_opt, float orig_timeout, float watch_interval, size_t header_lines) { @@ -224,6 +232,20 @@ read: && (last_seen > orig_timeout)) continue; + /* translation table: skip multicast */ + if (line > header_lines && + read_opt & UNICAST_ONLY && + strlen(line_ptr) > strlen(" * xx:xx:xx:") && + str_is_mcast_addr(line_ptr+3)) + continue; + + /* translation table: skip unicast */ + if (line > header_lines && + read_opt & MULTICAST_ONLY && + strlen(line_ptr) > strlen(" * xx:xx:xx:") && + !str_is_mcast_addr(line_ptr+3)) + continue; + if (!(read_opt & USE_BAT_HOSTS)) { printf("%s", line_ptr); continue; diff --git a/functions.h b/functions.h index 14ba525..43c3d9c 100644 --- a/functions.h +++ b/functions.h @@ -57,6 +57,8 @@ enum { NO_OLD_ORIGS = 0x40, COMPAT_FILTER = 0x80, SKIP_HEADER = 0x100, + UNICAST_ONLY = 0x200, + MULTICAST_ONLY = 0x400, }; #endif diff --git a/man/batctl.8 b/man/batctl.8 index f92bf3a..79d7887 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -198,6 +198,8 @@ All of the debug tables support the following options: The originator table also supports the "\-t" filter option to remove all originators from the output that have not been seen for the specified amount of seconds (with optional decimal places). +The local and global translation tables also support the "\-u" and "\-m" option to only display unicast or multicast translation table announcements respectively. + List of debug tables: .RS 10 \- originators|o

1 0

[batctl] master: batctl: add switch for setting multicast_mode (42ffd4c)
by postmaster＠open-mesh.org 12 Mar '14

12 Mar '14

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 42ffd4c7a847c3e45a0ba5a1641a12052a47330b Author: Linus Lüssing <linus.luessing(a)web.de> Date: Tue Mar 11 21:04:32 2014 +0100 batctl: add switch for setting multicast_mode This patch adds a switch for the new multicast_mode setting in batman-adv. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 42ffd4c7a847c3e45a0ba5a1641a12052a47330b README | 7 +++++++ man/batctl.8 | 4 ++++ sys.c | 6 ++++++ sys.h | 1 + 4 files changed, 18 insertions(+) diff --git a/README b/README index a4507b7..fe8eed9 100644 --- a/README +++ b/README @@ -392,6 +392,13 @@ Usage: batctl network_coding|nc [0|1] Note that network coding requires a working promiscuous mode on all interfaces. +batctl multicast_mode +===================== + +display or modify the multicast mode setting + +Usage: batctl multicast_mode|mm [0|1] + batctl aggregation ================== diff --git a/man/batctl.8 b/man/batctl.8 index b808293..f92bf3a 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -88,6 +88,10 @@ disable fragmentation. If no parameter is given the current network coding mode setting is displayed. Otherwise the parameter is used to enable or disable network coding. .br +.IP "\fBmulticast_mode\fP|\fBmm\fP [\fB0\fP|\fB1\fP]" +If no parameter is given the current multicast mode setting is displayed. Otherwise the parameter is used to enable or +disable multicast optimizations (i.e. disabling means always sending own multicast frames via classic flooding). +.br .IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. diff --git a/sys.c b/sys.c index fd6e107..d20696b 100644 --- a/sys.c +++ b/sys.c @@ -103,6 +103,12 @@ const struct settings_data batctl_settings[BATCTL_SETTINGS_NUM] = { .sysfs_name = "isolation_mark", .params = NULL, }, + { + .opt_long = "multicast_mode", + .opt_short = "mm", + .sysfs_name = "multicast_mode", + .params = sysfs_param_enable, + }, }; static void interface_usage(void) diff --git a/sys.h b/sys.h index 5633822..dd0bee5 100644 --- a/sys.h +++ b/sys.h @@ -47,6 +47,7 @@ enum batctl_settings_list { BATCTL_SETTINGS_FRAGMENTATION, BATCTL_SETTINGS_NETWORK_CODING, BATCTL_SETTINGS_ISOLATION_MARK, + BATCTL_SETTINGS_MULTICAST_MODE, BATCTL_SETTINGS_NUM, };

1 0

[batctl] master: batctl: fix wrong header lines number for local translation table (795b0ba)
by postmaster＠open-mesh.org 11 Mar '14

11 Mar '14

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 795b0ba8b505b0ef92f6b0105efdb436b86574f3 Author: Linus Lüssing <linus.luessing(a)web.de> Date: Sun Mar 2 23:18:00 2014 +0100 batctl: fix wrong header lines number for local translation table A commit in batman-adv has added a second header line to the local translation table output. Introduced by 59cb0861498776c62bd17584c31f34477fa301a0 ("batman-adv: improve local translation table output") Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Acked-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 795b0ba8b505b0ef92f6b0105efdb436b86574f3 debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debug.c b/debug.c index d57324d..6836857 100644 --- a/debug.c +++ b/debug.c @@ -45,7 +45,7 @@ const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { .opt_long = "translocal", .opt_short = "tl", .debugfs_name = "transtable_local", - .header_lines = 1, + .header_lines = 2, }, { .opt_long = "transglobal",

1 0

[batman-adv] master: batman-adv: improve DAT documentation (62ea441)
by postmaster＠open-mesh.org 11 Mar '14

11 Mar '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 62ea441ee6ecdaa6187fab1458cbcc7e32429d2c Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Sat Feb 22 17:02:38 2014 +0100 batman-adv: improve DAT documentation Add missing documentation for BATADV_DAT_ADDR_MAX and convert an existing documentation to kerneldoc Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 62ea441ee6ecdaa6187fab1458cbcc7e32429d2c distributed-arp-table.h | 3 +++ types.h | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/distributed-arp-table.h b/distributed-arp-table.h index ac9be9b..d76e1d0 100644 --- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -25,6 +25,9 @@ #include <linux/if_arp.h> +/** + * BATADV_DAT_ADDR_MAX - maximum address value in the DHT space + */ #define BATADV_DAT_ADDR_MAX ((batadv_dat_addr_t)~(batadv_dat_addr_t)0) void batadv_dat_status_update(struct net_device *net_dev); diff --git a/types.h b/types.h index d4b923c..34891a5 100644 --- a/types.h +++ b/types.h @@ -24,8 +24,9 @@ #ifdef CONFIG_BATMAN_ADV_DAT -/* batadv_dat_addr_t is the type used for all DHT addresses. If it is changed, - * BATADV_DAT_ADDR_MAX is changed as well. +/** + * batadv_dat_addr_t - it is the type used for all DHT addresses. If it is + * changed, BATADV_DAT_ADDR_MAX is changed as well. * * *Please be careful: batadv_dat_addr_t must be UNSIGNED* */

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2014