commits

commits@lists.open-mesh.org

1 participants
12395 discussions

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

19 Feb '23

The annotated tag, v6.2 has been created at 32758e7a720e4752a824c6062e75f107314e5598 (tag) tagging c9c3395d5e3dcc6daee66c6908354d47bf98cb0c (commit) replaces v6.2-rc8 tagged by Linus Torvalds on Sun Feb 19 14:24:22 2023 -0800 - Shortlog ------------------------------------------------------------ Linux 6.2 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmPyoZYeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGcE0H/1imH5XOfowBdPQU p06pCJGKQyEsGnn+kXd7UXes9N/uZFQgOzY9sFspS1ZpXfm60zDcWCeJT2l3qatK dtmAGxTEBeZJ8JuevtBiedWy9pJPpvMsfeZd85XzGDRxNUnGT5HgU0/98NpIjysb 9HTPrpJO9HlmoAKkFDu+Z/kLJp+obns1yQOCH5glOREsPY+4SX76bjPjrbSic0oj oDSSBpM2gfdwHWnOKkXhgNuu8zr+hS3LaU1HMj6Kgy3Huz2NjGlgXrRpzutTHEmT cmt3Dl5hdIeUtMCt8LbQcngjTg/rX11rFdWaOp/MOuD6U7cqTCWeEDyVsPicFehH wdsIfgw= =+SoL -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v6.2-rc8, created. v6.2-rc8
by postmaster＠open-mesh.org 12 Feb '23

12 Feb '23

The annotated tag, v6.2-rc8 has been created at 51c32cc368b00aae605286cad9150cefa0adbf2d (tag) tagging ceaa837f96adb69c0df0397937cd74991d5d821a (commit) replaces v6.2-rc7 tagged by Linus Torvalds on Sun Feb 12 14:10:17 2023 -0800 - Shortlog ------------------------------------------------------------ Linux 6.2-rc8 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmPpY8keHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGjnIH/2/iQpNv4ZtOJpXx qwlxj2z475qqrd3WFW6998JUxxUqKVU9Ucmoab5VuWMAe3Qc5PaqT5v7UbriJLhr sthBs8Hs3Jf8dcKBr2jcuhVSw6KMappaEORxUZma5Rh8QzpKWAEuZYWZIk5qmWnm gkubPe4dfbfGd2OudRH5VeeGvbFk7gTskyr4onbb8/p5l1BfNTqNti31oLZj+Dut j5XGxKEd1xwdhOUXwejwxGOd2I8Bt5GViB5SqIDW9ymTQDVIT3CEZtN+3FSjmonV gQ4LcTq1hVlJDToCiEt8jE/yQv3ElFc+FDqMmIXc128uPoNpiEK86Xm5OZG9O5Ps zGTn5AU= =mBjG -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[doc] main: Merge branch 'backup-redmine/2023-02-10' (0edcc47f)
by postmaster＠open-mesh.org 10 Feb '23

10 Feb '23

Repository : ssh://git@diktynna/doc On branch : main >--------------------------------------------------------------- commit 0edcc47f10b22d955ff67445bbfab140998eb825 Merge: 9cabd560 16f4a0c6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 10 18:56:55 2023 +0100 Merge branch 'backup-redmine/2023-02-10' >--------------------------------------------------------------- 0edcc47f10b22d955ff67445bbfab140998eb825 open-mesh/Download.rst | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --cc open-mesh/Download.rst index 2f13f2e4,00000000..96d1089c mode 100644,000000..100644 --- a/open-mesh/Download.rst +++ b/open-mesh/Download.rst @@@ -1,272 -1,0 +1,274 @@@ +.. 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-2022.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…>`__ ++ `batman-adv-2023.0.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-2022.3.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2022.3.…>`__ - `md5 <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2022.3.…>`__ - `sha1 <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2022.3.…>`__ - `asc <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2022.3.…>`__ ++ `batctl-2023.0.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.0.…>`__ ++ `md5 <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.0.…>`__ ++ `sha1 <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.0.…>`__ ++ `asc <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.0.…>`__ +- The latest version of alfred (Almighty Lightweight Fact Remote + Exchange Daemon) is - `alfred-2022.3.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.3.…>`__ - `md5 <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.3.…>`__ - `sha1 <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.3.…>`__ - `asc <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.3.…>`__ ++ `alfred-2023.0.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.0.…>`__ ++ `md5 <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.0.…>`__ ++ `sha1 <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.0.…>`__ ++ `asc <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.0.…>`__ + +- 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/)>`__ + +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

[doc] backup-redmine/2023-02-10,main: doc: open-mesh/Download (16f4a0c6)
by postmaster＠open-mesh.org 10 Feb '23

10 Feb '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-02-10,main >--------------------------------------------------------------- commit 16f4a0c69b09964bdec27e72a9173ff6a4373fea Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Jan 26 15:49:36 2023 +0000 doc: open-mesh/Download >--------------------------------------------------------------- 16f4a0c69b09964bdec27e72a9173ff6a4373fea open-mesh/Download.textile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/open-mesh/Download.textile b/open-mesh/Download.textile index 736cecad..8b6aff49 100644 --- a/open-mesh/Download.textile +++ b/open-mesh/Download.textile @@ -7,9 +7,9 @@ Please use the stable branch for your public infrastructure unless you know exac h2. Download Released Source Code -* The latest version of [[batman-adv:Wiki|batman-adv]] is "batman-adv-2022.3.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2022.3.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2022.3.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2022.3.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2022.3.tar.gz.asc -* The latest version of batctl (management and control tool for batman-adv) is "batctl-2022.3.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2022.3.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2022.3.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2022.3.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2022.3.tar.gz.asc -* The latest version of alfred (Almighty Lightweight Fact Remote Exchange Daemon) is "alfred-2022.3.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.3.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.3.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.3.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.3.tar.gz.asc +* The latest version of [[batman-adv:Wiki|batman-adv]] is "batman-adv-2023.0.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.0.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.0.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.0.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.0.tar.gz.asc +* The latest version of batctl (management and control tool for batman-adv) is "batctl-2023.0.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.0.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.0.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.0.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2023.0.tar.gz.asc +* The latest version of alfred (Almighty Lightweight Fact Remote Exchange Daemon) is "alfred-2023.0.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.0.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.0.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.0.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2023.0.tar.gz.asc * The latest stable version of batmand ([[open-mesh:BranchesExplained#batmand|unmaintained]]) is "batman-0.3.2.tar.gz":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz "md5":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz.asc * 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.gz "md5":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz.asc @@ -98,7 +98,7 @@ It follows an overview of linux versions and the batman-adv version they contain * linux 5.19 => batman-adv 2022.2 (get batctl 2022.2 from "here":https://downloads.open-mesh.org/batman/stable/sources/batctl/) * linux 6.0 => batman-adv 2022.3 (get batctl 2022.3 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/) h2. Arch Linux

1 0

[doc] backup-redmine/2023-02-10,main: doc: open-mesh/News-draft (506203a1)
by postmaster＠open-mesh.org 10 Feb '23

10 Feb '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-02-10,main >--------------------------------------------------------------- commit 506203a192f52a554b18034c472ec58bc19714ee Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Jan 23 09:10:59 2023 +0000 doc: open-mesh/News-draft >--------------------------------------------------------------- 506203a192f52a554b18034c472ec58bc19714ee open-mesh/News-draft.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-mesh/News-draft.textile b/open-mesh/News-draft.textile index 270c1ba1..c03d65bb 100644 --- a/open-mesh/News-draft.textile +++ b/open-mesh/News-draft.textile @@ -103,7 +103,7 @@ $ git log --no-merges "${range}"|grep -e '\(Reported\|Tested\|Acked\|Reviewed-by 2023.0 (2023-01-10) =================== -* (no changes) +* add support for gpsd 3.25 </pre>

1 0

[doc] backup-redmine/2023-02-10,main: doc: open-mesh/News-draft (43ddd98b)
by postmaster＠open-mesh.org 10 Feb '23

10 Feb '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-02-10,main >--------------------------------------------------------------- commit 43ddd98b5a24c26225394a81c86bcc5742efb5aa Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Jan 26 15:39:39 2023 +0000 doc: open-mesh/News-draft >--------------------------------------------------------------- 43ddd98b5a24c26225394a81c86bcc5742efb5aa open-mesh/News-draft.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-mesh/News-draft.textile b/open-mesh/News-draft.textile index c03d65bb..0ad95890 100644 --- a/open-mesh/News-draft.textile +++ b/open-mesh/News-draft.textile @@ -1,4 +1,4 @@ -h1. DRAFT: Batman-adv 2023.3 released +h1. DRAFT: Batman-adv 2023.0 released Jan 10th, 2023. Today the B.A.T.M.A.N. team publishes the January 2023 update to batman-adv! Support for new kernel versions was integrated.

1 0

[doc] backup-redmine/2023-02-10,main: doc: batman-adv/Batman-adv-openwrt-config (405a4de2)
by postmaster＠open-mesh.org 10 Feb '23

10 Feb '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-02-10,main >--------------------------------------------------------------- commit 405a4de28b097506dcb8f179460dfaef41c8bdc9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jan 14 11:03:49 2023 +0000 doc: batman-adv/Batman-adv-openwrt-config >--------------------------------------------------------------- 405a4de28b097506dcb8f179460dfaef41c8bdc9 batman-adv/Batman-adv-openwrt-config.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv/Batman-adv-openwrt-config.textile b/batman-adv/Batman-adv-openwrt-config.textile index 008529e7..c89467b7 100644 --- a/batman-adv/Batman-adv-openwrt-config.textile +++ b/batman-adv/Batman-adv-openwrt-config.textile @@ -12,7 +12,7 @@ The batman-adv OpenWrt support provides three different protos: * batadv_hardif ** network interface used by batadv meshif to transport the batman-adv packets -** it is assignedt to the batadv meshif +** it is assigned to the batadv meshif * batadv (meshif/softif) ** virtual interface that emulates a normal 802.3 interface on top ** encapsulates traffic and forwards it via the batadv hardifs

1 0

[linux-merge]linux integration; annotated tag, v6.2-rc7, created. v6.2-rc7
by postmaster＠open-mesh.org 05 Feb '23

05 Feb '23

The annotated tag, v6.2-rc7 has been created at 53b3c6467004c627f42d96ef839b223a749bcdd9 (tag) tagging 4ec5183ec48656cec489c49f989c508b68b518e3 (commit) replaces v6.2-rc6 tagged by Linus Torvalds on Sun Feb 5 13:13:28 2023 -0800 - Shortlog ------------------------------------------------------------ Linux 6.2-rc7 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmPgG/geHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGidAH/j0pUbmniNM3aft8 5O1XxltlOZgqxju8OQhkiuX9VnQuuSeTNhAuj6jfcQOLpXDvlKsVfrpBxEfXalML yead9QAy/OT3hNGQxifMQzGbsmaWH1kgxxnv2lKo2eNP5KYZ+rec+IgtQhgX9quN q/N/ymd2/ju9AEOVRYwG1PD1EiIwTd3xPfBZl4Z35J+Ym+6NRrlXmN6J9LwslXmJ /P4cwgdf9/TuYAB96EshRHsZ4Tk/Gxkn15uyhLaWBmrZ/LAF5JGbClEfFlCWgjwv F5SGv3F+O6HSv49W9a24XtenE+3tw78AbCdqKZyzbb2whhv1eY99vKSbGnCahc/y O0VBP/g= =YoPk -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, base/net-next, updated. batadv-next-pullrequest-20230127
by postmaster＠open-mesh.org 04 Feb '23

04 Feb '23

The following commit has been merged in the base/net-next branch: commit 55307f51f48e192560252b70c8b0fb504b84bc3c Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Sat Dec 17 12:13:24 2022 +0100 batman-adv: Start new development cycle This version will contain all the (major or even only minor) changes for Linux 6.3. The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0). Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index c48803b32bb0..156ed39eded1 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2022.3" +#define BATADV_SOURCE_VERSION "2023.1" #endif /* B.A.T.M.A.N. parameters */ -- linux integration

1 0

[linux-merge]linux integration; branch, base/net-next, updated. batadv-next-pullrequest-20230127
by postmaster＠open-mesh.org 04 Feb '23

04 Feb '23

The following commit has been merged in the base/net-next branch: commit 0c4061c0d0e2c381ffe4d8b7c62ea69ad8132071 Author: Linus L��ssing <linus.luessing(a)c0d3.blue> Date: Tue Dec 27 20:34:06 2022 +0100 batman-adv: tvlv: prepare for tvlv enabled multicast packet type Prepare TVLV infrastructure for more packet types, in particular the upcoming batman-adv multicast packet type. For that swap the OGM vs. unicast-tvlv packet boolean indicator to an explicit unsigned integer packet type variable. And provide the skb to a call to batadv_tvlv_containers_process(), as later the multicast packet's TVLV handler will need to have access not only to the TVLV but the full skb for forwarding. Forwarding will be invoked from the multicast packet's TVLVs' contents later. Signed-off-by: Linus L��ssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/include/uapi/linux/batadv_packet.h b/include/uapi/linux/batadv_packet.h index ea4692c339ce..9204e4494b25 100644 --- a/include/uapi/linux/batadv_packet.h +++ b/include/uapi/linux/batadv_packet.h @@ -26,6 +26,7 @@ * @BATADV_CODED: network coded packets * @BATADV_ELP: echo location packets for B.A.T.M.A.N. V * @BATADV_OGM2: originator messages for B.A.T.M.A.N. V + * @BATADV_MCAST: multicast packet with multiple destination addresses * * @BATADV_UNICAST: unicast packets carrying unicast payload traffic * @BATADV_UNICAST_FRAG: unicast packets carrying a fragment of the original @@ -42,6 +43,7 @@ enum batadv_packettype { BATADV_CODED = 0x02, BATADV_ELP = 0x03, BATADV_OGM2 = 0x04, + BATADV_MCAST = 0x05, /* 0x40 - 0x7f: unicast */ #define BATADV_UNICAST_MIN 0x40 BATADV_UNICAST = 0x40, diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 96e027364ddd..e710e9afe78f 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -799,8 +799,8 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv, /* only unknown & newer OGMs contain TVLVs we are interested in */ if (seqno_age > 0 && if_outgoing == BATADV_IF_DEFAULT) - batadv_tvlv_containers_process(bat_priv, true, orig_node, - NULL, NULL, + batadv_tvlv_containers_process(bat_priv, BATADV_OGM2, orig_node, + NULL, (unsigned char *)(ogm2 + 1), ntohs(ogm2->tvlv_len)); diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index fefb51a5f606..6968e55eb971 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -822,7 +822,7 @@ int batadv_dat_init(struct batadv_priv *bat_priv) batadv_dat_start_timer(bat_priv); batadv_tvlv_handler_register(bat_priv, batadv_dat_tvlv_ogm_handler_v1, - NULL, BATADV_TVLV_DAT, 1, + NULL, NULL, BATADV_TVLV_DAT, 1, BATADV_TVLV_HANDLER_OGM_CIFNOTFND); batadv_dat_tvlv_container_update(bat_priv); return 0; diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 9349c76f30c5..6a964a773f57 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -259,7 +259,7 @@ void batadv_gw_init(struct batadv_priv *bat_priv) atomic_set(&bat_priv->gw.sel_class, 1); batadv_tvlv_handler_register(bat_priv, batadv_gw_tvlv_ogm_handler_v1, - NULL, BATADV_TVLV_GW, 1, + NULL, NULL, BATADV_TVLV_GW, 1, BATADV_TVLV_HANDLER_OGM_CIFNOTFND); } diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 7e2822c01e00..315394f12c55 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -1818,7 +1818,7 @@ static void batadv_mcast_tvlv_ogm_handler(struct batadv_priv *bat_priv, void batadv_mcast_init(struct batadv_priv *bat_priv) { batadv_tvlv_handler_register(bat_priv, batadv_mcast_tvlv_ogm_handler, - NULL, BATADV_TVLV_MCAST, 2, + NULL, NULL, BATADV_TVLV_MCAST, 2, BATADV_TVLV_HANDLER_OGM_CIFNOTFND); INIT_DELAYED_WORK(&bat_priv->mcast.work, batadv_mcast_mla_update); diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index ecd871abda34..71ebd0284f95 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -160,7 +160,7 @@ int batadv_nc_mesh_init(struct batadv_priv *bat_priv) batadv_nc_start_timer(bat_priv); batadv_tvlv_handler_register(bat_priv, batadv_nc_tvlv_ogm_handler_v1, - NULL, BATADV_TVLV_NC, 1, + NULL, NULL, BATADV_TVLV_NC, 1, BATADV_TVLV_HANDLER_OGM_CIFNOTFND); batadv_nc_tvlv_container_update(bat_priv); return 0; diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 83f31494ea4d..163cd43c4821 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -1073,10 +1073,9 @@ int batadv_recv_unicast_tvlv(struct sk_buff *skb, if (tvlv_buff_len > skb->len - hdr_size) goto free_skb; - ret = batadv_tvlv_containers_process(bat_priv, false, NULL, - unicast_tvlv_packet->src, - unicast_tvlv_packet->dst, - tvlv_buff, tvlv_buff_len); + ret = batadv_tvlv_containers_process(bat_priv, BATADV_UNICAST_TVLV, + NULL, skb, tvlv_buff, + tvlv_buff_len); if (ret != NET_RX_SUCCESS) { ret = batadv_route_unicast_packet(skb, recv_if); diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 01d30c1e412c..36ca31252a73 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -4168,11 +4168,11 @@ int batadv_tt_init(struct batadv_priv *bat_priv) } batadv_tvlv_handler_register(bat_priv, batadv_tt_tvlv_ogm_handler_v1, - batadv_tt_tvlv_unicast_handler_v1, + batadv_tt_tvlv_unicast_handler_v1, NULL, BATADV_TVLV_TT, 1, BATADV_NO_FLAGS); batadv_tvlv_handler_register(bat_priv, NULL, - batadv_roam_tvlv_unicast_handler_v1, + batadv_roam_tvlv_unicast_handler_v1, NULL, BATADV_TVLV_ROAM, 1, BATADV_NO_FLAGS); INIT_DELAYED_WORK(&bat_priv->tt.work, batadv_tt_purge); diff --git a/net/batman-adv/tvlv.c b/net/batman-adv/tvlv.c index 7ec2e2343884..2a583215d439 100644 --- a/net/batman-adv/tvlv.c +++ b/net/batman-adv/tvlv.c @@ -352,10 +352,9 @@ end: * appropriate handlers * @bat_priv: the bat priv with all the soft interface information * @tvlv_handler: tvlv callback function handling the tvlv content - * @ogm_source: flag indicating whether the tvlv is an ogm or a unicast packet + * @packet_type: indicates for which packet type the TVLV handler is called * @orig_node: orig node emitting the ogm packet - * @src: source mac address of the unicast packet - * @dst: destination mac address of the unicast packet + * @skb: the skb the TVLV handler is called for * @tvlv_value: tvlv content * @tvlv_value_len: tvlv content length * @@ -364,15 +363,20 @@ end: */ static int batadv_tvlv_call_handler(struct batadv_priv *bat_priv, struct batadv_tvlv_handler *tvlv_handler, - bool ogm_source, + u8 packet_type, struct batadv_orig_node *orig_node, - u8 *src, u8 *dst, - void *tvlv_value, u16 tvlv_value_len) + struct sk_buff *skb, void *tvlv_value, + u16 tvlv_value_len) { + unsigned int tvlv_offset; + u8 *src, *dst; + if (!tvlv_handler) return NET_RX_SUCCESS; - if (ogm_source) { + switch (packet_type) { + case BATADV_IV_OGM: + case BATADV_OGM2: if (!tvlv_handler->ogm_handler) return NET_RX_SUCCESS; @@ -383,19 +387,32 @@ static int batadv_tvlv_call_handler(struct batadv_priv *bat_priv, BATADV_NO_FLAGS, tvlv_value, tvlv_value_len); tvlv_handler->flags |= BATADV_TVLV_HANDLER_OGM_CALLED; - } else { - if (!src) - return NET_RX_SUCCESS; - - if (!dst) + break; + case BATADV_UNICAST_TVLV: + if (!skb) return NET_RX_SUCCESS; if (!tvlv_handler->unicast_handler) return NET_RX_SUCCESS; + src = ((struct batadv_unicast_tvlv_packet *)skb->data)->src; + dst = ((struct batadv_unicast_tvlv_packet *)skb->data)->dst; + return tvlv_handler->unicast_handler(bat_priv, src, dst, tvlv_value, tvlv_value_len); + case BATADV_MCAST: + if (!skb) + return NET_RX_SUCCESS; + + if (!tvlv_handler->mcast_handler) + return NET_RX_SUCCESS; + + tvlv_offset = (unsigned char *)tvlv_value - skb->data; + skb_set_network_header(skb, tvlv_offset); + skb_set_transport_header(skb, tvlv_offset + tvlv_value_len); + + return tvlv_handler->mcast_handler(bat_priv, skb); } return NET_RX_SUCCESS; @@ -405,10 +422,9 @@ static int batadv_tvlv_call_handler(struct batadv_priv *bat_priv, * batadv_tvlv_containers_process() - parse the given tvlv buffer to call the * appropriate handlers * @bat_priv: the bat priv with all the soft interface information - * @ogm_source: flag indicating whether the tvlv is an ogm or a unicast packet + * @packet_type: indicates for which packet type the TVLV handler is called * @orig_node: orig node emitting the ogm packet - * @src: source mac address of the unicast packet - * @dst: destination mac address of the unicast packet + * @skb: the skb the TVLV handler is called for * @tvlv_value: tvlv content * @tvlv_value_len: tvlv content length * @@ -416,10 +432,10 @@ static int batadv_tvlv_call_handler(struct batadv_priv *bat_priv, * handler callbacks. */ int batadv_tvlv_containers_process(struct batadv_priv *bat_priv, - bool ogm_source, + u8 packet_type, struct batadv_orig_node *orig_node, - u8 *src, u8 *dst, - void *tvlv_value, u16 tvlv_value_len) + struct sk_buff *skb, void *tvlv_value, + u16 tvlv_value_len) { struct batadv_tvlv_handler *tvlv_handler; struct batadv_tvlv_hdr *tvlv_hdr; @@ -441,20 +457,24 @@ int batadv_tvlv_containers_process(struct batadv_priv *bat_priv, tvlv_hdr->version); ret |= batadv_tvlv_call_handler(bat_priv, tvlv_handler, - ogm_source, orig_node, - src, dst, tvlv_value, + packet_type, orig_node, skb, + tvlv_value, tvlv_value_cont_len); batadv_tvlv_handler_put(tvlv_handler); tvlv_value = (u8 *)tvlv_value + tvlv_value_cont_len; tvlv_value_len -= tvlv_value_cont_len; } - if (!ogm_source) + if (packet_type != BATADV_IV_OGM && + packet_type != BATADV_OGM2) return ret; rcu_read_lock(); hlist_for_each_entry_rcu(tvlv_handler, &bat_priv->tvlv.handler_list, list) { + if (!tvlv_handler->ogm_handler) + continue; + if ((tvlv_handler->flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND) && !(tvlv_handler->flags & BATADV_TVLV_HANDLER_OGM_CALLED)) tvlv_handler->ogm_handler(bat_priv, orig_node, @@ -490,7 +510,7 @@ void batadv_tvlv_ogm_receive(struct batadv_priv *bat_priv, tvlv_value = batadv_ogm_packet + 1; - batadv_tvlv_containers_process(bat_priv, true, orig_node, NULL, NULL, + batadv_tvlv_containers_process(bat_priv, BATADV_IV_OGM, orig_node, NULL, tvlv_value, tvlv_value_len); } @@ -504,6 +524,10 @@ void batadv_tvlv_ogm_receive(struct batadv_priv *bat_priv, * @uptr: unicast tvlv handler callback function. This function receives the * source & destination of the unicast packet as well as the tvlv content * to process. + * @mptr: multicast packet tvlv handler callback function. This function + * receives the full skb to process, with the skb network header pointing + * to the current tvlv and the skb transport header pointing to the first + * byte after the current tvlv. * @type: tvlv handler type to be registered * @version: tvlv handler version to be registered * @flags: flags to enable or disable TVLV API behavior @@ -518,6 +542,8 @@ void batadv_tvlv_handler_register(struct batadv_priv *bat_priv, u8 *src, u8 *dst, void *tvlv_value, u16 tvlv_value_len), + int (*mptr)(struct batadv_priv *bat_priv, + struct sk_buff *skb), u8 type, u8 version, u8 flags) { struct batadv_tvlv_handler *tvlv_handler; @@ -539,6 +565,7 @@ void batadv_tvlv_handler_register(struct batadv_priv *bat_priv, tvlv_handler->ogm_handler = optr; tvlv_handler->unicast_handler = uptr; + tvlv_handler->mcast_handler = mptr; tvlv_handler->type = type; tvlv_handler->version = version; tvlv_handler->flags = flags; diff --git a/net/batman-adv/tvlv.h b/net/batman-adv/tvlv.h index 4cf8af00fc11..e5697230d991 100644 --- a/net/batman-adv/tvlv.h +++ b/net/batman-adv/tvlv.h @@ -9,6 +9,7 @@ #include "main.h" +#include <linux/skbuff.h> #include <linux/types.h> #include <uapi/linux/batadv_packet.h> @@ -34,14 +35,16 @@ void batadv_tvlv_handler_register(struct batadv_priv *bat_priv, u8 *src, u8 *dst, void *tvlv_value, u16 tvlv_value_len), + int (*mptr)(struct batadv_priv *bat_priv, + struct sk_buff *skb), u8 type, u8 version, u8 flags); void batadv_tvlv_handler_unregister(struct batadv_priv *bat_priv, u8 type, u8 version); int batadv_tvlv_containers_process(struct batadv_priv *bat_priv, - bool ogm_source, + u8 packet_type, struct batadv_orig_node *orig_node, - u8 *src, u8 *dst, - void *tvlv_buff, u16 tvlv_buff_len); + struct sk_buff *skb, void *tvlv_buff, + u16 tvlv_buff_len); void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, const u8 *src, const u8 *dst, u8 type, u8 version, void *tvlv_value, u16 tvlv_value_len); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 758cd797a063..ca9449ec9836 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -2335,6 +2335,12 @@ struct batadv_tvlv_handler { u8 *src, u8 *dst, void *tvlv_value, u16 tvlv_value_len); + /** + * @mcast_handler: handler callback which is given the tvlv payload to + * process on incoming mcast packet + */ + int (*mcast_handler)(struct batadv_priv *bat_priv, struct sk_buff *skb); + /** @type: tvlv type this handler feels responsible for */ u8 type; -- linux integration

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits