commits March 2019

commits@lists.open-mesh.org

1 participants
63 discussions

[linux-merge]linux integration; annotated tag, v5.1-rc3, created. v5.1-rc3
by postmaster＠open-mesh.org 31 Mar '19

31 Mar '19

The annotated tag, v5.1-rc3 has been created at e40bc7462f998035ea03e93daab2e5b27ed22149 (tag) tagging 79a3aaa7b82e3106be97842dedfd8429248896e6 (commit) replaces v5.1-rc2 tagged by Linus Torvalds on Sun Mar 31 14:39:35 2019 -0700 - Shortlog ------------------------------------------------------------ Linux 5.1-rc3 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlyhM5ceHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiG7iEH/RSN8uIxLXrhI9yb cVQq1d/dLS+1vMEbjF35m+jkHOdty7ShLd6Qv5kaeqzIznvzhNaMZwUpoqlCn/Px vXeVH/e5eBBBw7EVCq+FqK22H/TNs10xidBR6bsP/VwrW4Rz3gBt2nsx7Hvpwrxx zCkC6E/qzRv1kkjsF85Zt0lIbFAex7Uk/+ZXK2zXKxk1Dp7Y6h5Aj+jmRByvaUwQ 0Syq1FDexUN3cI+dTmvYE8L/Dblyd2VONxnEXMOP3isk+poAwyVHWtkOzuL+myIz 5OoqSNdu8P02ldm7rEiXrqFNseZJK9sur4OOIg6CMdiXTG1q1QIY5hvUkX/R3tIZ 0E4wxXM= =hkav -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[openwrt-feed-devel] master: batctl-devel: add switch for setting multicast_fanout (632e987)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 632e98714ef4df9bf7af5393feb1cba13c5ca16b Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 28 21:29:46 2019 +0100 batctl-devel: add switch for setting multicast_fanout Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 632e98714ef4df9bf7af5393feb1cba13c5ca16b batctl-devel/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile index c22b1bd..3cd4fd1 100644 --- a/batctl-devel/Makefile +++ b/batctl-devel/Makefile @@ -105,6 +105,7 @@ config-n := \ log \ loglevel \ mcast_flags \ + multicast_fanout \ multicast_mode \ nc_nodes \ neighbors \ @@ -133,6 +134,7 @@ config-settings := \ interface \ isolation_mark \ loglevel \ + multicast_fanout \ multicast_mode \ network_coding \ orig_interval \

1 0

[openwrt-feed-devel] master: batman-adv-devel: Add support for multicast_fanout in batadv proto (96e1b8b)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 96e1b8b2cff6863a73348128bd78c36f0f7a7667 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 28 21:34:25 2019 +0100 batman-adv-devel: Add support for multicast_fanout in batadv proto Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 96e1b8b2cff6863a73348128bd78c36f0f7a7667 batman-adv-devel/files/lib/netifd/proto/batadv.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv.sh b/batman-adv-devel/files/lib/netifd/proto/batadv.sh index eb8153c..a7fe63c 100755 --- a/batman-adv-devel/files/lib/netifd/proto/batadv.sh +++ b/batman-adv-devel/files/lib/netifd/proto/batadv.sh @@ -22,6 +22,7 @@ proto_batadv_init_config() { proto_config_add_int 'hop_penalty' proto_config_add_string 'isolation_mark' proto_config_add_string 'log_level' + proto_config_add_int 'multicast_fanout' proto_config_add_boolean 'multicast_mode:bool' proto_config_add_boolean 'network_coding:bool' proto_config_add_int 'orig_interval' @@ -44,6 +45,7 @@ proto_batadv_setup() { local hop_penalty local isolation_mark local log_level + local multicast_fanout local multicast_mode local network_coding local orig_interval @@ -61,6 +63,7 @@ proto_batadv_setup() { json_get_vars hop_penalty json_get_vars isolation_mark json_get_vars log_level + json_get_vars multicast_fanout json_get_vars multicast_mode json_get_vars network_coding json_get_vars orig_interval @@ -100,6 +103,7 @@ proto_batadv_setup() { [ -n "$hop_penalty" ] && batctl -m "$iface" hop_penalty "$hop_penalty" [ -n "$isolation_mark" ] && batctl -m "$iface" isolation_mark "$isolation_mark" + [ -n "$multicast_fanout" ] && batctl -m "$iface" multicast_fanout "$multicast_fanout" [ -n "$multicast_mode" ] && batctl -m "$iface" multicast_mode "$multicast_mode" 2>&- [ -n "$network_coding" ] && batctl -m "$iface" network_coding "$network_coding" 2>&- [ -n "$log_level" ] && batctl -m "$iface" loglevel "$log_level" 2>&-

1 0

[openwrt-feed-devel] master: batman-adv-devel: Make sysfs support optional (b759df5)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit b759df59b3891fa454a1cba9400d7c2a7c32adad Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 28 21:44:27 2019 +0100 batman-adv-devel: Make sysfs support optional The sysfs files will be marked as deprecated in the near future. They are already replaced by the batadv generic netlink family. Add an Kconfig option to disable the sysfs support for users who want to test their tools or want to safe some space. This setting should currently still be enabled by default to keep backward compatible with legacy tools. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- b759df59b3891fa454a1cba9400d7c2a7c32adad batman-adv-devel/Config.in | 24 ++++++++++++------------ batman-adv-devel/Makefile | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 7ea862c..79beb3b 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -2,18 +2,6 @@ # Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich -# -# 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, see <http://www.gnu.org/licenses/>. # # B.A.T.M.A.N meshing protocol @@ -98,6 +86,18 @@ config BATMAN_ADV_DEVEL_DEBUG buffer. The output is controlled via the batadv netdev specific log_level setting. +config BATMAN_ADV_DEVEL_SYSFS + bool "batman-adv sysfs entries" + depends on PACKAGE_kmod-batman-adv-devel + default y + help + Say Y here if you want to enable batman-adv device configuration and + status interface through sysfs attributes. It is replaced by the + batadv generic netlink family but still used by various userspace + tools and scripts. + + If unsure, say Y. + config BATMAN_ADV_DEVEL_TRACING bool "B.A.T.M.A.N. tracing support" depends on PACKAGE_kmod-batman-adv-devel diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index bede8cc..de3cdb4 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -73,6 +73,7 @@ PKG_EXTRA_KCONFIG:= \ CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_BATMAN_ADV_DEVEL_MCAST),y,n) \ CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_BATMAN_ADV_DEVEL_NC),y,n) \ CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_DEVEL_BATMAN_V),y,n) \ + CONFIG_BATMAN_ADV_SYSFS=$(if $(CONFIG_BATMAN_ADV_DEVEL_SYSFS),y,n) \ CONFIG_BATMAN_ADV_TRACING=$(if $(CONFIG_BATMAN_ADV_DEVEL_TRACING),y,n) \ PKG_EXTRA_CFLAGS:= \

1 0

[alfred] master: alfred: Sync batadv_netlink_policy (1ce394b)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 1ce394b74135c63838d639a4855734cf0b199270 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 28 21:51:59 2019 +0100 alfred: Sync batadv_netlink_policy Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 1ce394b74135c63838d639a4855734cf0b199270 batman_adv.h | 7 +++++++ netlink.c | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/batman_adv.h b/batman_adv.h index e53f2b5..67f4636 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -473,6 +473,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/netlink.c b/netlink.c index eac8245..e8fe55e 100644 --- a/netlink.c +++ b/netlink.c @@ -86,6 +86,27 @@ struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_DAT_CACHE_VID] = { .type = NLA_U16 }, [BATADV_ATTR_MCAST_FLAGS] = { .type = NLA_U32 }, [BATADV_ATTR_MCAST_FLAGS_PRIV] = { .type = NLA_U32 }, + [BATADV_ATTR_VLANID] = { .type = NLA_U16 }, + [BATADV_ATTR_AGGREGATED_OGMS_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_AP_ISOLATION_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_ISOLATION_MARK] = { .type = NLA_U32 }, + [BATADV_ATTR_ISOLATION_MASK] = { .type = NLA_U32 }, + [BATADV_ATTR_BONDING_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_FRAGMENTATION_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_GW_BANDWIDTH_DOWN] = { .type = NLA_U32 }, + [BATADV_ATTR_GW_BANDWIDTH_UP] = { .type = NLA_U32 }, + [BATADV_ATTR_GW_MODE] = { .type = NLA_U8 }, + [BATADV_ATTR_GW_SEL_CLASS] = { .type = NLA_U32 }, + [BATADV_ATTR_HOP_PENALTY] = { .type = NLA_U8 }, + [BATADV_ATTR_LOG_LEVEL] = { .type = NLA_U32 }, + [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_MULTICAST_FANOUT] = { .type = NLA_U32 }, + [BATADV_ATTR_NETWORK_CODING_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_ORIG_INTERVAL] = { .type = NLA_U32 }, + [BATADV_ATTR_ELP_INTERVAL] = { .type = NLA_U32 }, + [BATADV_ATTR_THROUGHPUT_OVERRIDE] = { .type = NLA_U32 }, }; int missing_mandatory_attrs(struct nlattr *attrs[], const int mandatory[],

1 0

[alfred] master: alfred: Switch packet.h license to MIT (ca62397)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit ca623970258a05d758d68da187f0aaf20f8686ac Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Mar 3 15:52:04 2019 +0100 alfred: Switch packet.h license to MIT The ISC license is considered as not recommended in "Linux kernel licensing rules". It should only be used for existing code or for importing code from a different project with that license. Since we already use this license for the batman-adv related uapi headers, we should also use this for our packet.h. This fixes at the same time the SPDX license identifier which switched incorrectly to GPL-2.0 in commit ea81a05080bd ("alfred: Add SPDX license identifier above copyright header"). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- ca623970258a05d758d68da187f0aaf20f8686ac packet.h | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/packet.h b/packet.h index 4378694..e2112e4 100644 --- a/packet.h +++ b/packet.h @@ -1,21 +1,27 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: MIT */ /* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Sven Eckelmann * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * License-Filename: LICENSES/preferred/GPL-2.0 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * License-Filename: LICENSES/preferred/MIT */ #ifndef _ALFRED_PACKET_H

1 0

[alfred] master: alfred: Drop license boilerplate (62a2314)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 62a2314852b83b259cf4fa0017bfeeaad4c6b2d5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Mar 3 15:52:05 2019 +0100 alfred: Drop license boilerplate All files got a SPDX-License-Identifier with commit ea81a05080bd ("alfred: Add SPDX license identifier above copyright header"). All the required information about the license conditions can be found in LICENSES/. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 62a2314852b83b259cf4fa0017bfeeaad4c6b2d5 Makefile | 14 -------------- alfred.h | 14 -------------- batadv_query.c | 14 -------------- batadv_query.h | 14 -------------- batadv_querynl.c | 14 -------------- batadv_querynl.h | 14 -------------- batman_adv.h | 18 ------------------ bitops.h | 18 +----------------- client.c | 14 -------------- debugfs.c | 14 -------------- debugfs.h | 14 -------------- gpsd/Makefile | 14 -------------- gpsd/alfred-gpsd.c | 14 -------------- gpsd/alfred-gpsd.h | 14 -------------- hash.c | 14 -------------- hash.h | 14 -------------- list.h | 14 -------------- main.c | 14 -------------- netlink.c | 14 -------------- netlink.h | 14 -------------- netsock.c | 14 -------------- packet.h | 18 ------------------ recv.c | 14 -------------- send.c | 14 -------------- server.c | 14 -------------- unix_sock.c | 14 -------------- util.c | 14 -------------- vis/Makefile | 14 -------------- vis/vis.c | 14 -------------- vis/vis.h | 14 -------------- 30 files changed, 1 insertion(+), 431 deletions(-) diff --git a/Makefile b/Makefile index 0a54c1b..8840961 100755 --- a/Makefile +++ b/Makefile @@ -4,20 +4,6 @@ # # Copyright (C) 2012-2019 B.A.T.M.A.N. contributors # -# 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 # alfred build diff --git a/alfred.h b/alfred.h index 22d2897..c7ee518 100644 --- a/alfred.h +++ b/alfred.h @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * 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 */ diff --git a/batadv_query.c b/batadv_query.c index 7486bf4..fb72e77 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * 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 */ diff --git a/batadv_query.h b/batadv_query.h index fd7eb2e..7e93791 100644 --- a/batadv_query.h +++ b/batadv_query.h @@ -3,20 +3,6 @@ * * Simon Wunderlich, 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 */ #ifndef _BATADV_QUERY_H diff --git a/batadv_querynl.c b/batadv_querynl.c index 20ab8b3..d5e9402 100644 --- a/batadv_querynl.c +++ b/batadv_querynl.c @@ -3,20 +3,6 @@ * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * - * 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 */ diff --git a/batadv_querynl.h b/batadv_querynl.h index 565c0e1..e2066c2 100644 --- a/batadv_querynl.h +++ b/batadv_querynl.h @@ -3,20 +3,6 @@ * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * - * 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 */ diff --git a/batman_adv.h b/batman_adv.h index 305bf31..e53f2b5 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -2,24 +2,6 @@ /* Copyright (C) 2016-2019 B.A.T.M.A.N. contributors: * * Matthias Schiffer - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. */ #ifndef _UAPI_LINUX_BATMAN_ADV_H_ diff --git a/bitops.h b/bitops.h index c4dc5af..ead4a4f 100644 --- a/bitops.h +++ b/bitops.h @@ -4,23 +4,7 @@ * * Copyright (c) 2012-2019, Sven Eckelmann <sven(a)narfation.org> * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. + * License-Filename: LICENSES/preferred/MIT */ #ifndef __LINUX_LIKE_BITOPS_H__ diff --git a/client.c b/client.c index c3bd0cb..85a05ce 100644 --- a/client.c +++ b/client.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * 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 */ diff --git a/debugfs.c b/debugfs.c index 1cea8ac..5a71d65 100644 --- a/debugfs.c +++ b/debugfs.c @@ -2,20 +2,6 @@ /* Copyright (C) 2009 Clark Williams <williams(a)redhat.com> * Copyright (C) 2009 Xiao Guangrong <xiaoguangrong(a)cn.fujitsu.com> * - * 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 */ diff --git a/debugfs.h b/debugfs.h index 6e49efa..61384f9 100644 --- a/debugfs.h +++ b/debugfs.h @@ -2,20 +2,6 @@ /* Copyright (C) 2009 Clark Williams <williams(a)redhat.com> * Copyright (C) 2009 Xiao Guangrong <xiaoguangrong(a)cn.fujitsu.com> * - * 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 */ diff --git a/gpsd/Makefile b/gpsd/Makefile index 33129c1..81bf254 100755 --- a/gpsd/Makefile +++ b/gpsd/Makefile @@ -4,20 +4,6 @@ # # Copyright (C) 2013-2019 B.A.T.M.A.N. contributors # -# 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 # alfred-gpsd build diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 1db9ff9..6e9137c 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -3,20 +3,6 @@ * * Andrew Lunn, Simon Wunderlich * - * 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 */ diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 70fd2c4..85dcc72 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -3,20 +3,6 @@ * * Andrew Lunn, Simon Wunderlich * - * 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 */ diff --git a/hash.c b/hash.c index 778a7f4..02ac15e 100644 --- a/hash.c +++ b/hash.c @@ -3,20 +3,6 @@ * * Simon Wunderlich, 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 */ diff --git a/hash.h b/hash.h index d3fedb1..f5a8fb5 100644 --- a/hash.h +++ b/hash.h @@ -3,20 +3,6 @@ * * Simon Wunderlich, 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 */ #ifndef _BATMAN_HASH_H diff --git a/list.h b/list.h index f6c0cae..0fa634f 100644 --- a/list.h +++ b/list.h @@ -3,20 +3,6 @@ * * Linus Torvalds, ... * - * 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 */ diff --git a/main.c b/main.c index 6378c49..f633462 100644 --- a/main.c +++ b/main.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * 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 */ diff --git a/netlink.c b/netlink.c index ffc29f2..eac8245 100644 --- a/netlink.c +++ b/netlink.c @@ -3,20 +3,6 @@ * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * - * 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 */ diff --git a/netlink.h b/netlink.h index fcea003..26ad1e8 100644 --- a/netlink.h +++ b/netlink.h @@ -3,20 +3,6 @@ * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * - * 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 */ diff --git a/netsock.c b/netsock.c index 927e5cc..fcbc20b 100644 --- a/netsock.c +++ b/netsock.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * 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 */ diff --git a/packet.h b/packet.h index e2112e4..564afad 100644 --- a/packet.h +++ b/packet.h @@ -3,24 +3,6 @@ * * Simon Wunderlich, Sven Eckelmann * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * * License-Filename: LICENSES/preferred/MIT */ diff --git a/recv.c b/recv.c index a2e0602..e7c2c24 100644 --- a/recv.c +++ b/recv.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * 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 */ diff --git a/send.c b/send.c index f7f37d8..d4043bc 100644 --- a/send.c +++ b/send.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * 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 */ diff --git a/server.c b/server.c index 4cbbc7b..18109cc 100644 --- a/server.c +++ b/server.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * 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 */ diff --git a/unix_sock.c b/unix_sock.c index 25348e8..1d17cee 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * 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 */ diff --git a/util.c b/util.c index ed7407b..e14350e 100644 --- a/util.c +++ b/util.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * 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 */ diff --git a/vis/Makefile b/vis/Makefile index 50e6112..53d1f44 100755 --- a/vis/Makefile +++ b/vis/Makefile @@ -4,20 +4,6 @@ # # Copyright (C) 2013-2019 B.A.T.M.A.N. contributors # -# 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 # batadv-vis build diff --git a/vis/vis.c b/vis/vis.c index 3953475..beaeca1 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * 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 */ diff --git a/vis/vis.h b/vis/vis.h index d899f4e..6870dd4 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -3,20 +3,6 @@ * * Simon Wunderlich * - * 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 */

1 0

[batctl] master: batctl: add switch for setting multicast_fanout (1ca604d)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 1ca604d5a0f25217afb07d96fa8225d1ee298824 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Fri Feb 15 20:54:15 2019 +0100 batctl: add switch for setting multicast_fanout This patch adds an option for the new multicast_fanout setting in batman-adv. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 1ca604d5a0f25217afb07d96fa8225d1ee298824 Makefile | 1 + README.rst | 10 ++++++ batman_adv.h | 7 ++++ event.c | 4 +++ man/batctl.8 | 5 +++ multicast_fanout.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++ netlink.c | 1 + 7 files changed, 129 insertions(+) diff --git a/Makefile b/Makefile index 645d157..df8b7b9 100755 --- a/Makefile +++ b/Makefile @@ -55,6 +55,7 @@ $(eval $(call add_command,isolation_mark,y)) $(eval $(call add_command,log,y)) $(eval $(call add_command,loglevel,y)) $(eval $(call add_command,mcast_flags,y)) +$(eval $(call add_command,multicast_fanout,y)) $(eval $(call add_command,multicast_forceflood,y)) $(eval $(call add_command,multicast_mode,y)) $(eval $(call add_command,nc_nodes,y)) diff --git a/README.rst b/README.rst index e20c7c4..03ea5e5 100644 --- a/README.rst +++ b/README.rst @@ -478,6 +478,16 @@ Usage:: batctl multicast_forceflood|mff [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 e53f2b5..67f4636 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -473,6 +473,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/event.c b/event.c index 50d1cd0..c1eb435 100644 --- a/event.c +++ b/event.c @@ -270,6 +270,10 @@ static void event_parse_set_mesh(struct nlattr **attrs) printf("* log_level 0x%08x\n", nla_get_u32(attrs[BATADV_ATTR_LOG_LEVEL])); + if (attrs[BATADV_ATTR_MULTICAST_FANOUT]) + printf("* multicast_fanout %u\n", + nla_get_u32(attrs[BATADV_ATTR_MULTICAST_FANOUT])); + if (attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]) printf("* multicast_forceflood %s\n", u8_to_boolstr(attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED])); diff --git a/man/batctl.8 b/man/batctl.8 index 418bd96..8d7332a 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -111,6 +111,11 @@ disable multicast forceflood. This setting defines whether multicast optimizatio flooding of multicast packets. If set to non-zero then all nodes in the mesh are going to use classic flooding for any multicast packet with no optimizations. .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..cec42a3 --- /dev/null +++ b/multicast_fanout.c @@ -0,0 +1,101 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: + * + * Linus Lüssing <linus.luessing(a)c0d3.blue> + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include <errno.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> + +#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 = NULL, + .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"); diff --git a/netlink.c b/netlink.c index aa45f4f..792249f 100644 --- a/netlink.c +++ b/netlink.c @@ -109,6 +109,7 @@ struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_HOP_PENALTY] = { .type = NLA_U8 }, [BATADV_ATTR_LOG_LEVEL] = { .type = NLA_U32 }, [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_MULTICAST_FANOUT] = { .type = NLA_U32 }, [BATADV_ATTR_NETWORK_CODING_ENABLED] = { .type = NLA_U8 }, [BATADV_ATTR_ORIG_INTERVAL] = { .type = NLA_U32 }, [BATADV_ATTR_ELP_INTERVAL] = { .type = NLA_U32 },

1 0

[batctl] master: batctl: Drop license boilerplate (1c672a6)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 1c672a69c88dcaff37341dcc1c03afe9d17fc6f2 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Mar 3 15:52:06 2019 +0100 batctl: Drop license boilerplate All files got a SPDX-License-Identifier with commit 696ebd7be0a6 ("batctl: Add SPDX license identifier above copyright header"). All the required information about the license conditions can be found in LICENSES/. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- Makefile | 14 -------------- aggregation.c | 14 -------------- allocate.h | 14 -------------- ap_isolation.c | 14 -------------- backbonetable.c | 14 -------------- bat-hosts.c | 14 -------------- bat-hosts.h | 14 -------------- batadv_packet.h | 12 ------------ batman_adv.h | 18 ------------------ bisect_iv.c | 14 -------------- bisect_iv.h | 14 -------------- bonding.c | 14 -------------- bridge_loop_avoidance.c | 14 -------------- claimtable.c | 14 -------------- dat_cache.c | 14 -------------- debug.c | 14 -------------- debug.h | 14 -------------- debugfs.c | 14 -------------- debugfs.h | 14 -------------- distributed_arp_table.c | 14 -------------- event.c | 14 -------------- fragmentation.c | 14 -------------- functions.c | 14 -------------- functions.h | 14 -------------- gateways.c | 14 -------------- genl.c | 12 ------------ genl.h | 14 -------------- gw_mode.c | 14 -------------- hash.c | 14 -------------- hash.h | 14 -------------- hop_penalty.c | 14 -------------- icmp_helper.c | 14 -------------- icmp_helper.h | 14 -------------- interface.c | 14 -------------- isolation_mark.c | 14 -------------- list.h | 18 +----------------- log.c | 14 -------------- loglevel.c | 14 -------------- main.c | 14 -------------- main.h | 14 -------------- mcast_flags.c | 14 -------------- multicast_forceflood.c | 14 -------------- multicast_mode.c | 14 -------------- nc_nodes.c | 14 -------------- neighbors.c | 14 -------------- netlink.c | 14 -------------- netlink.h | 14 -------------- network_coding.c | 14 -------------- orig_interval.c | 14 -------------- originators.c | 14 -------------- ping.c | 14 -------------- routing_algo.c | 14 -------------- statistics.c | 14 -------------- sys.c | 14 -------------- sys.h | 14 -------------- tcpdump.c | 14 -------------- tcpdump.h | 14 -------------- throughputmeter.c | 14 -------------- traceroute.c | 14 -------------- transglobal.c | 14 -------------- translate.c | 14 -------------- translocal.c | 14 -------------- 62 files changed, 1 insertion(+), 871 deletions(-) Diff suppressed because of size. To see it, use: git diff-tree --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1c672a69c88dcaff37341dcc1c03afe9d17fc6f2

1 0

[batman-adv] master: MAINTAINERS: Add T(ree) field for batman-adv (db4530a8)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit db4530a81b1d045b93d88f404449915225f621d5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Mar 17 10:13:13 2019 +0100 MAINTAINERS: Add T(ree) field for batman-adv The linux-merge.git repository on git.open-mesh.org is used since 8 years to send PRs for net.git and net-next.git. It is time to officially specify list it as SCM tree. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- db4530a81b1d045b93d88f404449915225f621d5 MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index a828735e..4b1b53d5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7,6 +7,7 @@ W: https://www.open-mesh.org/ B: https://www.open-mesh.org/projects/batman-adv/issues C: irc://chat.freenode.net/batman Q: https://patchwork.open-mesh.org/project/batman/list/ +T: git https://git.open-mesh.org/linux-merge.git S: Maintained F: Documentation/ABI/obsolete/sysfs-class-net-batman-adv F: Documentation/ABI/obsolete/sysfs-class-net-mesh

1 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2019