B.A.T.M.A.N September 2013

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

24 participants
54 discussions

[B.A.T.M.A.N.] Hamburg freifunk geekend02
by Andre Schmidt 11 Sep '13

11 Sep '13

Hi there, Sep. 27.-29., 2013, we'll meet up for geekend02 [0] at Bürgerhaus Hamburg-Eidelstedt, Germany. This is going to be a great opportunity to meet AFK. Naturally, you can bring your own keyboard, so it's all good, don't worry. Since Hamburg is probably one of the larger B.A.T.M.A.N. networks on this planet w/ 300+ routers constantly online and still growing rapidly, we do fear that we'll run into scaling problems sooner or later. Therefore, your expertise on how to counteract is very welcome. We'd love to meet you. If you need a place to stay, shoot a mail [1]. Help us ordering sufficient amounts of Mate by signing up for participation [2]. Later, andre [0] http://wiki.freifunk.net/Freifunk_Hamburg/Geekend02 [1] freifunk(a)hamburg.ccc.de [2] http://wiki.freifunk.net/Freifunk_Hamburg/Geekend02/Teilnehmende

3 2

[B.A.T.M.A.N.] [PATCH] alfred: free globals. Fixes memory leak
by Nils Schneider 09 Sep '13

09 Sep '13

--- main.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/main.c b/main.c index 86acfb7..58622f8 100644 --- a/main.c +++ b/main.c @@ -142,6 +142,7 @@ static struct globals *alfred_init(int argc, char *argv[]) int main(int argc, char *argv[]) { struct globals *globals; + int ret; globals = alfred_init(argc, argv); @@ -150,15 +151,21 @@ int main(int argc, char *argv[]) switch (globals->clientmode) { case CLIENT_NONE: - return alfred_server(globals); + ret = alfred_server(globals); break; case CLIENT_REQUEST_DATA: - return alfred_client_request_data(globals); + ret = alfred_client_request_data(globals); break; case CLIENT_SET_DATA: - return alfred_client_set_data(globals); + ret = alfred_client_set_data(globals); break; + default: + ret = 0; } - return 0; + free(globals->interface); + free(globals->mesh_iface); + free(globals); + + return ret; } -- 1.8.4

3 2

[B.A.T.M.A.N.] [PATCH 1/7] alfred: Add missing includes and remove unused includes
by Sven Eckelmann 09 Sep '13

09 Sep '13

Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> --- alfred.h | 6 ++---- batadv_query.c | 13 +++++++++---- client.c | 12 +++++------- debugfs.c | 10 ++++------ debugfs.h | 3 --- hash.c | 5 +++-- main.c | 11 ++++------- netsock.c | 14 ++++++++------ recv.c | 21 ++++++++++++--------- send.c | 17 ++++++----------- server.c | 10 ++++++---- unix_sock.c | 14 +++++++++----- util.c | 6 ++++-- vis/vis.c | 15 +++++++++++++++ vis/vis.h | 20 +++----------------- 15 files changed, 90 insertions(+), 87 deletions(-) diff --git a/alfred.h b/alfred.h index c82483c..a244c64 100644 --- a/alfred.h +++ b/alfred.h @@ -23,12 +23,10 @@ #define SOURCE_VERSION "2013.4.0" #endif -#include <stdint.h> -#include <linux/if_ether.h> -#include <netinet/ether.h> +#include <net/ethernet.h> #include <netinet/in.h> +#include <stdint.h> #include <time.h> -#include "hash.h" #include "list.h" #include "packet.h" diff --git a/batadv_query.c b/batadv_query.c index db1aed5..83083a1 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -20,11 +20,16 @@ */ #include "batadv_query.h" -#include "debugfs.h" -#include <stdio.h> -#include <netinet/ether.h> -#include <stdlib.h> #include <errno.h> +#include <net/ethernet.h> +#include <netinet/ether.h> +#include <netinet/in.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include "debugfs.h" #define DEBUG_BATIF_PATH_FMT "%s/batman_adv/%s" #define DEBUG_TRANSTABLE_GLOBAL "transtable_global" diff --git a/client.c b/client.c index a535f5a..3c1916c 100644 --- a/client.c +++ b/client.c @@ -19,17 +19,15 @@ * */ +#include <ctype.h> +#include <errno.h> +#include <netinet/in.h> +#include <stdint.h> #include <stdio.h> -#include <stdlib.h> -#include <getopt.h> #include <string.h> #include <unistd.h> -#include <errno.h> -#include <arpa/inet.h> -#include <sys/select.h> -#include <sys/time.h> -#include <ctype.h> #include "alfred.h" +#include "packet.h" int alfred_client_request_data(struct globals *globals) { diff --git a/debugfs.c b/debugfs.c index 5a0431f..e62978b 100644 --- a/debugfs.c +++ b/debugfs.c @@ -19,14 +19,12 @@ */ #include "debugfs.h" -#include <stdio.h> -#include <stdlib.h> #include <errno.h> -#include <sys/vfs.h> -#include <sys/types.h> +#include <stdio.h> +#include <string.h> +#include <sys/mount.h> #include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> +#include <sys/statfs.h> #ifndef DEBUGFS_MAGIC #define DEBUGFS_MAGIC 0x64626720 diff --git a/debugfs.h b/debugfs.h index 4008c37..6307a9b 100644 --- a/debugfs.h +++ b/debugfs.h @@ -21,9 +21,6 @@ #ifndef __DEBUGFS_H__ #define __DEBUGFS_H__ -#include <sys/mount.h> -#include <string.h> - #ifndef MAX_PATH # define MAX_PATH 256 #endif diff --git a/hash.c b/hash.c index 8d487eb..940a11f 100644 --- a/hash.c +++ b/hash.c @@ -20,8 +20,9 @@ */ -#include <stdio.h> /* NULL */ -#include <stdlib.h> /* free() */ +#include "hash.h" +#include <stdlib.h> +#include <stdio.h> #include "alfred.h" /* clears the hash */ diff --git a/main.c b/main.c index 86acfb7..4f39948 100644 --- a/main.c +++ b/main.c @@ -19,17 +19,14 @@ * */ +#include <getopt.h> +#include <signal.h> #include <stdio.h> #include <stdlib.h> -#include <getopt.h> #include <string.h> -#include <unistd.h> -#include <errno.h> -#include <arpa/inet.h> -#include <sys/select.h> -#include <sys/time.h> -#include <signal.h> #include "alfred.h" +#include "packet.h" + static void alfred_usage(void) { diff --git a/netsock.c b/netsock.c index 381d9b0..39281af 100644 --- a/netsock.c +++ b/netsock.c @@ -19,17 +19,19 @@ * */ +#include <sys/socket.h> +#include <errno.h> +#include <fcntl.h> +#include <net/if.h> +#include <netinet/in.h> #include <stdio.h> #include <string.h> -#include <unistd.h> -#include <fcntl.h> -#include <errno.h> -#include <stdlib.h> -#include <netinet/in.h> #include <sys/ioctl.h> -#include <linux/if.h> +#include <sys/socket.h> +#include <unistd.h> #include "alfred.h" #include "batadv_query.h" +#include "packet.h" const struct in6_addr in6addr_localmcast = {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/recv.c b/recv.c index 7541632..5ed4a62 100644 --- a/recv.c +++ b/recv.c @@ -19,19 +19,22 @@ * */ -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <fcntl.h> #include <errno.h> -#include <stdlib.h> +#include <net/ethernet.h> #include <netinet/in.h> -#include <sys/ioctl.h> -#include <linux/if.h> -#include <linux/if_packet.h> -#include <arpa/inet.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/socket.h> +#include <sys/time.h> +#include <time.h> +#include <unistd.h> #include "alfred.h" #include "batadv_query.h" +#include "hash.h" +#include "list.h" +#include "packet.h" static int finish_alfred_push_data(struct globals *globals, struct ether_addr mac, diff --git a/send.c b/send.c index d6920f8..607afa1 100644 --- a/send.c +++ b/send.c @@ -19,19 +19,14 @@ * */ -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <fcntl.h> -#include <errno.h> -#include <stdlib.h> #include <netinet/in.h> -#include <sys/ioctl.h> -#include <linux/if.h> -#include <linux/if_packet.h> -#include <linux/if_ether.h> -#include <linux/filter.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> +#include <sys/socket.h> #include "alfred.h" +#include "hash.h" +#include "packet.h" int announce_master(struct globals *globals) { diff --git a/server.c b/server.c index 02eab42..0d8e6c8 100644 --- a/server.c +++ b/server.c @@ -19,17 +19,19 @@ * */ +#include <errno.h> +#include <net/ethernet.h> +#include <stddef.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> -#include <getopt.h> #include <string.h> -#include <unistd.h> -#include <errno.h> -#include <arpa/inet.h> #include <sys/select.h> #include <sys/time.h> +#include <time.h> #include "alfred.h" #include "batadv_query.h" +#include "hash.h" static int server_compare(void *d1, void *d2) { diff --git a/unix_sock.c b/unix_sock.c index c778a61..8bff2e1 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -19,17 +19,21 @@ * */ +#include <errno.h> +#include <net/ethernet.h> +#include <netinet/in.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <errno.h> -#include <unistd.h> -#include <arpa/inet.h> -#include <sys/time.h> -#include <sys/types.h> #include <sys/socket.h> +#include <sys/time.h> #include <sys/un.h> +#include <time.h> +#include <unistd.h> #include "alfred.h" +#include "hash.h" +#include "packet.h" int unix_sock_open_daemon(struct globals *globals, char *path) { diff --git a/util.c b/util.c index 5405c84..3c50964 100644 --- a/util.c +++ b/util.c @@ -19,10 +19,12 @@ * */ -#include <sys/time.h> -#include <time.h> +#include <stddef.h> #include <stdint.h> #include <stdlib.h> +#include <sys/time.h> +#include <time.h> +#include "alfred.h" int time_diff(struct timespec *tv1, struct timespec *tv2, struct timespec *tvdiff) { diff --git a/vis/vis.c b/vis/vis.c index 3d0c5f0..5247b31 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -20,6 +20,21 @@ */ #include "vis.h" +#include <dirent.h> +#include <errno.h> +#include <getopt.h> +#include <linux/if.h> +#include <netinet/in.h> +#include <signal.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/ioctl.h> +#include <sys/socket.h> +#include <sys/un.h> +#include <unistd.h> +#include "debugfs.h" char *read_file(char *fname) { diff --git a/vis/vis.h b/vis/vis.h index 3423066..d4a49d0 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -19,25 +19,11 @@ * */ -#include <stdio.h> -#include <stdint.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <errno.h> -#include <getopt.h> -#include <signal.h> -#include <dirent.h> -#include <sys/ioctl.h> -#include <sys/types.h> #include <sys/socket.h> -#include <sys/un.h> -#include <linux/if.h> -#include <netinet/ether.h> -#include <netinet/in.h> -#include "../packet.h" +#include <linux/if_ether.h> +#include <stdint.h> #include "../list.h" -#include "debugfs.h" +#include "../packet.h" #ifndef SOURCE_VERSION -- 1.8.4.rc3

2 13

[B.A.T.M.A.N.] [PATCH] alfred: output valid JSON
by Nils Schneider 08 Sep '13

08 Sep '13

With this patch alfred -r will output JSON like this: { "00:11:22:33:44:55" : "...", "22:33:44:55:66:FF" : "..." } --- client.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/client.c b/client.c index a535f5a..ec882d9 100644 --- a/client.c +++ b/client.c @@ -39,7 +39,7 @@ int alfred_client_request_data(struct globals *globals) struct alfred_status_v0 *status; struct alfred_tlv *tlv; struct alfred_data *data; - int ret, len, data_len, i; + int ret, len, data_len, i, count; if (unix_sock_open_client(globals, ALFRED_SOCK_PATH)) return -1; @@ -59,6 +59,9 @@ int alfred_client_request_data(struct globals *globals) fprintf(stderr, "%s: only wrote %d of %d bytes: %s\n", __func__, ret, len, strerror(errno)); + printf("{"); + + count = 0; push = (struct alfred_push_data_v0 *)buf; tlv = (struct alfred_tlv *)buf; while ((ret = read(globals->unix_sock, buf, sizeof(*tlv))) > 0) { @@ -98,9 +101,12 @@ int alfred_client_request_data(struct globals *globals) if (ret < data_len) break; + if (count > 0) + printf(",\n"); + pos = data->data; - printf("{ \"%02x:%02x:%02x:%02x:%02x:%02x\", \"", + printf("\n \"%02x:%02x:%02x:%02x:%02x:%02x\": \"", data->source[0], data->source[1], data->source[2], data->source[3], data->source[4], data->source[5]); @@ -110,14 +116,18 @@ int alfred_client_request_data(struct globals *globals) else if (pos[i] == '\\') printf("\\\\"); else if (!isprint(pos[i])) - printf("\\x%02x", pos[i]); + printf("\\u00%02x", pos[i]); else printf("%c", pos[i]); } - printf("\" },\n"); + printf("\""); + + count++; } + printf("\n}\n"); + unix_sock_close(globals); return 0; -- 1.8.4

5 6

[B.A.T.M.A.N.] [PATCH openwrt-feed only] batman-adv: fix metadata stripping
by Antonio Quartulli 06 Sep '13

06 Sep '13

a new optimisation in openwrt is stripping some metadata information, invluding the module version which is used by batctl to tell the user which version batman-adv the node is currently running. Un-define this constant to prevent the metadata from being stripped Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- main.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.h b/main.h index 834b1a0..b329e79 100644 --- a/main.h +++ b/main.h @@ -20,6 +20,8 @@ #ifndef _NET_BATMAN_ADV_MAIN_H_ #define _NET_BATMAN_ADV_MAIN_H_ +#undef CONFIG_MODULE_STRIPPED + #define BATADV_DRIVER_AUTHOR "Marek Lindner <lindner_marek(a)yahoo.de>, " \ "Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>" #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCHv6] batctl: add sys framework for VLAN support
by Marco Dalla Torre 05 Sep '13

05 Sep '13

Allow the batctl tool to take advantage of changes from commit e4ff5c153dab054a6cd1c4132f87bc5e77127456 "add sys framework for VLAN" recently added to batman-adv, so that users can execute commands in a per VLAN fashion. If no directory entry corresponding to the user-selected device is found at the standard location for non VLAN interfaces (/sys/class/net/${device}/mesh/), 'batctl' now looks into directory: /sys/devices/virtual/net/${base_device}/mesh/vlan${vid} Information on VLAN devices (base device, vid) necessary to construct the directory path is acquired by parsing /proc/net/vlan/${device}. Where: -${base_device}: the batman device on top of which the VLAN is sitting -${device}: the device interface for the VLAN, -${vid}: the identifier assigned to the VLAN. If the user-selected command is not supported by the VLAN, an appropriate error is shown. Signed-off-by: Marco Dalla Torre <marco.dallato(a)gmail.com> --- Notable changes in V6 -fixed error in string length computation -moved some more variable declarations at the beginning of functions Notable changes in V5 -fixed use of sizeof instead of strlen to compute length of string -use of getline instead of fgets -avoid using fixed-size buffer in 'get_basedev_vid' -moved constant string declarations, local to functions 'get_basedev_vid' and 'handle_sys_setting', from sys.c to sys.h. Now uses #define like other path declarations. -fixed scanf error condition check -fixed malloc error condition check -moved variable declarations at the beginning of functions functions.c | 3 ++ main.c | 2 +- man/batctl.8 | 4 +-- sys.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- sys.h | 3 ++ 5 files changed, 95 insertions(+), 6 deletions(-) diff --git a/functions.c b/functions.c index cc05a48..ed010ea 100644 --- a/functions.c +++ b/functions.c @@ -135,6 +135,9 @@ static void file_open_problem_dbg(char *dir, char *fname, char *full_path) 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; + } else if (strstr(dir, "/sys/devices/virtual/")) { + fprintf(stderr, "The selected feature '%s' is not supported for vlans\n", fname); + return; } } diff --git a/main.c b/main.c index 24d42fb..bac37ca 100644 --- a/main.c +++ b/main.c @@ -49,7 +49,7 @@ void print_usage(void) 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-m mesh interface or mesh-based VLAN 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"); diff --git a/man/batctl.8 b/man/batctl.8 index d04385b..b45cccf 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -42,7 +42,7 @@ behaviour or using the B.A.T.M.A.N. advanced protocol. .SH OPTIONS .TP .I \fBoptions: -\-m specify mesh interface (default 'bat0') +\-m specify mesh interface or a mesh-based VLAN interface (default 'bat0') .br \-h print general batctl help .br @@ -61,7 +61,7 @@ originator interval. The interval is in units of milliseconds. .br .IP "\fBap_isolation\fP|\fBap\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current ap isolation setting is displayed. Otherwise the parameter is used to enable or -disable ap isolation. +disable ap isolation. This command can be used in conjunction with "-m" option to target per VLAN configurations. .br .IP "\fBbridge_loop_avoidance\fP|\fBbl\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current bridge loop avoidance setting is displayed. Otherwise the parameter is used to enable diff --git a/sys.c b/sys.c index b1d7ea8..6f23fb2 100644 --- a/sys.c +++ b/sys.c @@ -371,11 +371,64 @@ static void settings_usage(int setting) fprintf(stderr, " \t -h print this help\n"); } +/** + * get_basedev_vid - given a valid VLAN interface, identifies the batman device + * on top of which the VLAN is sitting and its VLAN ID + * @mesh_iface: name of the VLAN network interface + * @base_dev: output argument, pointer to the base device name + * @vid: output argument, pointer to the VLAN ID number + * + * Returns 0 if execution is successful, -1 if an error occurred + */ +static int get_basedev_vid(const char *mesh_iface, char **base_dev, unsigned short *vid) +{ + char *vdev; + char *line_ptr; + size_t len; + FILE *fp; + char *fpath; + + int size = strlen(PROC_VLAN_PATH) + strlen(mesh_iface) + 1; + fpath = malloc(size); + if (!fpath) { + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); + return EXIT_FAILURE; + } + /* prepare path file path: /proc/net/vlan/$mesh_iface*/ + snprintf(fpath, size, "%s%s", PROC_VLAN_PATH, mesh_iface); + + fp = fopen(fpath, "r"); + if (!fp) { + fprintf(stderr, "Error - could not open file '%s': %s\n", + fpath, strerror(errno)); + return EXIT_FAILURE; + } + + if (fscanf(fp, "%ms %*s %hu %*s %*d %*s %*d", &vdev, vid) != 2) + return EXIT_FAILURE; + + *base_dev = NULL; + while (getline(&line_ptr, &len, fp) != -1) { + if (sscanf(line_ptr, "Device: %ms", base_dev) == 1) + break; + } + fclose(fp); + free(line_ptr); + /* handle base device not found case */ + if (*base_dev == NULL) + return EXIT_FAILURE; + + return EXIT_SUCCESS; +} + int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) { int optchar, res = EXIT_FAILURE; char *path_buff; const char **ptr; + unsigned short vid; + char *base_dev; + ssize_t path_length; while ((optchar = getopt(argc, argv, "h")) != -1) { switch (optchar) { @@ -388,10 +441,40 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) } } - path_buff = malloc(PATH_BUFF_LEN); - snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); - path_buff[PATH_BUFF_LEN - 1] = '\0'; + path_length = strlen(SYS_BATIF_PATH_FMT) + strlen(mesh_iface) + 1; + path_buff = malloc(path_length); + if (!path_buff) { + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); + return EXIT_FAILURE; + } + snprintf(path_buff, path_length, SYS_BATIF_PATH_FMT, mesh_iface); + if (access(path_buff, F_OK) != 0) { + if (errno == ENOENT) { + /* path does not exist, no lan interface: check vlan */ + if (get_basedev_vid(mesh_iface, &base_dev, &vid) == EXIT_SUCCESS) { + /* free for previous allocation */ + free(path_buff); + path_length = strlen(SYS_VLAN_PATH) + + strlen(base_dev) + + VLAN_ID_MAX_LEN + 1; + path_buff = malloc(path_length); + if (!path_buff) { + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); + return EXIT_FAILURE; + } + snprintf(path_buff, path_length, SYS_VLAN_PATH, + base_dev, vid); + } else { + return EXIT_FAILURE; + } + } else if (errno == ENOTDIR) { + /* not a directory, something wrong here */ + fprintf(stderr, "Error - expected directory at '%s'\n", + path_buff); + return EXIT_FAILURE; + } + } if (argc == 1) { res = read_file(path_buff, (char *)batctl_settings[setting].sysfs_name, NO_FLAGS, 0, 0, 0); diff --git a/sys.h b/sys.h index a588e0b..f5df845 100644 --- a/sys.h +++ b/sys.h @@ -30,6 +30,9 @@ #define SYS_IFACE_DIR SYS_IFACE_PATH"/%s/" #define SYS_MESH_IFACE_FMT SYS_IFACE_PATH"/%s/batman_adv/mesh_iface" #define SYS_IFACE_STATUS_FMT SYS_IFACE_PATH"/%s/batman_adv/iface_status" +#define PROC_VLAN_PATH "/proc/net/vlan/" +#define SYS_VLAN_PATH "/sys/devices/virtual/net/%s/mesh/vlan%d/" +#define VLAN_ID_MAX_LEN 4 enum batctl_settings_list { BATCTL_SETTINGS_ORIG_INTERVAL, -- 1.8.3.2

2 1

[B.A.T.M.A.N.] [PATCHv5] batctl: add sys framework for VLAN support
by Marco Dalla Torre 05 Sep '13

05 Sep '13

Allow the batctl tool to take advantage of changes from commit e4ff5c153dab054a6cd1c4132f87bc5e77127456 "add sys framework for VLAN" recently added to batman-adv, so that users can execute commands in a per VLAN fashion. If no directory entry corresponding to the user-selected device is found at the standard location for non VLAN interfaces (/sys/class/net/${device}/mesh/), 'batctl' now looks into directory: /sys/devices/virtual/net/${base_device}/mesh/vlan${vid} Information on VLAN devices (base device, vid) necessary to construct the directory path is acquired by parsing /proc/net/vlan/${device}. Where: -${base_device}: the batman device on top of which the VLAN is sitting -${device}: the device interface for the VLAN, -${vid}: the identifier assigned to the VLAN. If the user-selected command is not supported by the VLAN, an appropriate error is shown. Signed-off-by: Marco Dalla Torre <marco.dallato(a)gmail.com> --- functions.c | 3 +++ main.c | 2 +- man/batctl.8 | 4 +-- sys.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- sys.h | 3 +++ 5 files changed, 92 insertions(+), 6 deletions(-) diff --git a/functions.c b/functions.c index cc05a48..ed010ea 100644 --- a/functions.c +++ b/functions.c @@ -135,6 +135,9 @@ static void file_open_problem_dbg(char *dir, char *fname, char *full_path) 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; + } else if (strstr(dir, "/sys/devices/virtual/")) { + fprintf(stderr, "The selected feature '%s' is not supported for vlans\n", fname); + return; } } diff --git a/main.c b/main.c index 24d42fb..bac37ca 100644 --- a/main.c +++ b/main.c @@ -49,7 +49,7 @@ void print_usage(void) 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-m mesh interface or mesh-based VLAN 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"); diff --git a/man/batctl.8 b/man/batctl.8 index d04385b..b45cccf 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -42,7 +42,7 @@ behaviour or using the B.A.T.M.A.N. advanced protocol. .SH OPTIONS .TP .I \fBoptions: -\-m specify mesh interface (default 'bat0') +\-m specify mesh interface or a mesh-based VLAN interface (default 'bat0') .br \-h print general batctl help .br @@ -61,7 +61,7 @@ originator interval. The interval is in units of milliseconds. .br .IP "\fBap_isolation\fP|\fBap\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current ap isolation setting is displayed. Otherwise the parameter is used to enable or -disable ap isolation. +disable ap isolation. This command can be used in conjunction with "-m" option to target per VLAN configurations. .br .IP "\fBbridge_loop_avoidance\fP|\fBbl\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current bridge loop avoidance setting is displayed. Otherwise the parameter is used to enable diff --git a/sys.c b/sys.c index b1d7ea8..3dad9b7 100644 --- a/sys.c +++ b/sys.c @@ -371,11 +371,61 @@ static void settings_usage(int setting) fprintf(stderr, " \t -h print this help\n"); } +/** + * get_basedev_vid - given a valid VLAN interface, identifies the batman device + * on top of which the VLAN is sitting and its VLAN ID + * @mesh_iface: name of the VLAN network interface + * @base_dev: output argument, pointer to the base device name + * @vid: output argument, pointer to the VLAN ID number + * + * Returns 0 if execution is successful, -1 if an error occurred + */ +static int get_basedev_vid(const char *mesh_iface, char **base_dev, unsigned short *vid) +{ + char *vdev; + char *line_ptr = NULL; + size_t len; + *base_dev = NULL; + + int size = strlen(PROC_VLAN_PATH) + strlen(mesh_iface) + 1; + FILE *fp; + char *fpath = malloc(size); + if (!fpath) { + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); + return EXIT_FAILURE; + } + /* prepare path file path: /proc/net/vlan/$mesh_iface*/ + snprintf(fpath, size, "%s%s", PROC_VLAN_PATH, mesh_iface); + + fp = fopen(fpath, "r"); + if (!fp) { + fprintf(stderr, "Error - could not open file '%s': %s\n", fpath, strerror(errno)); + return EXIT_FAILURE; + } + + if (fscanf(fp, "%ms %*s %hu %*s %*d %*s %*d", &vdev, vid) != 2) + return EXIT_FAILURE; + while (getline(&line_ptr, &len, fp) != -1) { + if (sscanf(line_ptr, "Device: %ms", base_dev) == 1) + break; + } + fclose(fp); + free(line_ptr); + /* handle base device not found case */ + if (*base_dev == NULL ) + return EXIT_FAILURE; + + return EXIT_SUCCESS; +} + int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) { int optchar, res = EXIT_FAILURE; char *path_buff; const char **ptr; + unsigned short vid = 0; + char *base_dev = NULL; + ssize_t path_length = 0; while ((optchar = getopt(argc, argv, "h")) != -1) { switch (optchar) { @@ -388,10 +438,40 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) } } - path_buff = malloc(PATH_BUFF_LEN); - snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); - path_buff[PATH_BUFF_LEN - 1] = '\0'; + path_length = strlen(SYS_BATIF_PATH_FMT) - 2 + strlen(mesh_iface) + 1; + path_buff = malloc(path_length); + if (!path_buff) { + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); + return EXIT_FAILURE; + } + snprintf(path_buff, path_length, SYS_BATIF_PATH_FMT, mesh_iface); + if (access(path_buff, F_OK) != 0) { + if (errno == ENOENT) { + /* path does not exist, no lan interface: check vlan */ + if (get_basedev_vid(mesh_iface, &base_dev, &vid) == EXIT_SUCCESS) { + /* free for previous allocation */ + free(path_buff); + path_length = strlen(SYS_VLAN_PATH) - 2 + + strlen(base_dev) - 2 + + VLAN_ID_MAX_LEN + 1; + path_buff = malloc(path_length); + if (!path_buff) { + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); + return EXIT_FAILURE; + } + snprintf(path_buff, path_length, SYS_VLAN_PATH, + base_dev, vid); + } else { + return EXIT_FAILURE; + } + } else if (errno == ENOTDIR) { + /* not a directory, something wrong here */ + fprintf(stderr, "Error - expected directory at '%s'\n", + path_buff); + return EXIT_FAILURE; + } + } if (argc == 1) { res = read_file(path_buff, (char *)batctl_settings[setting].sysfs_name, NO_FLAGS, 0, 0, 0); diff --git a/sys.h b/sys.h index a588e0b..f5df845 100644 --- a/sys.h +++ b/sys.h @@ -30,6 +30,9 @@ #define SYS_IFACE_DIR SYS_IFACE_PATH"/%s/" #define SYS_MESH_IFACE_FMT SYS_IFACE_PATH"/%s/batman_adv/mesh_iface" #define SYS_IFACE_STATUS_FMT SYS_IFACE_PATH"/%s/batman_adv/iface_status" +#define PROC_VLAN_PATH "/proc/net/vlan/" +#define SYS_VLAN_PATH "/sys/devices/virtual/net/%s/mesh/vlan%d/" +#define VLAN_ID_MAX_LEN 4 enum batctl_settings_list { BATCTL_SETTINGS_ORIG_INTERVAL, -- 1.8.3.2

1 0

[B.A.T.M.A.N.] [PATCHv8 1/2] batman-adv: provide orig_node routing API
by Antonio Quartulli 04 Sep '13

04 Sep '13

From: Antonio Quartulli <antonio(a)open-mesh.com> Some operations executed on an orig_node depends on the current routing algorithm being used. To easily make this mechanism routing algorithm agnostic add a orig_node specific API that each algorithm can populate with its own routines. Such routines are then invoked by the code when needed, without knowing which routing algorithm is currently in use With this patch 3 API functions are added: - orig_free (to free routing depending internal structs) - orig_add_if (to change the inner state of an orig_node when a new hard interface is added) - orig_del_if (to change the inner state of an orig_node when an hard interface is removed) Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- changes from v7: - removed batadv_orig_node_del_if() (it has been accidentally re-introduced during the last rebase) Cheers, bat_iv_ogm.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ originator.c | 102 +++++++---------------------------------------- types.h | 11 ++++++ 3 files changed, 151 insertions(+), 88 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 7cdc394..a2b480a 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -88,6 +88,129 @@ static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[]) } /** + * batadv_iv_ogm_orig_free - free the private resources allocated for this + * orig_node + * @orig_node: the orig_node for which the resources have to be free'd + */ +static void batadv_iv_ogm_orig_free(struct batadv_orig_node *orig_node) +{ + kfree(orig_node->bat_iv.bcast_own); + kfree(orig_node->bat_iv.bcast_own_sum); +} + +/** + * batadv_iv_ogm_orig_add_if - change the private structures of the orig_node to + * include the new hard-interface + * @orig_node: the orig_node that has to be changed + * @max_if_num: the current amount of interfaces + * + * Returns 0 on success, a negative error code otherwise. + */ +static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node, + int max_if_num) +{ + void *data_ptr; + size_t data_size, old_size; + int ret = -ENOMEM; + + spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); + + data_size = max_if_num * sizeof(unsigned long) * BATADV_NUM_WORDS; + old_size = (max_if_num - 1) * sizeof(unsigned long) * BATADV_NUM_WORDS; + data_ptr = kmalloc(data_size, GFP_ATOMIC); + if (!data_ptr) + goto unlock; + + memcpy(data_ptr, orig_node->bat_iv.bcast_own, old_size); + kfree(orig_node->bat_iv.bcast_own); + orig_node->bat_iv.bcast_own = data_ptr; + + data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); + if (!data_ptr) { + kfree(orig_node->bat_iv.bcast_own); + goto unlock; + } + + memcpy(data_ptr, orig_node->bat_iv.bcast_own_sum, + (max_if_num - 1) * sizeof(uint8_t)); + kfree(orig_node->bat_iv.bcast_own_sum); + orig_node->bat_iv.bcast_own_sum = data_ptr; + + ret = 0; + +unlock: + spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); + + return ret; +} + +/** + * batadv_iv_ogm_orig_del_if - change the private structures of the orig_node to + * exclude the removed interface + * @orig_node: the orig_node that has to be changed + * @max_if_num: the current amount of interfaces + * @del_if_num: the index of the interface being removed + * + * Returns 0 on success, a negative error code otherwise. + */ +static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node, + int max_if_num, int del_if_num) +{ + int chunk_size, ret = -ENOMEM, if_offset; + void *data_ptr = NULL; + + spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); + + /* last interface was removed */ + if (max_if_num == 0) + goto free_bcast_own; + + chunk_size = sizeof(unsigned long) * BATADV_NUM_WORDS; + data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC); + if (!data_ptr) + goto unlock; + + /* copy first part */ + memcpy(data_ptr, orig_node->bat_iv.bcast_own, del_if_num * chunk_size); + + /* copy second part */ + memcpy((char *)data_ptr + del_if_num * chunk_size, + orig_node->bat_iv.bcast_own + ((del_if_num + 1) * chunk_size), + (max_if_num - del_if_num) * chunk_size); + +free_bcast_own: + kfree(orig_node->bat_iv.bcast_own); + orig_node->bat_iv.bcast_own = data_ptr; + + if (max_if_num == 0) + goto free_own_sum; + + data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); + if (!data_ptr) { + kfree(orig_node->bat_iv.bcast_own); + goto unlock; + } + + memcpy(data_ptr, orig_node->bat_iv.bcast_own_sum, + del_if_num * sizeof(uint8_t)); + + if_offset = (del_if_num + 1) * sizeof(uint8_t); + memcpy((char *)data_ptr + del_if_num * sizeof(uint8_t), + orig_node->bat_iv.bcast_own_sum + if_offset, + (max_if_num - del_if_num) * sizeof(uint8_t)); + +free_own_sum: + kfree(orig_node->bat_iv.bcast_own_sum); + orig_node->bat_iv.bcast_own_sum = data_ptr; + + ret = 0; +unlock: + spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); + + return ret; +} + +/** * batadv_iv_ogm_orig_get - retrieve or create (if does not exist) an originator * @bat_priv: the bat priv with all the soft interface information * @addr: mac address of the originator @@ -1522,6 +1645,9 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { .bat_neigh_cmp = batadv_iv_ogm_neigh_cmp, .bat_neigh_is_equiv_or_better = batadv_iv_ogm_neigh_is_eob, .bat_orig_print = batadv_iv_ogm_orig_print, + .bat_orig_free = batadv_iv_ogm_orig_free, + .bat_orig_add_if = batadv_iv_ogm_orig_add_if, + .bat_orig_del_if = batadv_iv_ogm_orig_del_if, }; int __init batadv_iv_init(void) diff --git a/originator.c b/originator.c index 9cee053..8ab1434 100644 --- a/originator.c +++ b/originator.c @@ -241,9 +241,10 @@ static void batadv_orig_node_free_rcu(struct rcu_head *rcu) batadv_tt_global_del_orig(orig_node->bat_priv, orig_node, -1, "originator timed out"); + if (orig_node->bat_priv->bat_algo_ops->bat_orig_free) + orig_node->bat_priv->bat_algo_ops->bat_orig_free(orig_node); + kfree(orig_node->tt_buff); - kfree(orig_node->bat_iv.bcast_own); - kfree(orig_node->bat_iv.bcast_own_sum); kfree(orig_node); } @@ -538,38 +539,11 @@ int batadv_orig_seq_print_text(struct seq_file *seq, void *offset) return 0; } -static int batadv_orig_node_add_if(struct batadv_orig_node *orig_node, - int max_if_num) -{ - void *data_ptr; - size_t data_size, old_size; - - data_size = max_if_num * sizeof(unsigned long) * BATADV_NUM_WORDS; - old_size = (max_if_num - 1) * sizeof(unsigned long) * BATADV_NUM_WORDS; - data_ptr = kmalloc(data_size, GFP_ATOMIC); - if (!data_ptr) - return -ENOMEM; - - memcpy(data_ptr, orig_node->bat_iv.bcast_own, old_size); - kfree(orig_node->bat_iv.bcast_own); - orig_node->bat_iv.bcast_own = data_ptr; - - data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); - if (!data_ptr) - return -ENOMEM; - - memcpy(data_ptr, orig_node->bat_iv.bcast_own_sum, - (max_if_num - 1) * sizeof(uint8_t)); - kfree(orig_node->bat_iv.bcast_own_sum); - orig_node->bat_iv.bcast_own_sum = data_ptr; - - return 0; -} - int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface, int max_if_num) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); + struct batadv_algo_ops *bao = bat_priv->bat_algo_ops; struct batadv_hashtable *hash = bat_priv->orig_hash; struct hlist_head *head; struct batadv_orig_node *orig_node; @@ -584,10 +558,10 @@ int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface, rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) { - spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); - ret = batadv_orig_node_add_if(orig_node, max_if_num); - spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); - + ret = 0; + if (bao->bat_orig_add_if) + ret = bao->bat_orig_add_if(orig_node, + max_if_num); if (ret == -ENOMEM) goto err; } @@ -601,55 +575,6 @@ err: return -ENOMEM; } -static int batadv_orig_node_del_if(struct batadv_orig_node *orig_node, - int max_if_num, int del_if_num) -{ - int chunk_size, if_offset; - void *data_ptr = NULL; - - /* last interface was removed */ - if (max_if_num == 0) - goto free_bcast_own; - - chunk_size = sizeof(unsigned long) * BATADV_NUM_WORDS; - data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC); - if (!data_ptr) - return -ENOMEM; - - /* copy first part */ - memcpy(data_ptr, orig_node->bat_iv.bcast_own, del_if_num * chunk_size); - - /* copy second part */ - memcpy((char *)data_ptr + del_if_num * chunk_size, - orig_node->bat_iv.bcast_own + ((del_if_num + 1) * chunk_size), - (max_if_num - del_if_num) * chunk_size); - -free_bcast_own: - kfree(orig_node->bat_iv.bcast_own); - orig_node->bat_iv.bcast_own = data_ptr; - - if (max_if_num == 0) - goto free_own_sum; - - data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); - if (!data_ptr) - return -ENOMEM; - - memcpy(data_ptr, orig_node->bat_iv.bcast_own_sum, - del_if_num * sizeof(uint8_t)); - - if_offset = (del_if_num + 1) * sizeof(uint8_t); - memcpy((char *)data_ptr + del_if_num * sizeof(uint8_t), - orig_node->bat_iv.bcast_own_sum + if_offset, - (max_if_num - del_if_num) * sizeof(uint8_t)); - -free_own_sum: - kfree(orig_node->bat_iv.bcast_own_sum); - orig_node->bat_iv.bcast_own_sum = data_ptr; - - return 0; -} - int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface, int max_if_num) { @@ -658,6 +583,7 @@ int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface, struct hlist_head *head; struct batadv_hard_iface *hard_iface_tmp; struct batadv_orig_node *orig_node; + struct batadv_algo_ops *bao = bat_priv->bat_algo_ops; uint32_t i; int ret; @@ -669,11 +595,11 @@ int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface, rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) { - spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); - ret = batadv_orig_node_del_if(orig_node, max_if_num, - hard_iface->if_num); - spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); - + ret = 0; + if (bao->bat_orig_del_if) + ret = bao->bat_orig_del_if(orig_node, + max_if_num, + hard_iface->if_num); if (ret == -ENOMEM) goto err; } diff --git a/types.h b/types.h index c0761a4..f323822 100644 --- a/types.h +++ b/types.h @@ -999,6 +999,12 @@ struct batadv_forw_packet { * @bat_neigh_is_equiv_or_better: check if neigh1 is equally good or * better than neigh2 from the metric prospective * @bat_orig_print: print the originator table (optional) + * @bat_orig_free: free the resources allocated by the routing algorithm for an + * orig_node object + * @bat_orig_add_if: ask the routing algorithm to apply the needed changes to + * the orig_node due to a new hard-interface being added into the mesh + * @bat_orig_del_if: ask the routing algorithm to apply the needed changes to + * the orig_node due to an hard-interface being removed from the mesh */ struct batadv_algo_ops { struct hlist_node list; @@ -1015,6 +1021,11 @@ struct batadv_algo_ops { struct batadv_neigh_node *neigh2); /* orig_node handling API */ void (*bat_orig_print)(struct batadv_priv *priv, struct seq_file *seq); + void (*bat_orig_free)(struct batadv_orig_node *orig_node); + int (*bat_orig_add_if)(struct batadv_orig_node *orig_node, + int max_if_num); + int (*bat_orig_del_if)(struct batadv_orig_node *orig_node, + int max_if_num, int del_if_num); }; /** -- 1.8.1.5

2 3

[B.A.T.M.A.N.] [PATCH] batctl: add sys framework for VLAN support
by Marco Dalla Torre 04 Sep '13

04 Sep '13

Version 2 - code style fixes If no directory entry corresponding to the user-selected device is found at the standard location for non VLAN interfaces (/sys/class/net/${base_device}), 'batctl' now looks into directory: /sys/devices/virtual/net/${base_device}/mesh/vlan${vid} Where: -${base_device}: the batman device on top of which the VLAN is sitting -${device}: the device interface for the VLAN, -${vid}: the identifier assigned to the VLAN. Information on VLAN devices (base device, vid) necessary to construct the directory path is acquired by parsing /proc/net/vlan/${device}. If the user-selected command is not supported by the VLAN, an appropriate error is shown. --- functions.c | 3 +++ sys.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/functions.c b/functions.c index cc05a48..ed010ea 100644 --- a/functions.c +++ b/functions.c @@ -135,6 +135,9 @@ static void file_open_problem_dbg(char *dir, char *fname, char *full_path) 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; + } else if (strstr(dir, "/sys/devices/virtual/")) { + fprintf(stderr, "The selected feature '%s' is not supported for vlans\n", fname); + return; } } diff --git a/sys.c b/sys.c index b1d7ea8..942ead0 100644 --- a/sys.c +++ b/sys.c @@ -371,6 +371,37 @@ static void settings_usage(int setting) fprintf(stderr, " \t -h print this help\n"); } +int get_basedev_vid(char *mesh_iface, char **base_dev, unsigned short *vid) +{ + char *vdev; + char line[100]; + const char path[] = "/proc/net/vlan/"; + int size = sizeof(path) + sizeof(mesh_iface); + FILE *fp = NULL; + + char *fpath = malloc(size); + strcpy(fpath, path); + /* prepare path file path: /proc/net/vlan/$mesh_iface*/ + strcat(fpath, mesh_iface); + + fp = fopen(fpath, "r"); + if (fp == NULL) + return 1; + + if (fscanf(fp, "%ms %*s %hu %*s %*d %*s %*d", &vdev, vid) == 0) + return 0; + + while (fgets(line, sizeof(line), fp) != NULL) { + if (sscanf(line, "Device: %ms", base_dev) == 1) + break; + } + // handle base device not found case + if (*base_dev == NULL) + return 0; + + return 1; +} + int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) { int optchar, res = EXIT_FAILURE; @@ -392,6 +423,26 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); path_buff[PATH_BUFF_LEN - 1] = '\0'; + if (access(path_buff, F_OK) != 0) { + if (errno == ENOENT) { + // path does not exist, no lan interface: check vlan + unsigned short vid = 0; + char *base_dev = NULL; + if (get_basedev_vid(mesh_iface, &base_dev, &vid) == 1) { + free(path_buff); + char sys_vlan_path[] = "/sys/devices/virtual/net/%s/mesh/vlan%d/"; + int size = sizeof(sys_vlan_path) + sizeof(base_dev); + path_buff = malloc(size); + sprintf(path_buff, sys_vlan_path, base_dev, vid); + } + } + if (errno == ENOTDIR) { + // not a directory, something wrong here + fprintf(stderr, "Error - expected directory at '%s'\n", + path_buff); + return EXIT_FAILURE; + } + } if (argc == 1) { res = read_file(path_buff, (char *)batctl_settings[setting].sysfs_name, NO_FLAGS, 0, 0, 0); -- 1.8.3.2

3 7

[B.A.T.M.A.N.] [PATCH] batman: Remove reference to compare_ether_addr
by Joe Perches 04 Sep '13

04 Sep '13

This function is being removed, rename the reference. Signed-off-by: Joe Perches <joe(a)perches.com> --- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 5e9aebb..7333cf8 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -253,7 +253,7 @@ static inline void batadv_dbg(int type __always_unused, /* returns 1 if they are the same ethernet addr * - * note: can't use compare_ether_addr() as it requires aligned memory + * note: can't use ether_addr_equal() as it requires aligned memory */ static inline int batadv_compare_eth(const void *data1, const void *data2) {

3 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N September 2013