From patchwork Tue Mar 11 20:04:32 2014 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: 3910 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=212.227.15.4; helo=mout.web.de; envelope-from=linus.luessing@web.de; receiver=b.a.t.m.a.n@lists.open-mesh.org Received: from mout.web.de (mout.web.de [212.227.15.4]) by open-mesh.org (Postfix) with ESMTPS id 0F98160028F for ; Tue, 11 Mar 2014 21:04:44 +0100 (CET) Received: from localhost ([89.244.64.60]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0LrKEG-1XJmdc0FuW-0134vx; Tue, 11 Mar 2014 21:04:44 +0100 From: =?UTF-8?q?Linus=20L=C3=BCssing?= To: b.a.t.m.a.n@lists.open-mesh.org Date: Tue, 11 Mar 2014 21:04:32 +0100 Message-Id: <1394568273-1117-1-git-send-email-linus.luessing@web.de> X-Mailer: git-send-email 1.9.0 MIME-Version: 1.0 X-Provags-ID: V03:K0:EonlExpQggPrQysP8xY6vz4XKPW17i6Tz4kNB+4KlLkiU7tJQml n7F79j19Y6itK1BRQ0yOBs0uOdlq4HDe6t9ZSsotKAn68euLv3pjiHaGF9WelHGKxDuoqdx kRNH4N96MuKtW5LTfqkc9T/HRTtf8L24RaI0eXOzzgy5s6p4qZiNrVWWsZRE7vcXBaRUB6X mxQ2bSuUWLJ7sgcH+f1ew== Subject: [B.A.T.M.A.N.] [PATCHv3 1/2] batctl: add switch for setting multicast_mode X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Mar 2014 20:04:45 -0000 This patch adds a switch for the new multicast_mode setting in batman-adv. Signed-off-by: Linus Lüssing --- v3: fix merge conflict (ordex was quicker with his isolation mark support patch :P) 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, };