From patchwork Thu Feb 14 12:54:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Linus_L=C3=BCssing?= X-Patchwork-Id: 17826 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 6947B81B85; Thu, 14 Feb 2019 13:54:26 +0100 (CET) Authentication-Results: open-mesh.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=c0d3.blue header.i=@c0d3.blue header.b="bjQsA/XQ"; dkim-atps=neutral Received-SPF: None (mailfrom) identity=mailfrom; client-ip=2a01:4f8:171:314c::100:a1; helo=mail.aperture-lab.de; envelope-from=linus.luessing@c0d3.blue; receiver= Received: from mail.aperture-lab.de (mail.aperture-lab.de [IPv6:2a01:4f8:171:314c::100:a1]) by open-mesh.org (Postfix) with ESMTPS id D891180679 for ; Thu, 14 Feb 2019 13:54:23 +0100 (CET) From: =?utf-8?q?Linus_L=C3=BCssing?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c0d3.blue; s=2018; t=1550148863; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=IeW9EhRTifw8xUeTvz/2I0wrmuezfiiFsDHi4M2ZBtY=; b=bjQsA/XQWV4S4HOwnkP/I3TqU/fga2jZCQnkqdoUyKGzI8LJwhY6jBPT/GY3ijNUT+zLd+ nIOVIw/5hP5MnxpYEY5bav8VVfDOX43iTabnRgcFc87gDY7uLkhD6gA7FpwSa0h9e26FdR OPTgKy2KTUnqYufaC9rLzm4QUo4NSlhz1mJSTV+thRbAXN5s4WuqarEQaUhLUwNgL5Vodg Ro51pGLRNPA/cuOIipLen9TJP/L7i9sWHnmk+DABFYHLoHaCa9hD5JyEthm46bQFz4O6PB 8rOHIhh0hhcysiQcsnzCrL1qXX3L5aD+HGHjx1jQsTol8eMMsnXP7KQUhzqOQw== To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 14 Feb 2019 13:54:15 +0100 Message-Id: <20190214125415.6472-1-linus.luessing@c0d3.blue> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=c0d3.blue; s=2018; t=1550148863; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=IeW9EhRTifw8xUeTvz/2I0wrmuezfiiFsDHi4M2ZBtY=; b=MmSQAifqyk8AywlToA8Zr/7iWNWgfvyMrj7H6falAIROS1n6f6g6ynopCB1V8eHKBf69js GXrJ2YUITbulBbHhbmGHVlJDvY32Bg0mAmOhOn86X2nWoFHuAAtymbs4tkeyFJexXqj+oT wmURAHYAm8rucAtmIBWb0VCF6Id5RkAy4H2YFI61BiDfm1ORyfME3ooZJZ1Au1Qx8G8Rk8 EyofdV83WO2TbetD4BPHeBeIEflQOs1k54ppBHQ0CeMdkFieMhpviiNCyVpqykF7brdUOt BmFdmKYjCsJGPMLRmXl3non7BLgeM6ZgmnvOJJcxm02arpQCRJizqKPxz/VXnA== ARC-Seal: i=1; s=2018; d=c0d3.blue; t=1550148863; a=rsa-sha256; cv=none; b=c8NfMgD0PrFSMrAZ6MsZ/ntV1D6OMzx9/7FPwGrJ8DD+JgyC9yyCQ3uzVPfQKh/i2NKpOY +yc3wReGcULl69o0BdYpg81suZv89yOOA4Vrf/x25dWkcbSMwfrhwk1bsVXiPNPJC94tFF jCW1Gr71QZ0xdBrN8IjNmNy5kyNSzd78uQwveRjzrK5/XSQhz4sd4oJE4OcbGFq+SMrkH/ vw4F9VfvTZp0+oI03mLUORuiO6NHmuzI25FrDHZ3KPike85nFAQoUZEsy/DCX3ZZlkBCor R+QLfDh9yrcY/8FW2CiZ64ZUYxFTD7PXbfjeaR4eDJXK7DXWXnRa3VPaVn2lKQ== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=linus.luessing@c0d3.blue smtp.mailfrom=linus.luessing@c0d3.blue Authentication-Results: ORIGINATING; auth=pass smtp.auth=linus.luessing@c0d3.blue smtp.mailfrom=linus.luessing@c0d3.blue Subject: [B.A.T.M.A.N.] [PATCH] batctl: add switch for setting multicast_fanout X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Cc: David Bauer Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" This patch adds an option for the new multicast_fanout setting in batman-adv. Signed-off-by: Linus Lüssing --- Makefile | 1 + README.rst | 10 +++++ batman_adv.h | 7 ++++ man/batctl.8 | 5 +++ multicast_fanout.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 138 insertions(+) create mode 100644 multicast_fanout.c diff --git a/Makefile b/Makefile index 4d8b709..15bc3ec 100755 --- a/Makefile +++ b/Makefile @@ -69,6 +69,7 @@ $(eval $(call add_command,log,y)) $(eval $(call add_command,loglevel,y)) $(eval $(call add_command,mcast_flags,y)) $(eval $(call add_command,multicast_mode,y)) +$(eval $(call add_command,multicast_fanout,y)) $(eval $(call add_command,nc_nodes,y)) $(eval $(call add_command,neighbors,y)) $(eval $(call add_command,network_coding,y)) diff --git a/README.rst b/README.rst index 4c0f544..a3a61ac 100644 --- a/README.rst +++ b/README.rst @@ -478,6 +478,16 @@ Usage:: batctl multicast_mode|mm [0|1] +batctl multicast_fanout +===================== + +display or modify the multicast fanout setting + +Usage:: + + batctl multicast_fanout|mo [fanout] + + batctl mcast_flags ================== diff --git a/batman_adv.h b/batman_adv.h index 9b12d2a..2f956e6 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -491,6 +491,13 @@ enum batadv_nl_attrs { */ BATADV_ATTR_THROUGHPUT_OVERRIDE, + /** + * @BATADV_ATTR_MULTICAST_FANOUT: defines the maximum number of packet + * copies that may be generated for a multicast-to-unicast conversion. + * Once this limit is exceeded distribution will fall back to broadcast. + */ + BATADV_ATTR_MULTICAST_FANOUT, + /* add attributes above here, update the policy in netlink.c */ /** diff --git a/man/batctl.8 b/man/batctl.8 index ed8e71f..92c0e32 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -105,6 +105,11 @@ disable network coding. 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 "\fBmulticast_fanout\fP|\fBmo\fP [\fBfanout\fP]" +If no parameter is given the current multicast fanout setting is displayed. Otherwise the parameter is used to set +the multicast fanout. The multicast fanout defines the maximum number of packet copies that may be generated for a +multicast-to-unicast conversion. Once this limit is exceeded distribution will fall back to broadcast. +.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/multicast_fanout.c b/multicast_fanout.c new file mode 100644 index 0000000..b48912b --- /dev/null +++ b/multicast_fanout.c @@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: + * + * Marek Lindner + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include +#include +#include +#include + +#include "main.h" +#include "sys.h" + +static struct multicast_fanout_data { + uint32_t multicast_fanout; +} multicast_fanout; + +static int parse_multicast_fanout(struct state *state, int argc, char *argv[]) +{ + struct settings_data *settings = state->cmd->arg; + struct multicast_fanout_data *data = settings->data; + char *endptr; + + if (argc != 2) { + fprintf(stderr, "Error - incorrect number of arguments (expected 1)\n"); + return -EINVAL; + } + + data->multicast_fanout = strtoul(argv[1], &endptr, 0); + if (!endptr || *endptr != '\0') { + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + return -EINVAL; + } + + return 0; +} + +static int print_multicast_fanout(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX + 1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct genlmsghdr *ghdr; + int *result = arg; + + if (!genlmsg_valid_hdr(nlh, 0)) + return NL_OK; + + ghdr = nlmsg_data(nlh); + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + return NL_OK; + } + + if (!attrs[BATADV_ATTR_MULTICAST_FANOUT]) + return NL_OK; + + printf("%u\n", nla_get_u32(attrs[BATADV_ATTR_MULTICAST_FANOUT])); + + *result = 0; + return NL_STOP; +} + +static int get_multicast_fanout(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_GET_MESH, + NULL, print_multicast_fanout); +} + +static int set_attrs_multicast_fanout(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + struct settings_data *settings = state->cmd->arg; + struct multicast_fanout_data *data = settings->data; + + nla_put_u32(msg, BATADV_ATTR_MULTICAST_FANOUT, data->multicast_fanout); + + return 0; +} + +static int set_multicast_fanout(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_SET_MESH, + set_attrs_multicast_fanout, NULL); +} + +static struct settings_data batctl_settings_multicast_fanout = { + .sysfs_name = "multicast_fanout", + .data = &multicast_fanout, + .parse = parse_multicast_fanout, + .netlink_get = get_multicast_fanout, + .netlink_set = set_multicast_fanout, +}; + +COMMAND_NAMED(SUBCOMMAND, multicast_fanout, "mo", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_settings_multicast_fanout, + "[fanout] \tdisplay or modify multicast_fanout setting");