Repository : ssh://git@open-mesh.org/batctl

On branch : next

commit da65d627f798672428c6e5b3dae920469f82066c Author: Simon Wunderlich simon@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@open-mesh.com Signed-off-by: Marek Lindner mareklindner@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