commits

commits@lists.open-mesh.org

1 participants
12379 discussions

[doc] backup-redmine/2023-12-01,main: doc: open-mesh/Download (9ee4835a)
by postmaster＠open-mesh.org 01 Dec '23

01 Dec '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-12-01,main >--------------------------------------------------------------- commit 9ee4835aba220cc0f808e44950aa39cf33ffa666 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Nov 15 11:52:47 2023 +0000 doc: open-mesh/Download >--------------------------------------------------------------- 9ee4835aba220cc0f808e44950aa39cf33ffa666 open-mesh/Download.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-mesh/Download.textile b/open-mesh/Download.textile index b6652fb2..f816aabd 100644 --- a/open-mesh/Download.textile +++ b/open-mesh/Download.textile @@ -102,7 +102,7 @@ It follows an overview of linux versions and the batman-adv version they contain * linux 6.3 => batman-adv 2023.0 (get batctl 2023.0 from "here":https://downloads.open-mesh.org/batman/stable/sources/batctl/) * linux 6.4 => batman-adv 2023.1 (get batctl 2023.1 from "here":https://downloads.open-mesh.org/batman/stable/sources/batctl/) * linux 6.5 => batman-adv 2023.2 (get batctl 2023.2 from "here":https://downloads.open-mesh.org/batman/stable/sources/batctl/) -* linux 6.6 => batman-adv 2023.2 (get batctl 2023.2 from "here":https://downloads.open-mesh.org/batman/stable/sources/batctl/) +* linux 6.6 => batman-adv 2023.3 (get batctl 2023.3 from "here":https://downloads.open-mesh.org/batman/stable/sources/batctl/) * linux 6.7 => batman-adv 2023.3 (get batctl 2023.3 from "here":https://downloads.open-mesh.org/batman/stable/sources/batctl/) h2. Arch Linux

1 0

[doc] main: Merge branch 'backup-redmine/2023-12-01' (a4585a15)
by postmaster＠open-mesh.org 01 Dec '23

01 Dec '23

Repository : ssh://git@diktynna/doc On branch : main >--------------------------------------------------------------- commit a4585a153354581cdbcc50368c305ebfa0f54986 Merge: e3cf2301 9ee4835a Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Dec 1 16:54:03 2023 +0100 Merge branch 'backup-redmine/2023-12-01' >--------------------------------------------------------------- a4585a153354581cdbcc50368c305ebfa0f54986 open-mesh/Download.rst | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --cc open-mesh/Download.rst index 9cab22c9,00000000..eb1eaeed mode 100644,000000..100644 --- a/open-mesh/Download.rst +++ b/open-mesh/Download.rst @@@ -1,280 -1,0 +1,284 @@@ +.. SPDX-License-Identifier: GPL-2.0 + +Download B.A.T.M.A.N. +===================== + +We are currently working on different branches. To get the details about +the differences of these branches, see our :doc:`Branches Explained page <BranchesExplained>`. + +Please use the stable branch for your public infrastructure unless you +know exactly what you are doing and are prepared for the big unknown. + +.. _open-mesh-download-download-released-source-code: + +Download Released Source Code +----------------------------- + +- The latest version of batman-adv is - `batman-adv-2023.2.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ - `md5 <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ - `sha1 <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ - `asc <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ ++ `batman-adv-2023.3.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ ++ `md5 <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ ++ `sha1 <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ ++ `asc <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ +- The latest version of batctl (management and control tool for + batman-adv) is - `batctl-2023.2.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.2.…>`__ - `md5 <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.2.…>`__ - `sha1 <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.2.…>`__ - `asc <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.2.…>`__ ++ `batctl-2023.3.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.3.…>`__ ++ `md5 <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.3.…>`__ ++ `sha1 <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.3.…>`__ ++ `asc <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.3.…>`__ +- The latest version of alfred (Almighty Lightweight Fact Remote + Exchange Daemon) is - `alfred-2023.2.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.2.…>`__ - `md5 <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.2.…>`__ - `sha1 <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.2.…>`__ - `asc <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.2.…>`__ ++ `alfred-2023.3.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.3.…>`__ ++ `md5 <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.3.…>`__ ++ `sha1 <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.3.…>`__ ++ `asc <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.3.…>`__ + +- The latest stable version of batmand + (:ref:`unmaintained <open-mesh-BranchesExplained-batmand>`) is + `batman-0.3.2.tar.gz <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.t…>`__ + `md5 <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.t…>`__ + `sha1 <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.t…>`__ + `asc <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.t…>`__ +- The latest version of the vis server for the batmand (package not + needed for batman-adv) is + `vis-0.3.2.tar.gz <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.…>`__ + `md5 <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.…>`__ + `sha1 <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.…>`__ + `asc <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.…>`__ + +If you are wondering whether batman-adv or batmand might suit your setup +better, have a look at :doc:`this page </batman-adv/Wiki>`. Please note that +the development is focusing on batman-adv at the moment. + +To download previous release tarballs, simply check out our `download +section <https://downloads.open-mesh.org/batman/releases/>`__. + +If you find any bugs, please :doc:`let us know <Contribute>`! + +Git Repository Access +--------------------- + +Since we started integrating the batman-adv kernel module into the +mainline Linux tree, we maintain a git repository which contains the +batman-adv maintenance branches. More information can be found +:doc:`on our git page <UsingBatmanGit>`. +On overview about all the git repositories can be found on our `git +frontend <https://git.open-mesh.org>`__. We also host individual +repositories for development related to batman or meshing in general. +Feel free to contact us if you are interested in getting a repository +too. + +batman-adv in the Linux tree +---------------------------- + +Since linux 2.6.33 batman-adv is part of the official linux tree. You +can build batman-adv along with your linux binary by simply selecting +batman-adv in the Linux drivers section. If you want to have access to +the latest features on a non-bleeding edge kernel, you can clone our +git repository which still are backward compatible to all +stable/longterm kernels. + +It follows an overview of linux versions and the batman-adv version they +contain, so that you can easily pick the compatible batctl packages: + +- linux 2.6.33 => batman-adv 0.2.0 (get batctl 0.2.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 2.6.34 => batman-adv 0.2.1 (get batctl 0.2.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 2.6.35 => batman-adv 2010.0.x (get batctl 2010.0.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 2.6.36 => batman-adv 2010.1.x (get batctl 2010.1.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 2.6.37 => batman-adv 2010.2.x (get batctl 2010.2.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 2.6.38 => batman-adv 2011.0.x (get batctl 2011.0.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 2.6.39 => batman-adv 2011.1.x (get batctl 2011.1.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.0 => batman-adv 2011.2.x (get batctl 2011.2.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.1 => batman-adv 2011.3.x (get batctl 2011.3.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.2 => batman-adv 2011.4.x (get batctl 2011.4.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.3 => batman-adv 2012.0.x (get batctl 2012.0.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.4 => batman-adv 2012.1.x (get batctl 2012.1.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.5 => batman-adv 2012.2.x (get batctl 2012.2.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.6 => batman-adv 2012.3.x (get batctl 2012.3.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.7 => batman-adv 2012.4.x (get batctl 2012.4.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.8 => batman-adv 2013.0.x (get batctl 2013.0.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.9 => batman-adv 2013.1.x (get batctl 2013.1.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.10 => batman-adv 2013.2.x (get batctl 2013.2.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.11 => batman-adv 2013.3.x (get batctl 2013.3.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.12 => batman-adv 2013.4.x (get batctl 2013.4.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.13 => batman-adv 2014.0.x (get batctl 2014.0.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ + NOTE: in-kernel version number is 2013.5.0 +- linux 3.14 => batman-adv 2014.1.x (get batctl 2014.1.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.15 => batman-adv 2014.2.x (get batctl 2014.2.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.16 => batman-adv 2014.3.x (get batctl 2014.3.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.17-3.19 => batman-adv 2014.4.x (get batctl 2014.4.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.0-4.1 => batman-adv 2015.0 (get batctl 2015.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/>`__ +- linux 4.2-4.3 => batman-adv 2015.1 (get batctl 2015.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.4 => batman-adv 2015.2 (get batctl 2015.2 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.5 => batman-adv 2016.0 (get batctl 2016.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.6 => batman-adv 2016.1 (get batctl 2016.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.7 => batman-adv 2016.2 (get batctl 2016.2 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.8 => batman-adv 2016.3 (get batctl 2016.3 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.9 => batman-adv 2016.4 (get batctl 2016.4 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.10 => batman-adv 2016.5 (get batctl 2016.5 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.11 => batman-adv 2017.0.1 (get batctl 2017.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.12 => batman-adv 2017.1 (get batctl 2017.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.13 => batman-adv 2017.2 (get batctl 2017.2 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.14 => batman-adv 2017.3 (get batctl 2017.3 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.15 => batman-adv 2017.4 (get batctl 2017.4 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.16 => batman-adv 2018.0 (get batctl 2018.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.17 => batman-adv 2018.1 (get batctl 2018.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.18 => batman-adv 2018.2 (get batctl 2018.2 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.19 => batman-adv 2018.3 (get batctl 2018.3 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.20 => batman-adv 2018.4 (get batctl 2018.4 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.0 => batman-adv 2019.0 (get batctl 2019.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.1 => batman-adv 2019.1 (get batctl 2019.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.2 => batman-adv 2019.2 (get batctl 2019.2 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.3 => batman-adv 2019.3 (get batctl 2019.3 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.4 => batman-adv 2019.4 (get batctl 2019.4 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.5 => batman-adv 2019.5 (get batctl 2019.5 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.6 => batman-adv 2020.0 (get batctl 2020.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.7 => batman-adv 2020.1 (get batctl 2020.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.8 => batman-adv 2020.2 (get batctl 2020.2 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.9 => batman-adv 2020.3 (get batctl 2020.3 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.10 => batman-adv 2020.4 (get batctl 2020.4 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.11 => batman-adv 2021.0 (get batctl 2021.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.13 => batman-adv 2021.1 (get batctl 2021.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.14 => batman-adv 2021.2 (get batctl 2021.2 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.15 => batman-adv 2021.3 (get batctl 2021.3 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.16 => batman-adv 2021.4 (get batctl 2021.4 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.17 => batman-adv 2022.0 (get batctl 2022.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.18 => batman-adv 2022.1 (get batctl 2022.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 5.19 => batman-adv 2022.2 (get batctl 2022.2 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 6.1 => batman-adv 2022.3 (get batctl 2022.3 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 6.2 => batman-adv 2023.0 (get batctl 2023.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 6.3 => batman-adv 2023.0 (get batctl 2023.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 6.4 => batman-adv 2023.1 (get batctl 2023.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 6.5 => batman-adv 2023.2 (get batctl 2023.2 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ ++- linux 6.6 => batman-adv 2023.3 (get batctl 2023.3 from ++ `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ ++- linux 6.7 => batman-adv 2023.3 (get batctl 2023.3 from ++ `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ + +Arch Linux +---------- + +Batman-adv and Batctl are avaible in the +`AUR <https://wiki.archlinux.org/index.php/AUR>`__ as PKGBUILD: + +- `batctl <https://aur.archlinux.org/packages/batctl/>`__ - Latest + Batctl +- `batman-adv <https://aur.archlinux.org/packages/batman-adv/>`__ - + Latest Batman-adv +- `batman-adv-v14 <https://aur.archlinux.org/packages/batman-adv-v14/>`__ + - Last Batman-adv with compability-version 14 (2013.4) +- `batctl-v14 <https://aur.archlinux.org/packages/batctl-v14/>`__ - + Last Batctl with compability-version 14 (2013.4) + +Debian +------ + +Use apt-get (or any other dpkg frontend of choice) to install +B.A.T.M.A.N. onto your debian machine. Following packages are available: + +- `alfred <https://packages.debian.org/sid/alfred>`__ +- `batmand <https://packages.debian.org/sid/batmand>`__ +- `batctl <https://packages.debian.org/sid/batctl>`__ +- `linux <https://packages.debian.org/source/unstable/linux>`__ - + batman-advanced kernel module as `part of the + official <https://bugs.debian.org/622361>`__ kernel packages + +Similar packages are also available through `Ubuntu +universe <https://help.ubuntu.com/community/Repositories/Ubuntu>`__ . + +Gentoo +------ + +Use emerge to build B.A.T.M.A.N. on your gentoo machine. Following +ebuilds are available: + +- `net-misc/batctl <https://packages.gentoo.org/packages/net-misc/batctl>`__ +- `net-misc/batman-adv <https://packages.gentoo.org/packages/net-misc/batman-adv>`__ + +openSUSE +-------- + +- `network:utilities / + batctl <https://build.opensuse.org/package/show?package=batctl&project=network%3Aut…>`__ +- the batman-adv module is available as module in the official kernel + packages + +Building OpenWRT packages +------------------------- + +B.A.T.M.A.N. is also included in OpenWRT as a package. Download the +extra package feed, link the batman folder into your main OpenWRT svn +directory and use "make menuconfig" to select the B.A.T.M.A.N. flavor +you intend to use. This enables you to integrate B.A.T.M.A.N. seamlessly +into your builds (see :doc:`this page </batman-adv/Building-with-openwrt>` for +a detailed explanation). + +More information about how to build the OpenWRT toolchain is available +`here <https://wiki.openwrt.org/doc/howto/build>`__.

1 0

[linux-merge]linux integration; annotated tag, v6.7-rc3, created. v6.7-rc3
by postmaster＠open-mesh.org 27 Nov '23

27 Nov '23

The annotated tag, v6.7-rc3 has been created at 5b17c02f78c832014ef0acdddcd6e0480a3c2e77 (tag) tagging 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab (commit) replaces v6.7-rc2 tagged by Linus Torvalds on Sun Nov 26 19:59:33 2023 -0800 - Shortlog ------------------------------------------------------------ Linux 6.7-rc3 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmVkFCUeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiG2e4IAIMMxdUGC1RDpSk2 cNe2XfULYD8pNDT9Io6668jELSfFQe8ELv4QloFwDDCKk2EDZUZxr3crIX9rweYI D5xrAwY5uJQnAsRADEmWMUN0iWo3EX3G5OOUkJknGWvyPapByFvhDzzF2nZQ25xI HjJ9b0OTOVJxDYspCtK0g+CGFtBjCiGpLSe/V67zlLX4ptWh5noqPWQE9/dyyIFD Z2Jga3wQtsF1uvOx4g0tMzowTqaKMljf5R3t6LNT4yqmoxMdKGi4qgJQDp23vB36 KNmA/V4wQ+EDuD3QejebpuMCgZV7lYJxOlWtGt47/cF9z8wSp+8J92TUSzP23D4u 5yx5ihs= =2beF -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v6.7-rc2, created. v6.7-rc2
by postmaster＠open-mesh.org 19 Nov '23

19 Nov '23

The annotated tag, v6.7-rc2 has been created at 8488f2d61f9372a5ebd5aa1f02a580d37a7a6b08 (tag) tagging 98b1cc82c4affc16f5598d4fa14b1858671b2263 (commit) replaces v6.7-rc1 tagged by Linus Torvalds on Sun Nov 19 15:02:14 2023 -0800 - Shortlog ------------------------------------------------------------ Linux 6.7-rc2 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmVak/YeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGJjgIAKLFpmE6wZDgLHK+ y22tU5CRRzMSX5y3qeB2g9a0ZzM7qpmEx53aa+rm+k6N1Li9nq9nbVeeoE7G95qO eoI2Po4jxVT1opdKgFq9CZEls+QbfqblWjGH8kp5LR67cuYKH1spo8K8OjKupV8N glIbkPIVUcaLIp9AVv9dZX5ZCz9/efUqh+d4iRgHtg3jr5+sz7BzvcjfylNvIlj2 rj9z58lbPi0ZbM4v35rCJ7rsUhzYSuZmZU1bQ9z/C/Uh1P4MpCo8xveaod8VW3qi qWLgMZRb2ZPIGOzPh0OiNRBa3I3rNcJWP9j7XBZX51wPRQhY7MaD/sTzw6Z76/Pv egWTl9o= =/y28 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-next-pullrequest-20231115, created. batadv-next-pullrequest-20231115
by postmaster＠open-mesh.org 15 Nov '23

15 Nov '23

The annotated tag, batadv-next-pullrequest-20231115 has been created at 87443f2e367043f0d7cf95bd9f1a42a512d64cac (tag) tagging c3ed16a64c0b0a5b116c9753bf48496d49daffb5 (commit) replaces v6.6 tagged by Simon Wunderlich on Wed Nov 15 14:08:55 2023 +0100 - Shortlog ------------------------------------------------------------ This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Implement new multicast packet type, including its transmission, forwarding and parsing, by Linus Lüssing (3 patches) - Switch to new headers for sprintf and array size, by Sven Eckelmann (2 patches) -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAmVUwucWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoUABD/9IS2mmn9aRANgy7v1mMr3eUPte 4gFCef3xly1oRF8P7JK77pZwX3uX7HwSM7F56AKxzMjDMjPMWYZlBFB8sxVF6Q0/ JpIIcW0XSU4DHR7yzRaGOG7VSCfhIpshuHyJApFbJTs0jUxv6fnxn2pQREnfgcRd 36CMNwslJf/piTv70980UnLKJlzUwV738GkgYQ3yctKUFRSGStCzDNT/RwkjDZPs HZ+Y/kedsIYViZrDTokpT45XUbcp+hGaQ5DNbMVSn8CpnfhmoYdm3WWV4H3CI9Jl byZwncG+KN0dXzbc8TDH7AbdcuKZ3QcgZ09tS5kOB+Hxb3SOyHmXKLFob07+Op+d /C5aLn7QvHdwCOsPazSHYZbUEeOh4G4sfTog9f5j+nrZ1QYkINEocvFvKSxpjKia kOjNLooyKOD11l2acedGbEEh3k9+vBzJ6UOpPSe0bwTPwWRkUKpuWZw+aQ9rYAXw 7M8EwVpPELo1fmI5dxrV0ZKvMmO44mSzCv2Sx/iBK8/D8V0Wgde/ImV4hQ6aYtmv ffXx+myfG1C4xz49d23zMcB9Sj71qgwVCMujDYJfOTbyokKe40fmnaejIUapEWKq LWpKenq72GxpuI0pWgO5uYJzbDGdK2k9Xbo/92JN+ejAWbKEQbZWM0J5MXRuP+L2 uWDEvCHGqqyzov1dtg== =w0RC -----END PGP SIGNATURE----- Linus Lüssing (3): batman-adv: mcast: implement multicast packet reception and forwarding batman-adv: mcast: implement multicast packet generation batman-adv: mcast: shrink tracker packet after scrubbing Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (2): batman-adv: Switch to linux/sprintf.h batman-adv: Switch to linux/array_size.h ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] main,main: batctl: mcast_flags: update to current state (e35a470)
by postmaster＠open-mesh.org 15 Nov '23

15 Nov '23

Repository : ssh://git@diktynna/batctl On branches: main,main >--------------------------------------------------------------- commit e35a47062f7baefb49cf25c7d5f3d75fc3687e95 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Tue Aug 1 04:15:36 2023 +0200 batctl: mcast_flags: update to current state Add the new "P" flag, which signals support for the new batman-adv multicast packet type, to the "batctl mcast_flags" and "batctl tcpdump" outputs. The examples in the README.rst are updated, too, including a description for the R4 and R6 flags. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e35a47062f7baefb49cf25c7d5f3d75fc3687e95 README.rst | 88 +++++++++++++++++++++++++++++++++------------------------ batadv_packet.h | 45 +++++++++++++++++++++++++---- genl_json.c | 2 ++ mcast_flags.c | 8 ++++-- tcpdump.c | 5 ++-- 5 files changed, 100 insertions(+), 48 deletions(-) diff --git a/README.rst b/README.rst index 606d557..3495fba 100644 --- a/README.rst +++ b/README.rst @@ -323,15 +323,15 @@ Usage:: Example:: - Multicast flags (own flags: [U46]) + Multicast flags (own flags: [U46R4R6.]) * Bridged [U] U * No IGMP/MLD Querier [4/6]: ./. * Shadowing IGMP/MLD Querier [4/6]: 4/6 ------------------------------------------- Originator Flags - 02:04:64:a4:39:c1 [U..] - 02:04:64:a4:39:c2 [U..] - 02:04:64:a4:39:c3 [...] + 02:04:64:a4:39:c1 [U... . .] + 02:04:64:a4:39:c2 [...R4R6.] + 02:04:64:a4:39:c3 [.... . P] where @@ -348,6 +348,17 @@ U: 6: wants all IPv6 multicast traffic, meaning other nodes need to always forward any IPv6 multicast traffic to it +R4: + wants all routable IPv4 multicast traffic, meaning other nodes need to always + forward multicast traffic destined to 224.0.0.0/4 excluding 224.0.0.0/24 to + it +R6: + wants all routable IPv6 multicast traffic, meaning other nodes need to always + forward multicast traffic destined to ffXY::/16 with Y > 2 (scope greater + than link-local) to it +P: + the node either cannot handle batman-adv multicast packets with a multicast + tracker TVLV or one of its hard interfaces has an MTU smaller than 1280 bytes If a node does not have multicast optimizations available (e.g. old batman-adv version or optimizations not compiled in), therefore not announcing any @@ -930,39 +941,42 @@ Example:: $ batctl meshif bat0 mcast_flags_json | json_pp [ - { - "mcast_flags": { - "all_unsnoopables": true, - "raw": 1, - "want_all_ipv4": false, - "want_all_ipv6": false, - "want_no_rtr_ipv4": false, - "want_no_rtr_ipv6": false - }, - "orig_address": "9e:58:32:59:54:c3" - }, - { - "mcast_flags": { - "all_unsnoopables": true, - "raw": 1, - "want_all_ipv4": false, - "want_all_ipv6": false, - "want_no_rtr_ipv4": false, - "want_no_rtr_ipv6": false - }, - "orig_address": "32:12:17:0a:21:63" - }, - { - "mcast_flags": { - "all_unsnoopables": true, - "raw": 1, - "want_all_ipv4": false, - "want_all_ipv6": false, - "want_no_rtr_ipv4": false, - "want_no_rtr_ipv6": false - }, - "orig_address": "1a:34:8c:c4:fe:13" - }, + { + "mcast_flags" : { + "all_unsnoopables" : true, + "have_mc_ptype_capa" : true, + "raw" : 57, + "want_all_ipv4" : false, + "want_all_ipv6" : false, + "want_no_rtr_ipv4" : true, + "want_no_rtr_ipv6" : true + }, + "orig_address" : "02:04:64:a4:39:c1" + }, + { + "mcast_flags" : { + "all_unsnoopables" : false, + "have_mc_ptype_capa" : true, + "raw" : 40, + "want_all_ipv4" : false, + "want_all_ipv6" : false, + "want_no_rtr_ipv4" : true, + "want_no_rtr_ipv6" : false + }, + "orig_address" : "02:04:64:a4:39:c2" + }, + { + "mcast_flags" : { + "all_unsnoopables" : false, + "have_mc_ptype_capa" : false, + "raw" : 24, + "want_all_ipv4" : false, + "want_all_ipv6" : false, + "want_no_rtr_ipv4" : true, + "want_no_rtr_ipv6" : true + }, + "orig_address" : "02:04:64:a4:39:c3" + }, [...] ] diff --git a/batadv_packet.h b/batadv_packet.h index 9204e44..6e25753 100644 --- a/batadv_packet.h +++ b/batadv_packet.h @@ -116,6 +116,9 @@ enum batadv_icmp_packettype { * only need routable IPv4 multicast packets we signed up for explicitly * @BATADV_MCAST_WANT_NO_RTR6: we have no IPv6 multicast router and therefore * only need routable IPv6 multicast packets we signed up for explicitly + * @BATADV_MCAST_HAVE_MC_PTYPE_CAPA: we can parse, receive and forward + * batman-adv multicast packets with a multicast tracker TVLV. And all our + * hard interfaces have an MTU of at least 1280 bytes. */ enum batadv_mcast_flags { BATADV_MCAST_WANT_ALL_UNSNOOPABLES = 1UL << 0, @@ -123,6 +126,7 @@ enum batadv_mcast_flags { BATADV_MCAST_WANT_ALL_IPV6 = 1UL << 2, BATADV_MCAST_WANT_NO_RTR4 = 1UL << 3, BATADV_MCAST_WANT_NO_RTR6 = 1UL << 4, + BATADV_MCAST_HAVE_MC_PTYPE_CAPA = 1UL << 5, }; /* tt data subtypes */ @@ -174,14 +178,16 @@ enum batadv_bla_claimframe { * @BATADV_TVLV_TT: translation table tvlv * @BATADV_TVLV_ROAM: roaming advertisement tvlv * @BATADV_TVLV_MCAST: multicast capability tvlv + * @BATADV_TVLV_MCAST_TRACKER: multicast tracker tvlv */ enum batadv_tvlv_type { - BATADV_TVLV_GW = 0x01, - BATADV_TVLV_DAT = 0x02, - BATADV_TVLV_NC = 0x03, - BATADV_TVLV_TT = 0x04, - BATADV_TVLV_ROAM = 0x05, - BATADV_TVLV_MCAST = 0x06, + BATADV_TVLV_GW = 0x01, + BATADV_TVLV_DAT = 0x02, + BATADV_TVLV_NC = 0x03, + BATADV_TVLV_TT = 0x04, + BATADV_TVLV_ROAM = 0x05, + BATADV_TVLV_MCAST = 0x06, + BATADV_TVLV_MCAST_TRACKER = 0x07, }; #pragma pack(2) @@ -487,6 +493,25 @@ struct batadv_bcast_packet { */ }; +/** + * struct batadv_mcast_packet - multicast packet for network payload + * @packet_type: batman-adv packet type, part of the general header + * @version: batman-adv protocol version, part of the general header + * @ttl: time to live for this packet, part of the general header + * @reserved: reserved byte for alignment + * @tvlv_len: length of the appended tvlv buffer (in bytes) + */ +struct batadv_mcast_packet { + __u8 packet_type; + __u8 version; + __u8 ttl; + __u8 reserved; + __be16 tvlv_len; + /* "4 bytes boundary + 2 bytes" long to make the payload after the + * following ethernet header again 4 bytes boundary aligned + */ +}; + /** * struct batadv_coded_packet - network coded packet * @packet_type: batman-adv packet type, part of the general header @@ -628,6 +653,14 @@ struct batadv_tvlv_mcast_data { __u8 reserved[3]; }; +/** + * struct batadv_tvlv_mcast_tracker - payload of a multicast tracker tvlv + * @num_dests: number of subsequent destination originator MAC addresses + */ +struct batadv_tvlv_mcast_tracker { + __be16 num_dests; +}; + #pragma pack() #endif /* _UAPI_LINUX_BATADV_PACKET_H_ */ diff --git a/genl_json.c b/genl_json.c index 2be533d..4cb1baf 100644 --- a/genl_json.c +++ b/genl_json.c @@ -157,6 +157,8 @@ static void nljson_print_mcastflags(struct nlattr *attrs[], int idx) val & BATADV_MCAST_WANT_NO_RTR4 ? "true" : "false"); printf("\"want_no_rtr_ipv6\": %s,", val & BATADV_MCAST_WANT_NO_RTR6 ? "true" : "false"); + printf("\"have_mc_ptype_capa\": %s,", + val & BATADV_MCAST_HAVE_MC_PTYPE_CAPA ? "true" : "false"); printf("\"raw\": %"PRIu32, val); putchar('}'); } diff --git a/mcast_flags.c b/mcast_flags.c index 44344e0..7d4c1d6 100644 --- a/mcast_flags.c +++ b/mcast_flags.c @@ -80,12 +80,13 @@ static int mcast_flags_callback(struct nl_msg *msg, void *arg) if (attrs[BATADV_ATTR_MCAST_FLAGS]) { flags = nla_get_u32(attrs[BATADV_ATTR_MCAST_FLAGS]); - printf("[%c%c%c%s%s]\n", + printf("[%c%c%c%s%s%c]\n", flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES ? 'U' : '.', flags & BATADV_MCAST_WANT_ALL_IPV4 ? '4' : '.', flags & BATADV_MCAST_WANT_ALL_IPV6 ? '6' : '.', !(flags & BATADV_MCAST_WANT_NO_RTR4) ? "R4" : ". ", - !(flags & BATADV_MCAST_WANT_NO_RTR6) ? "R6" : ". "); + !(flags & BATADV_MCAST_WANT_NO_RTR6) ? "R6" : ". ", + !(flags & BATADV_MCAST_HAVE_MC_PTYPE_CAPA) ? 'P' : '.'); } else { printf("-\n"); } @@ -125,7 +126,7 @@ static int netlink_print_mcast_flags(struct state *state, char *orig_iface, } ret = asprintf(&header, - "Multicast flags (own flags: [%c%c%c%s%s])\n" + "Multicast flags (own flags: [%c%c%c%s%s%c])\n" "* Bridged [U]\t\t\t\t%c\n" "* No IGMP/MLD Querier [4/6]:\t\t%c/%c\n" "* Shadowing IGMP/MLD Querier [4/6]:\t%c/%c\n" @@ -136,6 +137,7 @@ static int netlink_print_mcast_flags(struct state *state, char *orig_iface, (mcast_flags & BATADV_MCAST_WANT_ALL_IPV6) ? '6' : '.', !(mcast_flags & BATADV_MCAST_WANT_NO_RTR4) ? "R4" : ". ", !(mcast_flags & BATADV_MCAST_WANT_NO_RTR6) ? "R6" : ". ", + !(mcast_flags & BATADV_MCAST_HAVE_MC_PTYPE_CAPA) ? 'P' : '.', bridged ? 'U' : '.', querier4, querier6, shadowing4, shadowing6, "Originator", "Flags"); diff --git a/tcpdump.c b/tcpdump.c index 9a830b2..debcb0a 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -231,12 +231,13 @@ static void batctl_tvlv_parse_mcast_v2(void *buff, ssize_t buff_len) flags = tvlv->flags; - printf("\tTVLV MCASTv2: [%c%c%c%s%s]\n", + printf("\tTVLV MCASTv2: [%c%c%c%s%s%c]\n", flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES ? 'U' : '.', flags & BATADV_MCAST_WANT_ALL_IPV4 ? '4' : '.', flags & BATADV_MCAST_WANT_ALL_IPV6 ? '6' : '.', !(flags & BATADV_MCAST_WANT_NO_RTR4) ? "R4" : ". ", - !(flags & BATADV_MCAST_WANT_NO_RTR6) ? "R6" : ". "); + !(flags & BATADV_MCAST_WANT_NO_RTR6) ? "R6" : ". ", + !(flags & BATADV_MCAST_HAVE_MC_PTYPE_CAPA) ? 'P' : '.'); } typedef void (*batctl_tvlv_parser_t)(void *buff, ssize_t buff_len);

1 0

[batctl] main,main: batctl: tcpdump: parse batman-adv mcast packet type (af2806d)
by postmaster＠open-mesh.org 15 Nov '23

15 Nov '23

Repository : ssh://git@diktynna/batctl On branches: main,main >--------------------------------------------------------------- commit af2806d8b3e5636a54341c8d91fe4a56ad2deb00 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Tue Aug 1 04:15:37 2023 +0200 batctl: tcpdump: parse batman-adv mcast packet type Implement a batctl tcpdump parsing of the new batman-adv multicast packet type, including its multicast tracker TVLV and encapsulated payload data. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- af2806d8b3e5636a54341c8d91fe4a56ad2deb00 tcpdump.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- tcpdump.h | 1 + 2 files changed, 119 insertions(+), 16 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index debcb0a..5e7c76c 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -57,7 +57,8 @@ static unsigned short dump_level_all = DUMP_TYPE_BATOGM | DUMP_TYPE_BATOGM2 | DUMP_TYPE_BATELP | DUMP_TYPE_BATICMP | DUMP_TYPE_BATUCAST | DUMP_TYPE_BATBCAST | DUMP_TYPE_BATUTVLV | DUMP_TYPE_BATFRAG | - DUMP_TYPE_NONBAT | DUMP_TYPE_BATCODED; + DUMP_TYPE_NONBAT | DUMP_TYPE_BATCODED | + DUMP_TYPE_BATMCAST; static unsigned short dump_level; static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed); @@ -82,6 +83,7 @@ static void tcpdump_usage(void) fprintf(stderr, " \t\t%3d - batman unicast tvlv packets\n", DUMP_TYPE_BATUTVLV); fprintf(stderr, " \t\t%3d - non batman packets\n", DUMP_TYPE_NONBAT); fprintf(stderr, " \t\t%3d - batman coded packets\n", DUMP_TYPE_BATCODED); + fprintf(stderr, " \t\t%3d - batman multicast packets\n", DUMP_TYPE_BATMCAST); fprintf(stderr, " \t\t%3d - batman ogm & non batman packets\n", DUMP_TYPE_BATOGM | DUMP_TYPE_NONBAT); } @@ -101,7 +103,8 @@ static int print_time(void) return 1; } -static void batctl_tvlv_parse_gw_v1(void *buff, ssize_t buff_len) +static void batctl_tvlv_parse_gw_v1(void *buff, ssize_t buff_len, + int read_opt __maybe_unused) { struct batadv_tvlv_gateway_data *tvlv = buff; uint32_t down, up; @@ -119,8 +122,9 @@ static void batctl_tvlv_parse_gw_v1(void *buff, ssize_t buff_len) down / 10, down % 10, up / 10, up % 10); } -static void batctl_tvlv_parse_dat_v1(void (*buff)__attribute__((unused)), - ssize_t buff_len) +static void batctl_tvlv_parse_dat_v1(void *buff __maybe_unused, + ssize_t buff_len, + int read_opt __maybe_unused) { if (buff_len != 0) { fprintf(stderr, "Warning - dropping received %s packet as it is not the correct size (0): %zu\n", @@ -131,8 +135,9 @@ static void batctl_tvlv_parse_dat_v1(void (*buff)__attribute__((unused)), printf("\tTVLV DATv1: enabled\n"); } -static void batctl_tvlv_parse_nc_v1(void (*buff)__attribute__((unused)), - ssize_t buff_len) +static void batctl_tvlv_parse_nc_v1(void *buff __maybe_unused, + ssize_t buff_len, + int read_opt __maybe_unused) { if (buff_len != 0) { fprintf(stderr, "Warning - dropping received %s packet as it is not the correct size (0): %zu\n", @@ -143,7 +148,8 @@ static void batctl_tvlv_parse_nc_v1(void (*buff)__attribute__((unused)), printf("\tTVLV NCv1: enabled\n"); } -static void batctl_tvlv_parse_tt_v1(void *buff, ssize_t buff_len) +static void batctl_tvlv_parse_tt_v1(void *buff, ssize_t buff_len, + int read_opt __maybe_unused) { struct batadv_tvlv_tt_data *tvlv = buff; struct batadv_tvlv_tt_vlan_data *vlan; @@ -183,7 +189,8 @@ static void batctl_tvlv_parse_tt_v1(void *buff, ssize_t buff_len) } } -static void batctl_tvlv_parse_roam_v1(void *buff, ssize_t buff_len) +static void batctl_tvlv_parse_roam_v1(void *buff, ssize_t buff_len, + int read_opt __maybe_unused) { struct batadv_tvlv_roam_adv *tvlv = buff; @@ -199,7 +206,8 @@ static void batctl_tvlv_parse_roam_v1(void *buff, ssize_t buff_len) } static void batctl_tvlv_parse_mcast_v1(void *buff __maybe_unused, - ssize_t buff_len) + ssize_t buff_len, + int read_opt __maybe_unused) { struct batadv_tvlv_mcast_data *tvlv = buff; uint8_t flags; @@ -218,7 +226,8 @@ static void batctl_tvlv_parse_mcast_v1(void *buff __maybe_unused, flags & BATADV_MCAST_WANT_ALL_IPV6 ? '6' : '.'); } -static void batctl_tvlv_parse_mcast_v2(void *buff, ssize_t buff_len) +static void batctl_tvlv_parse_mcast_v2(void *buff, ssize_t buff_len, + int read_opt __maybe_unused) { struct batadv_tvlv_mcast_data *tvlv = buff; uint8_t flags; @@ -240,7 +249,37 @@ static void batctl_tvlv_parse_mcast_v2(void *buff, ssize_t buff_len) !(flags & BATADV_MCAST_HAVE_MC_PTYPE_CAPA) ? 'P' : '.'); } -typedef void (*batctl_tvlv_parser_t)(void *buff, ssize_t buff_len); +static void +batctl_tvlv_parse_mcast_tracker_v1(void *buff, ssize_t buff_len, int read_opt) +{ + struct batadv_tvlv_mcast_tracker *tvlv = buff; + size_t tvlv_len = sizeof(*tvlv); + struct ether_addr *dst; + uint16_t num_dests; + + if (buff_len < (ssize_t)tvlv_len) { + fprintf(stderr, "Warning - dropping received %s packet as it is not the correct size (%zu): %zu\n", + "TVLV MCAST TRACKER v1", tvlv_len, buff_len); + return; + } + + num_dests = ntohs(tvlv->num_dests); + tvlv_len += num_dests * ETH_ALEN; + dst = (struct ether_addr *)(tvlv + 1); + + if (buff_len < (ssize_t)tvlv_len) { + fprintf(stderr, "Warning - dropping received %s packet as it is not the correct size (%zu): %zu\n", + "TVLV MCAST TRACKER v1 (with destinations)", tvlv_len, buff_len); + return; + } + + printf("\tTVLV MCAST TRACKER v1, destinations (%hu):\n", num_dests); + + for (int i = 0; i < num_dests; i++) + printf("\t\t%s\n", get_name_by_macaddr(dst++, read_opt)); +} + +typedef void (*batctl_tvlv_parser_t)(void *buff, ssize_t buff_len, int read_opt); static batctl_tvlv_parser_t tvlv_parser_get(uint8_t type, uint8_t version) { @@ -295,12 +334,20 @@ static batctl_tvlv_parser_t tvlv_parser_get(uint8_t type, uint8_t version) return NULL; } + case BATADV_TVLV_MCAST_TRACKER: + switch (version) { + case 1: + return batctl_tvlv_parse_mcast_tracker_v1; + default: + return NULL; + } + default: return NULL; } } -static void dump_tvlv(unsigned char *ptr, ssize_t tvlv_len) +static void dump_tvlv(unsigned char *ptr, ssize_t tvlv_len, int read_opt) { struct batadv_tvlv_hdr *tvlv_hdr; batctl_tvlv_parser_t parser; @@ -318,7 +365,7 @@ static void dump_tvlv(unsigned char *ptr, ssize_t tvlv_len) parser = tvlv_parser_get(tvlv_hdr->type, tvlv_hdr->version); if (parser) - parser(ptr, len); + parser(ptr, len, read_opt); /* go to the next container */ ptr += len; @@ -358,7 +405,7 @@ static void dump_batman_ucast_tvlv(unsigned char *packet_buff, ssize_t buff_len, buff_len - sizeof(struct ether_header), tvlv_len, tvlv_packet->ttl); - dump_tvlv((uint8_t *)(tvlv_packet + 1), tvlv_len); + dump_tvlv((uint8_t *)(tvlv_packet + 1), tvlv_len, read_opt); } static int dump_bla2_claim(struct ether_header *eth_hdr, @@ -779,7 +826,7 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int check_len -= sizeof(struct batadv_ogm_packet); LEN_CHECK(check_len, (size_t)tvlv_len, "BAT OGM TVLV (containers)"); - dump_tvlv((uint8_t *)(batman_ogm_packet + 1), tvlv_len); + dump_tvlv((uint8_t *)(batman_ogm_packet + 1), tvlv_len, read_opt); } static void dump_batman_ogm2(unsigned char *packet_buff, ssize_t buff_len, @@ -823,7 +870,7 @@ static void dump_batman_ogm2(unsigned char *packet_buff, ssize_t buff_len, check_len -= BATADV_OGM2_HLEN; LEN_CHECK(check_len, (size_t)tvlv_len, "BAT OGM2 TVLV (containers)"); - dump_tvlv((uint8_t *)(batman_ogm2 + 1), tvlv_len); + dump_tvlv((uint8_t *)(batman_ogm2 + 1), tvlv_len, read_opt); } static void dump_batman_elp(unsigned char *packet_buff, ssize_t buff_len, @@ -988,6 +1035,57 @@ static void dump_batman_bcast(unsigned char *packet_buff, ssize_t buff_len, int read_opt, time_printed); } +static void dump_batman_mcast(unsigned char *packet_buff, ssize_t buff_len, + int read_opt, int time_printed) +{ + struct batadv_mcast_packet *mcast_packet; + struct ether_header *ether_header; + uint8_t *tvlv_hdr; + ssize_t check_len; + size_t tvlv_len; + + check_len = (size_t)buff_len - sizeof(struct ether_header); + + LEN_CHECK(check_len, sizeof(*mcast_packet), "BAT MCAST"); + check_len -= sizeof(*mcast_packet); + + ether_header = (struct ether_header *)packet_buff; + mcast_packet = (struct batadv_mcast_packet *)(ether_header + 1); + tvlv_len = ntohs(mcast_packet->tvlv_len); + + LEN_CHECK(check_len, tvlv_len, "BAT MCAST TVLV (containers)"); + check_len -= tvlv_len; + + tvlv_hdr = (uint8_t *)(mcast_packet + 1); + + if (!time_printed) + time_printed = print_time(); + + printf("BAT %s > ", + get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt)); + + printf("%s: MCAST, ttl %hhu, ", + get_name_by_macaddr((struct ether_addr *)ether_header->ether_dhost, read_opt), + mcast_packet->ttl); + + /* batman-adv mcast packet's data payload is optional */ + if (check_len >= ETH_HLEN) { + ether_header = (struct ether_header *)(tvlv_hdr + tvlv_len); + + printf("%s > ", + get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt)); + printf("%s, ", + get_name_by_macaddr((struct ether_addr *)ether_header->ether_dhost, read_opt)); + + parse_eth_hdr((unsigned char *)ether_header, check_len, + read_opt, time_printed); + } else { + printf("\n"); + } + + dump_tvlv(tvlv_hdr, tvlv_len, read_opt); +} + static void dump_batman_coded(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { struct batadv_coded_packet *coded_packet; @@ -1106,6 +1204,10 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read if (dump_level & DUMP_TYPE_BATBCAST) dump_batman_bcast(packet_buff, buff_len, read_opt, time_printed); break; + case BATADV_MCAST: + if (dump_level & DUMP_TYPE_BATMCAST) + dump_batman_mcast(packet_buff, buff_len, read_opt, time_printed); + break; case BATADV_CODED: if (dump_level & DUMP_TYPE_BATCODED) dump_batman_coded(packet_buff, buff_len, read_opt, time_printed); diff --git a/tcpdump.h b/tcpdump.h index 527fb7f..be64aeb 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -34,6 +34,7 @@ #define DUMP_TYPE_BATFRAG 128 #define DUMP_TYPE_NONBAT 256 #define DUMP_TYPE_BATCODED 512 +#define DUMP_TYPE_BATMCAST 1024 #define IEEE80211_FCTL_FTYPE 0x0c00 #define IEEE80211_FCTL_TODS 0x0001

1 0

[batman-adv] main,main: batman-adv: Switch to linux/array_size.h (f33d7f72)
by postmaster＠open-mesh.org 15 Nov '23

15 Nov '23

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit f33d7f724675544a36b24c77f8d4b95d41252ae2 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 13 18:41:19 2023 +0100 batman-adv: Switch to linux/array_size.h The commit 3cd39bc3b11b ("kernel.h: Move ARRAY_SIZE() to a separate header") introduced a new header for the ARRAY_SIZE macro which was previously exposed via linux/kernel.h. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- f33d7f724675544a36b24c77f8d4b95d41252ae2 compat-include/linux/array_size.h | 20 ++++++++++++++++++++ net/batman-adv/main.c | 2 +- net/batman-adv/netlink.c | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/compat-include/linux/array_size.h b/compat-include/linux/array_size.h new file mode 100644 index 00000000..824ad011 --- /dev/null +++ b/compat-include/linux/array_size.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_ + +#include <linux/version.h> +#if LINUX_VERSION_IS_GEQ(6, 7, 0) +#include_next <linux/array_size.h> +#else +#include <linux/kernel.h> +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_ */ diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index e8c25583..5fc754b0 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -6,6 +6,7 @@ #include "main.h" +#include <linux/array_size.h> #include <linux/atomic.h> #include <linux/build_bug.h> #include <linux/byteorder/generic.h> @@ -20,7 +21,6 @@ #include <linux/init.h> #include <linux/ip.h> #include <linux/ipv6.h> -#include <linux/kernel.h> #include <linux/kobject.h> #include <linux/kref.h> #include <linux/list.h> diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 2b3da616..cda99753 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -7,6 +7,7 @@ #include "netlink.h" #include "main.h" +#include <linux/array_size.h> #include <linux/atomic.h> #include <linux/bitops.h> #include <linux/bug.h> @@ -20,7 +21,6 @@ #include <linux/if_ether.h> #include <linux/if_vlan.h> #include <linux/init.h> -#include <linux/kernel.h> #include <linux/limits.h> #include <linux/list.h> #include <linux/minmax.h>

1 0

[batman-adv] main,main: batman-adv: Switch to linux/sprintf.h (f0fb49c5)
by postmaster＠open-mesh.org 15 Nov '23

15 Nov '23

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit f0fb49c5ab70dfa064f0aa8d1c5d84f65e8cbc86 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Oct 30 16:28:02 2023 +0100 batman-adv: Switch to linux/sprintf.h The commit 39ced19b9e60 ("lib/vsprintf: split out sprintf() and friends") introduced a new header for the sprintf related functions which were previously exposed via linux/kernel.h. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- f0fb49c5ab70dfa064f0aa8d1c5d84f65e8cbc86 compat-include/linux/sprintf.h | 20 ++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/main.c | 1 + net/batman-adv/multicast.c | 2 +- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/compat-include/linux/sprintf.h b/compat-include/linux/sprintf.h new file mode 100644 index 00000000..d3823277 --- /dev/null +++ b/compat-include/linux/sprintf.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_SPRINTF_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_SPRINTF_H_ + +#include <linux/version.h> +#if LINUX_VERSION_IS_GEQ(6, 6, 0) +#include_next <linux/sprintf.h> +#else +#include <linux/kernel.h> +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SPRINTF_H_ */ diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 37ce6cfb..5f46ca3d 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -20,7 +20,6 @@ #include <linux/if_vlan.h> #include <linux/jhash.h> #include <linux/jiffies.h> -#include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h> @@ -31,6 +30,7 @@ #include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/sprintf.h> #include <linux/stddef.h> #include <linux/string.h> #include <linux/workqueue.h> diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index d26124bc..0ddd8b4b 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -18,7 +18,6 @@ #include <linux/in.h> #include <linux/ip.h> #include <linux/ipv6.h> -#include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h> @@ -29,6 +28,7 @@ #include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/sprintf.h> #include <linux/stddef.h> #include <linux/udp.h> #include <net/sock.h> diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 50b2bf2b..e8c25583 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -33,6 +33,7 @@ #include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/sprintf.h> #include <linux/stddef.h> #include <linux/string.h> #include <linux/workqueue.h> diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index d8ddb20f..2981a2ed 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -25,7 +25,6 @@ #include <linux/ip.h> #include <linux/ipv6.h> #include <linux/jiffies.h> -#include <linux/kernel.h> #include <linux/list.h> #include <linux/lockdep.h> #include <linux/netdevice.h> @@ -36,6 +35,7 @@ #include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/sprintf.h> #include <linux/stddef.h> #include <linux/string.h> #include <linux/types.h>

1 0

[batman-adv] main,main: batman-adv: mcast: shrink tracker packet after scrubbing (41eebd67)
by postmaster＠open-mesh.org 15 Nov '23

15 Nov '23

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit 41eebd67dc317925ba43df50d92af15ae8ea2151 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Thu Sep 7 03:09:10 2023 +0200 batman-adv: mcast: shrink tracker packet after scrubbing Remove all zero MAC address entries (00:00:00:00:00:00) from a multicast packet's tracker TVLV before transmitting it and update all headers accordingly. This way, instead of keeping the multicast packet at a constant size throughout its journey through the mesh, it will become more lightweight, smaller with every interested receiver on the way and on each splitting intersection. Which can save some valuable bandwidth. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 41eebd67dc317925ba43df50d92af15ae8ea2151 net/batman-adv/multicast_forw.c | 207 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 207 insertions(+) diff --git a/net/batman-adv/multicast_forw.c b/net/batman-adv/multicast_forw.c index a2c5c587..fafd6ba8 100644 --- a/net/batman-adv/multicast_forw.c +++ b/net/batman-adv/multicast_forw.c @@ -697,6 +697,212 @@ batadv_mcast_forw_scrub_dests(struct batadv_priv *bat_priv, } } +/** + * batadv_mcast_forw_shrink_fill() - swap slot with next non-zero destination + * @slot: the to be filled zero-MAC destination entry in a tracker TVLV + * @num_dests_slot: remaining entries in tracker TVLV from/including slot + * + * Searches for the next non-zero-MAC destination entry in a tracker TVLV after + * the given slot pointer. And if found, swaps it with the zero-MAC destination + * entry which the slot points to. + * + * Return: true if slot was swapped/filled successfully, false otherwise. + */ +static bool batadv_mcast_forw_shrink_fill(u8 *slot, u16 num_dests_slot) +{ + u16 num_dests_filler; + u8 *filler; + + /* sanity check, should not happen */ + if (!num_dests_slot) + return false; + + num_dests_filler = num_dests_slot - 1; + filler = slot + ETH_ALEN; + + /* find a candidate to fill the empty slot */ + batadv_mcast_forw_tracker_for_each_dest(filler, num_dests_filler) { + if (is_zero_ether_addr(filler)) + continue; + + ether_addr_copy(slot, filler); + eth_zero_addr(filler); + return true; + } + + return false; +} + +/** + * batadv_mcast_forw_shrink_pack_dests() - pack destinations of a tracker TVLV + * @skb: the batman-adv multicast packet to compact destinations in + * + * Compacts the originator destination MAC addresses in the multicast tracker + * TVLV of the given multicast packet. This is done by moving all non-zero + * MAC addresses in direction of the skb head and all zero MAC addresses in skb + * tail direction, within the multicast tracker TVLV. + * + * Return: The number of consecutive zero MAC address destinations which are + * now at the end of the multicast tracker TVLV. + */ +static int batadv_mcast_forw_shrink_pack_dests(struct sk_buff *skb) +{ + struct batadv_tvlv_mcast_tracker *mcast_tracker; + unsigned char *skb_net_hdr; + u16 num_dests_slot; + u8 *slot; + + skb_net_hdr = skb_network_header(skb); + mcast_tracker = (struct batadv_tvlv_mcast_tracker *)skb_net_hdr; + num_dests_slot = ntohs(mcast_tracker->num_dests); + + slot = (u8 *)mcast_tracker + sizeof(*mcast_tracker); + + batadv_mcast_forw_tracker_for_each_dest(slot, num_dests_slot) { + /* find an empty slot */ + if (!is_zero_ether_addr(slot)) + continue; + + if (!batadv_mcast_forw_shrink_fill(slot, num_dests_slot)) + /* could not find a filler, so we successfully packed + * and can stop - and must not reduce num_dests_slot! + */ + break; + } + + /* num_dests_slot is now the amount of reduced, zeroed + * destinations at the end of the tracker TVLV + */ + return num_dests_slot; +} + +/** + * batadv_mcast_forw_shrink_align_offset() - get new alignment offset + * @num_dests_old: the old, to be updated amount of destination nodes + * @num_dests_reduce: the number of destinations that were removed + * + * Calculates the amount of potential extra alignment offset that is needed to + * adjust the TVLV padding after the change in destination nodes. + * + * Return: + * 0: If no change to padding is needed. + * 2: If padding needs to be removed. + * -2: If padding needs to be added. + */ +static short +batadv_mcast_forw_shrink_align_offset(unsigned int num_dests_old, + unsigned int num_dests_reduce) +{ + /* even amount of removed destinations -> no alignment change */ + if (!(num_dests_reduce % 2)) + return 0; + + /* even to odd amount of destinations -> remove padding */ + if (!(num_dests_old % 2)) + return 2; + + /* odd to even amount of destinations -> add padding */ + return -2; +} + +/** + * batadv_mcast_forw_shrink_update_headers() - update shrunk mc packet headers + * @skb: the batman-adv multicast packet to update headers of + * @num_dests_reduce: the number of destinations that were removed + * + * This updates any fields of a batman-adv multicast packet that are affected + * by the reduced number of destinations in the multicast tracket TVLV. In + * particular this updates: + * + * The num_dest field of the multicast tracker TVLV. + * The TVLV length field of the according generic TVLV header. + * The batman-adv multicast packet's total TVLV length field. + * + * Return: The offset in skb's tail direction at which the new batman-adv + * multicast packet header needs to start. + */ +static unsigned int +batadv_mcast_forw_shrink_update_headers(struct sk_buff *skb, + unsigned int num_dests_reduce) +{ + struct batadv_tvlv_mcast_tracker *mcast_tracker; + struct batadv_mcast_packet *mcast_packet; + struct batadv_tvlv_hdr *tvlv_hdr; + unsigned char *skb_net_hdr; + unsigned int offset; + short align_offset; + u16 num_dests; + + skb_net_hdr = skb_network_header(skb); + mcast_tracker = (struct batadv_tvlv_mcast_tracker *)skb_net_hdr; + num_dests = ntohs(mcast_tracker->num_dests); + + align_offset = batadv_mcast_forw_shrink_align_offset(num_dests, + num_dests_reduce); + offset = ETH_ALEN * num_dests_reduce + align_offset; + num_dests -= num_dests_reduce; + + /* update tracker header */ + mcast_tracker->num_dests = htons(num_dests); + + /* update tracker's tvlv header's length field */ + tvlv_hdr = (struct batadv_tvlv_hdr *)(skb_network_header(skb) - + sizeof(*tvlv_hdr)); + tvlv_hdr->len = htons(ntohs(tvlv_hdr->len) - offset); + + /* update multicast packet header's tvlv length field */ + mcast_packet = (struct batadv_mcast_packet *)skb->data; + mcast_packet->tvlv_len = htons(ntohs(mcast_packet->tvlv_len) - offset); + + return offset; +} + +/** + * batadv_mcast_forw_shrink_move_headers() - move multicast headers by offset + * @skb: the batman-adv multicast packet to move headers for + * @offset: a non-negative offset to move headers by, towards the skb tail + * + * Moves the batman-adv multicast packet header, its multicast tracker TVLV and + * any TVLVs in between by the given offset in direction towards the tail. + */ +static void +batadv_mcast_forw_shrink_move_headers(struct sk_buff *skb, unsigned int offset) +{ + struct batadv_tvlv_mcast_tracker *mcast_tracker; + unsigned char *skb_net_hdr; + unsigned int len; + u16 num_dests; + + skb_net_hdr = skb_network_header(skb); + mcast_tracker = (struct batadv_tvlv_mcast_tracker *)skb_net_hdr; + num_dests = ntohs(mcast_tracker->num_dests); + len = skb_network_offset(skb) + sizeof(*mcast_tracker); + len += num_dests * ETH_ALEN; + + batadv_mcast_forw_scrape(skb, len, offset); +} + +/** + * batadv_mcast_forw_shrink_tracker() - remove zero addresses in a tracker tvlv + * @skb: the batman-adv multicast packet to (potentially) shrink + * + * Removes all destinations with a zero MAC addresses (00:00:00:00:00:00) from + * the given batman-adv multicast packet's tracker TVLV and updates headers + * accordingly to maintain a valid batman-adv multicast packet. + */ +static void batadv_mcast_forw_shrink_tracker(struct sk_buff *skb) +{ + unsigned int offset; + u16 dests_reduced; + + dests_reduced = batadv_mcast_forw_shrink_pack_dests(skb); + if (!dests_reduced) + return; + + offset = batadv_mcast_forw_shrink_update_headers(skb, dests_reduced); + batadv_mcast_forw_shrink_move_headers(skb, offset); +} + /** * batadv_mcast_forw_packet() - forward a batman-adv multicast packet * @bat_priv: the bat priv with all the soft interface information @@ -786,6 +992,7 @@ static int batadv_mcast_forw_packet(struct batadv_priv *bat_priv, batadv_mcast_forw_scrub_dests(bat_priv, neigh_node, dest, next_dest, num_dests); + batadv_mcast_forw_shrink_tracker(nexthop_skb); batadv_inc_counter(bat_priv, BATADV_CNT_MCAST_TX); batadv_add_counter(bat_priv, BATADV_CNT_MCAST_TX_BYTES,

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits