Repository : ssh://git@diktynna/batctl

On branch : master

commit aa0e498842ddc076fb8d4ace0cb38c79608e8dfe Author: Sven Eckelmann sven@narfation.org Date: Sat Oct 31 19:40:50 2020 +0100

batctl: Drop deprecated sysfs support

The sysfs support is disabled by default in batman-adv since a while and will be removed in 2021. The generic netlink interface should be used instead.

The batctl support for it should be removed with the same release as the removal in batman-adv.

Signed-off-by: Sven Eckelmann sven@narfation.org

aa0e498842ddc076fb8d4ace0cb38c79608e8dfe aggregation.c | 1 - ap_isolation.c | 1 - bonding.c | 1 - bridge_loop_avoidance.c | 1 - distributed_arp_table.c | 1 - elp_interval.c | 1 - fragmentation.c | 1 - functions.c | 183 ++---------------------------------------------- functions.h | 5 +- gw_mode.c | 111 +++-------------------------- hop_penalty.c | 2 - interface.c | 15 +--- isolation_mark.c | 1 - loglevel.c | 44 +++--------- main.c | 7 +- multicast_fanout.c | 1 - multicast_forceflood.c | 1 - multicast_mode.c | 1 - network_coding.c | 1 - orig_interval.c | 1 - routing_algo.c | 38 +++++++--- sys.c | 90 +++--------------------- sys.h | 9 --- throughput_override.c | 1 - 24 files changed, 71 insertions(+), 447 deletions(-)

diff --git a/aggregation.c b/aggregation.c index 11327d3..5d06471 100644 --- a/aggregation.c +++ b/aggregation.c @@ -48,7 +48,6 @@ static int set_aggregated_ogms(struct state *state) }

static struct settings_data batctl_settings_aggregation = { - .sysfs_name = "aggregated_ogms", .data = &aggregated_ogms, .parse = parse_simple_boolean, .netlink_get = get_aggregated_ogms, diff --git a/ap_isolation.c b/ap_isolation.c index c8675f5..2f18015 100644 --- a/ap_isolation.c +++ b/ap_isolation.c @@ -70,7 +70,6 @@ static int set_ap_isolation(struct state *state) }

static struct settings_data batctl_settings_ap_isolation = { - .sysfs_name = "ap_isolation", .data = &ap_isolation, .parse = parse_simple_boolean, .netlink_get = get_ap_isolation, diff --git a/bonding.c b/bonding.c index db0782c..ee4d314 100644 --- a/bonding.c +++ b/bonding.c @@ -47,7 +47,6 @@ static int set_bonding(struct state *state) }

static struct settings_data batctl_settings_bonding = { - .sysfs_name = "bonding", .data = &bonding, .parse = parse_simple_boolean, .netlink_get = get_bonding, diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 6572f6a..3525a3e 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -48,7 +48,6 @@ static int set_bridge_loop_avoidance(struct state *state) }

static struct settings_data batctl_settings_bridge_loop_avoidance = { - .sysfs_name = "bridge_loop_avoidance", .data = &bridge_loop_avoidance, .parse = parse_simple_boolean, .netlink_get = get_bridge_loop_avoidance, diff --git a/distributed_arp_table.c b/distributed_arp_table.c index 4e244ef..1bccba1 100644 --- a/distributed_arp_table.c +++ b/distributed_arp_table.c @@ -48,7 +48,6 @@ static int set_distributed_arp_table(struct state *state) }

static struct settings_data batctl_settings_distributed_arp_table = { - .sysfs_name = "distributed_arp_table", .data = &distributed_arp_table, .parse = parse_simple_boolean, .netlink_get = get_distributed_arp_table, diff --git a/elp_interval.c b/elp_interval.c index f551b1f..f4312e7 100644 --- a/elp_interval.c +++ b/elp_interval.c @@ -98,7 +98,6 @@ static int set_elp_interval(struct state *state) }

static struct settings_data batctl_settings_elp_interval = { - .sysfs_name = "elp_interval", .data = &elp_interval, .parse = parse_elp_interval, .netlink_get = get_elp_interval, diff --git a/fragmentation.c b/fragmentation.c index a8cb1e6..65e4356 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -48,7 +48,6 @@ static int set_fragmentation(struct state *state) }

static struct settings_data batctl_settings_fragmentation = { - .sysfs_name = "fragmentation", .data = &fragmentation, .parse = parse_simple_boolean, .netlink_get = get_fragmentation, diff --git a/functions.c b/functions.c index 651fb1d..4df1815 100644 --- a/functions.c +++ b/functions.c @@ -117,18 +117,8 @@ int file_exists(const char *fpath) return stat(fpath, &st) == 0; }

-static void file_open_problem_dbg(const char *dir, const char *full_path) +static void file_open_problem_dbg(const char *full_path) { - struct stat st; - - if (strstr(dir, "/sys/")) { - if (stat("/sys/", &st) != 0) { - 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)) { fprintf(stderr, "Error - batman-adv module has not been loaded\n"); return; @@ -152,29 +142,16 @@ static bool ether_addr_valid(const uint8_t *addr) return true; }

-static void print_inv_bool(char *line) -{ - if (!strncmp("enabled", line, strlen("enabled"))) - printf("disabled\n"); - else if (!strncmp("disabled", line, strlen("disabled"))) - printf("enabled\n"); - else - printf("%s", line); -} - -int read_file(const char *dir, const char *fname, int read_opt) +int read_file(const char *full_path, int read_opt) { int res = EXIT_FAILURE; - char full_path[500]; size_t len = 0; FILE *fp = NULL;

- snprintf(full_path, sizeof(full_path), "%s%s", dir, fname); - fp = fopen(full_path, "r"); if (!fp) { if (!(read_opt & SILENCE_ERRORS)) - file_open_problem_dbg(dir, full_path); + file_open_problem_dbg(full_path);

return res; } @@ -184,15 +161,6 @@ int read_file(const char *dir, const char *fname, int read_opt) if (read_opt & USE_READ_BUFF) break;

- if (!(read_opt & USE_BAT_HOSTS)) { - if (read_opt & INVERSE_BOOL) - print_inv_bool(line_ptr); - else - printf("%s", line_ptr); - - continue; - } - printf("%s", line_ptr); }

@@ -203,40 +171,6 @@ int read_file(const char *dir, const char *fname, int read_opt) return res; }

-int write_file(const char *dir, const char *fname, const char *arg1, - const char *arg2) -{ - int fd = -1, res = EXIT_FAILURE; - char full_path[500]; - ssize_t write_len; - - snprintf(full_path, sizeof(full_path), "%s%s", dir, fname); - - fd = open(full_path, O_WRONLY); - - if (fd < 0) { - file_open_problem_dbg(dir, full_path); - goto out; - } - - if (arg2) - write_len = dprintf(fd, "%s %s", arg1, arg2); - else - write_len = write(fd, arg1, strlen(arg1) + 1); - - if (write_len < 0) { - fprintf(stderr, "Error - can't write to file '%s': %s\n", full_path, strerror(errno)); - goto out; - } - - res = EXIT_SUCCESS; - -out: - if (fd >= 0) - close(fd); - return res; -} - struct ether_addr *translate_mac(const char *mesh_iface, const struct ether_addr *mac) { @@ -261,40 +195,7 @@ struct ether_addr *translate_mac(const char *mesh_iface,

int get_algoname(const char *mesh_iface, char *algoname, size_t algoname_len) { - char *path_buff; - int ret; - - ret = get_algoname_netlink(mesh_iface, algoname, algoname_len); - if (ret != -EOPNOTSUPP) - return ret; - - path_buff = malloc(PATH_BUFF_LEN); - if (!path_buff) { - fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); - return -ENOMEM; - } - - snprintf(path_buff, PATH_BUFF_LEN, SYS_ROUTING_ALGO_FMT, mesh_iface); - ret = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS); - if (ret != EXIT_SUCCESS) { - ret = -ENOENT; - goto free_path_buf; - } - - if (line_ptr[strlen(line_ptr) - 1] == '\n') - line_ptr[strlen(line_ptr) - 1] = '\0'; - - strncpy(algoname, line_ptr, algoname_len); - if (algoname_len > 0) - algoname[algoname_len - 1] = '\0'; - -free_path_buf: - free(path_buff); - - free(line_ptr); - line_ptr = NULL; - - return ret; + return get_algoname_netlink(mesh_iface, algoname, algoname_len); }

static int resolve_l3addr(int ai_family, const char *asc, void *l3addr) @@ -948,45 +849,16 @@ int guess_netdev_type(const char *netdev, enum selector_prefix *type) return -EINVAL; }

-static int check_mesh_iface_sysfs(struct state *state) -{ - char path_buff[PATH_BUFF_LEN]; - DIR *dir; - - /* try to open the mesh sys directory */ - snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, - state->mesh_iface); - - dir = opendir(path_buff); - if (!dir) - return -1; - - closedir(dir); - - return 0; -} - int check_mesh_iface(struct state *state) { - int ret; - state->mesh_ifindex = if_nametoindex(state->mesh_iface); if (state->mesh_ifindex == 0) return -1;

- ret = check_mesh_iface_netlink(state->mesh_ifindex); - if (ret == 0) - return ret; - - ret = check_mesh_iface_sysfs(state); - if (ret == 0) - return ret; - - return -1; + return check_mesh_iface_netlink(state->mesh_ifindex); }

-static int check_mesh_iface_ownership_netlink(struct state *state, - char *hard_iface) +int check_mesh_iface_ownership(struct state *state, char *hard_iface) { struct rtnl_link_iface_data link_data; unsigned int hardif_index; @@ -1005,49 +877,6 @@ static int check_mesh_iface_ownership_netlink(struct state *state, return EXIT_SUCCESS; }

-static int check_mesh_iface_ownership_sysfs(struct state *state, - 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); - res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS); - 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, state->mesh_iface) != 0) { - fprintf(stderr, "Error - interface %s is part of batman network %s, not %s\n", - hard_iface, line_ptr, state->mesh_iface); - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} - -int check_mesh_iface_ownership(struct state *state, char *hard_iface) -{ - int ret; - - ret = check_mesh_iface_ownership_netlink(state, hard_iface); - if (ret == EXIT_SUCCESS) - return EXIT_SUCCESS; - - ret = check_mesh_iface_ownership_sysfs(state, hard_iface); - if (ret == EXIT_SUCCESS) - return ret; - - return EXIT_FAILURE; -} - static int get_random_bytes_syscall(void *buf __maybe_unused, size_t buflen __maybe_unused) { diff --git a/functions.h b/functions.h index f63c438..923e593 100644 --- a/functions.h +++ b/functions.h @@ -43,9 +43,7 @@ char *ether_ntoa_long(const struct ether_addr *addr); char *get_name_by_macaddr(struct ether_addr *mac_addr, int read_opt); char *get_name_by_macstr(char *mac_str, int read_opt); int file_exists(const char *fpath); -int read_file(const char *dir, const char *path, int read_opt); -int write_file(const char *dir, const char *fname, const char *arg1, - const char *arg2); +int read_file(const char *full_path, int read_opt); struct ether_addr *translate_mac(const char *mesh_iface, const struct ether_addr *mac); struct ether_addr *resolve_mac(const char *asc); @@ -81,7 +79,6 @@ enum { SKIP_HEADER = 0x100, UNICAST_ONLY = 0x200, MULTICAST_ONLY = 0x400, - INVERSE_BOOL = 0x800, };

#endif diff --git a/gw_mode.c b/gw_mode.c index 72b5fbf..e48b78d 100644 --- a/gw_mode.c +++ b/gw_mode.c @@ -254,105 +254,31 @@ static int set_gw(struct state *state) NULL); }

-static int gw_read_setting(struct state *state, const char *path_buff) +static int gw_read_setting(struct state *state) { - enum batadv_gw_modes gw_mode; int res;

res = get_gw(state); - if (res < 0 && res != -EOPNOTSUPP) + if (res < 0) return EXIT_FAILURE; - if (res >= 0) - return EXIT_SUCCESS; - - /* fallback to sysfs */ - res = read_file(path_buff, SYS_GW_MODE, USE_READ_BUFF); - if (res != EXIT_SUCCESS) - goto out; - - if (line_ptr[strlen(line_ptr) - 1] == '\n') - line_ptr[strlen(line_ptr) - 1] = '\0'; - - if (strcmp(line_ptr, "client") == 0) - gw_mode = BATADV_GW_MODE_CLIENT; - else if (strcmp(line_ptr, "server") == 0) - gw_mode = BATADV_GW_MODE_SERVER; else - gw_mode = BATADV_GW_MODE_OFF; - - free(line_ptr); - line_ptr = NULL; - - switch (gw_mode) { - case BATADV_GW_MODE_CLIENT: - res = read_file(path_buff, SYS_GW_SEL, USE_READ_BUFF); - break; - case BATADV_GW_MODE_SERVER: - res = read_file(path_buff, SYS_GW_BW, USE_READ_BUFF); - break; - default: - printf("off\n"); - goto out; - } - - if (res != EXIT_SUCCESS) - goto out; - - if (line_ptr[strlen(line_ptr) - 1] == '\n') - line_ptr[strlen(line_ptr) - 1] = '\0'; - - switch (gw_mode) { - case BATADV_GW_MODE_CLIENT: - printf("client (selection class: %s)\n", line_ptr); - break; - case BATADV_GW_MODE_SERVER: - printf("server (announced bw: %s)\n", line_ptr); - break; - default: - goto out; - } - -out: - free(line_ptr); - line_ptr = NULL; - - return res; + return EXIT_SUCCESS; }

-static int gw_write_setting(struct state *state, const char *path_buff, - int argc, char *argv[]) +static int gw_write_setting(struct state *state) { int res = EXIT_FAILURE;

res = set_gw(state); - if (res < 0 && res != -EOPNOTSUPP) + if (res < 0) return EXIT_FAILURE; - if (res >= 0) + else return EXIT_SUCCESS; - - /* sysfs fallback */ - res = write_file(path_buff, SYS_GW_MODE, argv[1], NULL); - if (res != EXIT_SUCCESS) - return res; - - if (argc > 2) { - switch (gw_globals.mode) { - case BATADV_GW_MODE_CLIENT: - res = write_file(path_buff, SYS_GW_SEL, argv[2], NULL); - break; - case BATADV_GW_MODE_SERVER: - res = write_file(path_buff, SYS_GW_BW, argv[2], NULL); - break; - } - } - - return res; }

static int gw_mode(struct state *state, int argc, char **argv) { int optchar, res = EXIT_FAILURE; - char *path_buff;

while ((optchar = getopt(argc, argv, "h")) != -1) { switch (optchar) { @@ -365,31 +291,16 @@ static int gw_mode(struct state *state, int argc, char **argv) } }

- path_buff = malloc(PATH_BUFF_LEN); - if (!path_buff) { - fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); - return EXIT_FAILURE; - } - - snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, state->mesh_iface); - - if (argc == 1) { - res = gw_read_setting(state, path_buff); - goto out; - } + if (argc == 1) + return gw_read_setting(state);

check_root_or_die("batctl gw_mode");

res = parse_gw(state, argc, argv); - if (res < 0) { - res = EXIT_FAILURE; - goto out; - } + if (res < 0) + return EXIT_FAILURE;

- res = gw_write_setting(state, path_buff, argc, argv); -out: - free(path_buff); - return res; + return gw_write_setting(state); }

COMMAND(SUBCOMMAND_MIF, gw_mode, "gw", diff --git a/hop_penalty.c b/hop_penalty.c index 5f1aabc..7430381 100644 --- a/hop_penalty.c +++ b/hop_penalty.c @@ -122,7 +122,6 @@ static int set_hop_penalty_if(struct state *state) }

static struct settings_data batctl_settings_hop_penalty = { - .sysfs_name = "hop_penalty", .data = &hop_penalty, .parse = parse_hop_penalty, .netlink_get = get_hop_penalty, @@ -130,7 +129,6 @@ static struct settings_data batctl_settings_hop_penalty = { };

static struct settings_data batctl_settings_hop_penalty_if = { - .sysfs_name = NULL, .data = &hop_penalty, .parse = parse_hop_penalty, .netlink_get = get_hop_penalty_if, diff --git a/interface.c b/interface.c index cb0f5e0..77ca1a0 100644 --- a/interface.c +++ b/interface.c @@ -139,7 +139,6 @@ static int print_interfaces_rtnl_parse(struct nl_msg *msg, void *arg) struct print_interfaces_rtnl_arg *print_arg = arg; char iface_status[IFACE_STATUS_LEN]; struct nlattr *attrs[IFLA_MAX + 1]; - char path_buff[PATH_BUFF_LEN]; struct ifinfomsg *ifm; char *ifname; int ret; @@ -166,21 +165,11 @@ static int print_interfaces_rtnl_parse(struct nl_msg *msg, void *arg) goto err;

status = get_iface_status_netlink(master, ifm->ifi_index, iface_status); - if (!status) { - snprintf(path_buff, sizeof(path_buff), SYS_IFACE_STATUS_FMT, - ifname); - ret = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS); - if (ret != EXIT_SUCCESS) - status = "<error reading status>\n"; - else - status = line_ptr; - } + if (!status) + status = "<error reading status>\n";

printf("%s: %s", ifname, status);

- free(line_ptr); - line_ptr = NULL; - err: return NL_OK; } diff --git a/isolation_mark.c b/isolation_mark.c index 0865de3..b0048f3 100644 --- a/isolation_mark.c +++ b/isolation_mark.c @@ -127,7 +127,6 @@ static int set_isolation_mark(struct state *state) }

static struct settings_data batctl_settings_isolation_mark = { - .sysfs_name = "isolation_mark", .data = &isolation_mark, .parse = parse_isolation_mark, .netlink_get = get_isolation_mark, diff --git a/loglevel.c b/loglevel.c index 1e4b690..af7349d 100644 --- a/loglevel.c +++ b/loglevel.c @@ -86,44 +86,31 @@ static int set_log_level(struct state *state) set_attrs_log_level, NULL); }

-static int log_level_read_setting(struct state *state, const char *path_buff) +static int log_level_read_setting(struct state *state) { int res;

res = get_log_level(state); - if (res < 0 && res != -EOPNOTSUPP) + if (res < 0) return EXIT_FAILURE; - if (res >= 0) + else return EXIT_SUCCESS; - - res = read_file(path_buff, SYS_LOG_LEVEL, USE_READ_BUFF); - if (res != EXIT_SUCCESS) - return res; - - log_level_globals.log_level = strtol(line_ptr, (char **) NULL, 10); - - return res; }

-static int log_level_write_setting(struct state *state, const char *path_buff) +static int log_level_write_setting(struct state *state) { int res; - char str[4];

res = set_log_level(state); - if (res < 0 && res != -EOPNOTSUPP) + if (res < 0) return EXIT_FAILURE; - if (res >= 0) + else return EXIT_SUCCESS; - - snprintf(str, sizeof(str), "%i", log_level_globals.log_level); - return write_file(path_buff, SYS_LOG_LEVEL, str, NULL); }

static int loglevel(struct state *state, int argc, char **argv) { int optchar, res = EXIT_FAILURE; - char *path_buff; int i;

log_level_globals.log_level = 0; @@ -139,14 +126,6 @@ static int loglevel(struct state *state, int argc, char **argv) } }

- path_buff = malloc(PATH_BUFF_LEN); - if (!path_buff) { - fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); - return EXIT_FAILURE; - } - - snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, state->mesh_iface); - if (argc != 1) { check_root_or_die("batctl loglevel");

@@ -175,17 +154,16 @@ static int loglevel(struct state *state, int argc, char **argv) log_level_globals.log_level |= BIT(7); else { log_level_usage(); - goto out; + return EXIT_FAILURE; } }

- log_level_write_setting(state, path_buff); - goto out; + return log_level_write_setting(state); }

- res = log_level_read_setting(state, path_buff); + res = log_level_read_setting(state); if (res != EXIT_SUCCESS) - goto out; + return res;

printf("[%c] %s (%s)\n", (!log_level_globals.log_level) ? 'x' : ' ', "all debug output disabled", "none"); @@ -207,8 +185,6 @@ static int loglevel(struct state *state, int argc, char **argv) printf("[%c] %s (%s)\n", (log_level_globals.log_level & BIT(7)) ? 'x' : ' ', "messages related to throughput meter", "tp");

-out: - free(path_buff); return res; }

diff --git a/main.c b/main.c index 6ea589a..54be6fb 100644 --- a/main.c +++ b/main.c @@ -123,7 +123,7 @@ static void version(void)

printf("batctl %s [batman-adv: ", SOURCE_VERSION);

- ret = read_file("", module_ver_path, USE_READ_BUFF | SILENCE_ERRORS); + ret = read_file(module_ver_path, USE_READ_BUFF | SILENCE_ERRORS); if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) line_ptr[strlen(line_ptr) - 1] = '\0';

@@ -397,10 +397,7 @@ int main(int argc, char **argv)

if (cmd->flags & COMMAND_FLAG_NETLINK) { ret = netlink_create(&state); - if (ret < 0 && ret != -EOPNOTSUPP) { - /* TODO handle -EOPNOTSUPP as error when fallbacks were - * removed - */ + if (ret < 0) { fprintf(stderr, "Error - failed to connect to batadv\n"); exit(EXIT_FAILURE); diff --git a/multicast_fanout.c b/multicast_fanout.c index dcc4fc6..b43ff10 100644 --- a/multicast_fanout.c +++ b/multicast_fanout.c @@ -88,7 +88,6 @@ static int set_multicast_fanout(struct state *state) }

static struct settings_data batctl_settings_multicast_fanout = { - .sysfs_name = NULL, .data = &multicast_fanout, .parse = parse_multicast_fanout, .netlink_get = get_multicast_fanout, diff --git a/multicast_forceflood.c b/multicast_forceflood.c index a33149f..e02ab9d 100644 --- a/multicast_forceflood.c +++ b/multicast_forceflood.c @@ -68,7 +68,6 @@ static int set_multicast_forceflood(struct state *state) }

static struct settings_data batctl_settings_multicast_forceflood = { - .sysfs_name = "multicast_mode", .data = &multicast_forceflood, .parse = parse_simple_boolean, .netlink_get = get_multicast_forceflood, diff --git a/multicast_mode.c b/multicast_mode.c index a46cfc9..f837998 100644 --- a/multicast_mode.c +++ b/multicast_mode.c @@ -68,7 +68,6 @@ static int set_multicast_mode(struct state *state) }

static struct settings_data batctl_settings_multicast_mode = { - .sysfs_name = "multicast_mode", .data = &multicast_mode, .parse = parse_simple_boolean, .netlink_get = get_multicast_mode, diff --git a/network_coding.c b/network_coding.c index a733c6b..9868e54 100644 --- a/network_coding.c +++ b/network_coding.c @@ -48,7 +48,6 @@ static int set_network_coding(struct state *state) }

static struct settings_data batctl_settings_network_coding = { - .sysfs_name = "network_coding", .data = &network_coding, .parse = parse_simple_boolean, .netlink_get = get_network_coding, diff --git a/orig_interval.c b/orig_interval.c index 25e67e5..2cdad1a 100644 --- a/orig_interval.c +++ b/orig_interval.c @@ -88,7 +88,6 @@ static int set_orig_interval(struct state *state) }

static struct settings_data batctl_settings_orig_interval = { - .sysfs_name = "orig_interval", .data = &orig_interval, .parse = parse_orig_interval, .netlink_get = get_orig_interval, diff --git a/routing_algo.c b/routing_algo.c index 0f2e1bb..27458ff 100644 --- a/routing_algo.c +++ b/routing_algo.c @@ -7,6 +7,7 @@ */

#include <errno.h> +#include <fcntl.h> #include <getopt.h> #include <netinet/if_ether.h> #include <netlink/netlink.h> @@ -15,6 +16,9 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <unistd.h>

#include "batadv_packet.h" #include "batman_adv.h" @@ -73,7 +77,7 @@ static int routing_algos_callback(struct nl_msg *msg, void *arg __maybe_unused) return NL_OK; }

-static int netlink_print_routing_algos(void) +static int print_routing_algos(void) { struct nl_sock *sock; struct nl_msg *msg; @@ -132,12 +136,28 @@ err_free_sock: return last_err; }

-static int print_routing_algos(void) +static int write_default_ra(const char *full_path, const char *arg1) { - int err; + ssize_t write_len; + int fd = -1;

- err = netlink_print_routing_algos(); - return err; + fd = open(full_path, O_WRONLY); + if (fd < 0) { + fprintf(stderr, "Error - can't open file '%s': %s\n", full_path, + strerror(errno)); + + return EXIT_FAILURE; + } + + write_len = write(fd, arg1, strlen(arg1) + 1); + close(fd); + if (write_len < 0) { + fprintf(stderr, "Error - can't write to file '%s': %s\n", + full_path, strerror(errno)); + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; }

static struct nla_policy link_policy[IFLA_MAX + 1] = { @@ -278,14 +298,12 @@ static int routing_algo(struct state *state __maybe_unused, int argc, char **arg

check_root_or_die("batctl routing_algo");

- if (argc == 2) { - res = write_file(SYS_SELECTED_RA_PATH, "", argv[1], NULL); - return EXIT_FAILURE; - } + if (argc == 2) + return write_default_ra(SYS_SELECTED_RA_PATH, argv[1]);

print_ra_interfaces();

- res = read_file("", SYS_SELECTED_RA_PATH, USE_READ_BUFF); + res = read_file(SYS_SELECTED_RA_PATH, USE_READ_BUFF); if (res != EXIT_SUCCESS) return EXIT_FAILURE;

diff --git a/sys.c b/sys.c index 7668a72..cde5002 100644 --- a/sys.c +++ b/sys.c @@ -189,63 +189,35 @@ static void settings_usage(struct state *state) fprintf(stderr, " \t -h print this help\n"); }

-static int sys_read_setting(struct state *state, const char *path_buff, - const char *sysfs_name) +static int sys_read_setting(struct state *state) { struct settings_data *settings = state->cmd->arg; int res = EXIT_FAILURE; - int read_opt = NO_FLAGS;

if (settings->netlink_get) { res = settings->netlink_get(state); - if (res < 0 && res != -EOPNOTSUPP) + if (res < 0) return EXIT_FAILURE; - if (res >= 0) + else return EXIT_SUCCESS; }

- if (sysfs_name) { - if (state->cmd->flags & COMMAND_FLAG_INVERSE) - read_opt |= INVERSE_BOOL; - - res = read_file(path_buff, sysfs_name, read_opt); - } - return res; }

-static int sys_write_setting(struct state *state, const char *path_buff, - const char *sysfs_name, int argc, char **argv) +static int sys_write_setting(struct state *state) { struct settings_data *settings = state->cmd->arg; int res = EXIT_FAILURE; - char *argv1 = argv[1];

if (settings->netlink_set) { res = settings->netlink_set(state); - if (res < 0 && res != -EOPNOTSUPP) + if (res < 0) return EXIT_FAILURE; - if (res >= 0) + else return EXIT_SUCCESS; }

- if (sysfs_name) { - if (state->cmd->flags & COMMAND_FLAG_INVERSE) { - if (!strncmp("0", argv[1], strlen("0")) || - !strncmp("disable", argv[1], strlen("disable")) || - !strncmp("disabled", argv[1], strlen("disabled"))) { - argv1 = "enabled"; - } else if (!strncmp("1", argv[1], strlen("1")) || - !strncmp("enable", argv[1], strlen("enable")) || - !strncmp("enabled", argv[1], strlen("enabled"))) { - argv1 = "disabled"; - } - } - - res = write_file(path_buff, sysfs_name, - argv1, argc > 2 ? argv[2] : NULL); - } - return res; }

@@ -253,7 +225,6 @@ int handle_sys_setting(struct state *state, int argc, char **argv) { struct settings_data *settings = state->cmd->arg; int optchar, res = EXIT_FAILURE; - char *path_buff;

while ((optchar = getopt(argc, argv, "h")) != -1) { switch (optchar) { @@ -266,55 +237,16 @@ int handle_sys_setting(struct state *state, int argc, char **argv) } }

- /* prepare the classic path */ - path_buff = malloc(PATH_BUFF_LEN); - if (!path_buff) { - fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); - return EXIT_FAILURE; - } - - switch (state->selector) { - case SP_NONE_OR_MESHIF: - case SP_MESHIF: - snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, - state->mesh_iface); - break; - case SP_VLAN: - /* if the specified interface is a VLAN then change the path to - * point to the proper "vlan%{vid}" subfolder in the sysfs tree. - */ - snprintf(path_buff, PATH_BUFF_LEN, SYS_VLAN_PATH, - state->mesh_iface, state->vid); - break; - case SP_HARDIF: - /* if a hard interface was specified then change the path to - * point to the proper ${hardif}/batman-adv path in the sysfs - * tree. - */ - snprintf(path_buff, PATH_BUFF_LEN, SYS_HARDIF_PATH, - state->hard_iface); - break; - } - - if (argc == 1) { - res = sys_read_setting(state, path_buff, settings->sysfs_name); - goto out; - } + if (argc == 1) + return sys_read_setting(state);

check_root_or_die("batctl");

if (settings->parse) { res = settings->parse(state, argc, argv); - if (res < 0) { - res = EXIT_FAILURE; - goto out; - } + if (res < 0) + return EXIT_FAILURE; }

- res = sys_write_setting(state, path_buff, settings->sysfs_name, argc, - argv); - -out: - free(path_buff); - return res; + return sys_write_setting(state); } diff --git a/sys.h b/sys.h index b4e4bca..ac7781f 100644 --- a/sys.h +++ b/sys.h @@ -18,18 +18,9 @@ #include "batman_adv.h" #include "netlink.h"

-#define SYS_BATIF_PATH_FMT "/sys/class/net/%s/mesh/" -#define SYS_IFACE_PATH "/sys/class/net" -#define SYS_IFACE_DIR SYS_IFACE_PATH"/%s/" -#define SYS_HARDIF_PATH SYS_IFACE_DIR "batman_adv/" -#define SYS_MESH_IFACE_FMT SYS_HARDIF_PATH "mesh_iface" -#define SYS_IFACE_STATUS_FMT SYS_HARDIF_PATH "iface_status" -#define SYS_VLAN_PATH SYS_IFACE_PATH"/%s/mesh/vlan%d/" -#define SYS_ROUTING_ALGO_FMT SYS_IFACE_PATH"/%s/mesh/routing_algo" #define VLAN_ID_MAX_LEN 4

struct settings_data { - const char *sysfs_name; void *data; int (*parse)(struct state *state, int argc, char *argv[]); int (*netlink_get)(struct state *state); diff --git a/throughput_override.c b/throughput_override.c index 13b5dce..f42d9de 100644 --- a/throughput_override.c +++ b/throughput_override.c @@ -101,7 +101,6 @@ static int set_throughput_override(struct state *state) }

static struct settings_data batctl_settings_throughput_override = { - .sysfs_name = "throughput_override", .data = &throughput_override, .parse = parse_throughput_override, .netlink_get = get_throughput_override,