commits January 2022

commits@lists.open-mesh.org

1 participants
36 discussions

[linux-merge]linux integration; annotated tag, v4.4.298, created. v4.4.298
by postmaster＠open-mesh.org 10 Jan '22

10 Jan '22

The annotated tag, v4.4.298 has been created at b03f37a32221a75025b2e8deb64c3c5c3161ce2a (tag) tagging 0dc4b955f01eae10c6923c86234ef9768137797f (commit) replaces v4.4.294 tagged by Greg Kroah-Hartman on Wed Jan 5 12:30:36 2022 +0100 - Shortlog ------------------------------------------------------------ This is the 4.4.298 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmHVgVwACgkQONu9yGCS aT7mwQ/9FzcZCXaFZyIzthVMeD705HMxzy06girhfzTBmt0RfTkf1dajoL032f8t ZIfbhKV9ZN55/+w8hLSotQiosa00yDWtIJftHQjRMLd8Iy5B3XKeEe5kUOPTCUp2 gSLDiSC3xJ+jUr8FH0QZ0EK9cgM4iqterLMH2PiAqKlNat48IPyZzG4ao7m0gozr lAaImLna/JUNKySZ8mj9HZFe95Vx0CvOCdFO57K0657xW0xrfeEjJXw+TArJnjgn s3dv3RMCUEjbQ2c/hy/0zY+KGT14I89eyajHheWIfknUIHdNwYMfeTYBoHtsYvp+ m1S+8JXHBTyEoa/JevY+0THu5laVD2i0QcCkWpWcSWVN04OfidhQXo/rf09fwYuc YnOAqVCaoPsxoMShMZOfEytXWlsztb0vzx5VawkWHvaAQIr1ULAQoGdJZEQDH/ja LL9YJtx88x5MaTIZ2GiMD5eSfJqpvVKoYkhNL5/Ty230Z1e9nji5hfC6fFJk8cNx gAHPEcUIcaolevXzamUX0Twmuwdxr8P5zSKuqw2MjpSjpH1WSI8llFCTyD/D0WE+ ADWmARL1nrU2hG07Ezr84wQgnyzl7aOMydRVRPc0FFrCsfJf2j9178k82TcFK00J wAbTElUYa/AxQT3vSS68bVdLZIohlcfRy2iUGgbEIwXe3Vdxq7k= =c0Y2 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.9.296, created. v4.9.296
by postmaster＠open-mesh.org 10 Jan '22

10 Jan '22

The annotated tag, v4.9.296 has been created at 50ac31368177ecbc605e5a4b340e5c9f7363bf3e (tag) tagging 710bf39c7aec32641ea63f6593db1df8c3e4a4d7 (commit) replaces v4.9.292 tagged by Greg Kroah-Hartman on Wed Jan 5 12:32:28 2022 +0100 - Shortlog ------------------------------------------------------------ This is the 4.9.296 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmHVgcwACgkQONu9yGCS aT5Mmg//Tattbd7Xe8vGWeHNGuie3eOVJQ019ciD5ydKmxBVxw3ENB1++F8SSWVJ HKWaWDJxU1IHSEJiO0aRRqMit5E5fN9g/7F6X7UXSOSdoHSaOCXD43A9H5roWXe5 U7lbKWWdePALrXrpuPT6P/FIMetwYHcSzb3CEXCTYB6SWs0G6Sw+JCv4hpluQ47k i6qhxKIcwdX1+C60NLu+OFWfb+E8bjm7GIVpASWPJjR9kbOckI9AqPyO+BhyWfX7 Uwww8dfHgQ97dKBUDHeiRZVRy+fYK94WW44MefdiY+sdgJobzAoUa6LgaUIXojKR IDMS1Y4TcRzpvX1gQdvbUoOfaSA0G39rLJdPi9TqpImaw9sYq3j9e0le8cn1hoxa 00GGuht2CwyCfC2A4EmsH9FvY2OfVOl8WDD5rN9mxPSyUfOzy6N19moIZjPi+PP9 8uKTE/elu/eZjnICaQ9Ot2WOPY6NytREM+0XpEcd9SabnAJZvGKpWuxrdwnP3Bc2 XUmF0+SktU3a+C0qXl3LUv5Suz/iwm8w15TCXAktdbiBGTpZh1p1PuQyKA3OoBCc 9YmU+jYnqwoGxQHbEoVpu+Gsa+xILl3x9Thomrs2NZpGQR1Ckp9f3lHDCbqBDkLY zuCw5poEphXXFW2ePrQ0aWDdO5faPgarJl+8yBCYQQWTqNcBWbY= =H/A6 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v5.16, created. v5.16
by postmaster＠open-mesh.org 09 Jan '22

09 Jan '22

The annotated tag, v5.16 has been created at d067e3e91a795a2b936c5c5b18f2591187a74f6e (tag) tagging df0cc57e057f18e44dac8e6c18aba47ab53202f9 (commit) replaces v5.16-rc8 tagged by Linus Torvalds on Sun Jan 9 14:55:34 2022 -0800 - Shortlog ------------------------------------------------------------ Linux 5.16 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmHbZ+YeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGDs4H/RgC8JOV3Dki1VtO 6OwPxUKKojhVU9LJis7kyG5voB/zE7tK5nI+jC3gYGQUFKWaZ3YY8s3UcV1zvg/b a44b91boA+dKxEwOq4RZNQ9mU+QWnNoG5+UqBkmB8vewi3QC3T8xEmpWcERLbU7d KrI2T6i4ksJ9OYSYMEMyrvrpt7nt3n1tDX8b71faXjf1zbLeGo9zT53t6BJ/LknV AK406Eq/3bg36OZrKFuG7hCJfRE/cSlxF9bxK3sIfMBMQ2YPe1S5+pxl5iBD0nyl NaHOBYcLTxPAne3YgIvK0zDdsS+EtPSlaVdWfSmNjQhX2vqEixldgdrOCmwp37vd 3gV9D28= =hrOo -----END PGP SIGNATURE----- Linus L��ssing (1): batman-adv: mcast: don't send link-local multicast to mcast routers ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-next-pullrequest-20220103, deleted. v5.15-12783-gcde3fac565a7
by postmaster＠open-mesh.org 04 Jan '22

04 Jan '22

The annotated tag, batadv-next-pullrequest-20220103 has been deleted was 5a8f993c85061c08f72f114e8cb60cc7865e7d74 ----------------------------------------------------------------------- tag batadv-next-pullrequest-20220103 This cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - allow netlink usage in unprivileged containers, by Linus L��ssing - remove unneeded variable, by Minghao Chi -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAmHTLygWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoUg2D/0Rmb2xC9R/ztyc0OaVyXVr4II0 hyqeHgrWiBFqMOP8AApM2vLAzMyFOcUDwek7KURsLQXi5/wDeyQyg80S7z8voqZA opCWQVuVuGS29fs6f4OdBWoCdIjlHzoIcwgaIjxbyxaW9jh36zjarLodVqJQXlyH 2LIZD28/neji+sH0QqZz40HlV+08bw4RlTM+TjYUM1XLoX0uZJLXu2jgpWw64Ig4 lw5RbakLX1seywNWMy96w5DhjfQaaNGjaPGf4WHztnMpAsUXfwVl6tOq3UgIKJUK f/qRwE7DXBKMqY8dKPcULbAjrOUStrU+stUAqMEbjviBGAfc0Vx5c09WXe4ZLHPJ ZejIdUU8bz19yyvUwz6UXGyba3LujKeDxRsDUfkRvHe4BelBXFuyUC16UW0S7RoT r0BojmJnxOZ1+i9uVRzS7K88aggoRLCNzSdCmLbXCHNP6DDR88PWv87RGAWZ8vd2 NCM7SI9NSMG0ujwMTQ0dvKwlyabQLlRyO7cWYPHH6c2ms0PlSSvjmCjp+rb6FgLs iRmVmAT0nEg8ak1Uv6vr3PvEJHIxTtiOmpr3ywBk9XWqeIA01BAVj/48ahc5ADQH w3imur7TdKAEcb/4k/xz2e44PDKIHsxQdQH6SA6KWxt6YPbHcozS+cD5qau1Mtb0 ExMV//CNa3RFrS6QSw== =iGTA -----END PGP SIGNATURE----- cde3fac565a7df8805a4e0e28d84a0f90177099a batman-adv: remove unneeded variable in batadv_nc_init ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-net-pullrequest-20220103, deleted. v5.15-12781-g938f2e0b57ff
by postmaster＠open-mesh.org 04 Jan '22

04 Jan '22

The annotated tag, batadv-net-pullrequest-20220103 has been deleted was b176f97c9531ff7ac76799eba28e01ec83a9dc91 ----------------------------------------------------------------------- tag batadv-net-pullrequest-20220103 Here is a batman-adv bugfix: - avoid sending link-local multicast to multicast routers, by Linus L��ssing -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAmHTLdgWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoav6D/97MFOCsOJqruKu3k8X7tw4BtVl l6nhTE/Sa+b742hzOpI/F4TS/rzoya7JsUWxzF4YcYCf/LNgXljFBoY+SBNVXR/6 uT/i6SisVEXvrxJNBhMU/27WTaBv7/HMPfQ6cCUpC6g97+smV7WJRTY8pbYvFMI3 okBLbf57NpPfmyaog1GEhiIpYUgFxN/yt0D8ZxcFe+tkfe9zv/WYvMgyrAYq81/y hceIDYurhyWYoJTUOz6BeKOnqwdAz8hlxZPkhO2cYakqwdy+MfPdxYJcH6eDTQzJ M6Q7lSufvcK43NYq4LCLLvXUth4S6rLMkP6vmQ4KI/31Hl/RbFHMrwJNs7+1NgNM jcEGe62DH+980k8yaDrGVjrHgVrYYEzziG3zAqAMwkP4GseF1PKir2vv6GN9rCIh I1xEvQXNAuCiBQlhUzJt0rWdSX44FjL2KpcyN0xeu1GMlwjqzP6fGzRG0HfxjASv 2GuP5Pw6KLkci1jOGkZrYse5jZPY/++lyC9KJJqiwpqqiqCsvmsKbo/IKzwUSBwV GfaqMG/xw3txXsClQePJGOXe3kij0uiEuw5RvPUEEkG5pDoF3SBH4tqKYuxju19b dEGSvtx2wLsT5J+xJRBK3IXWrLDeQtiLLTIrIiTdrCiPhRLLYMRknHVvYWr2iGA3 jBNOoIo9007Q/KBPQw== =fn2W -----END PGP SIGNATURE----- 938f2e0b57ffe8a6df71e1e177b2978b1b33fe5e batman-adv: mcast: don't send link-local multicast to mcast routers ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-next-pullrequest-20220103, created. batadv-next-pullrequest-20220103
by postmaster＠open-mesh.org 03 Jan '22

03 Jan '22

The annotated tag, batadv-next-pullrequest-20220103 has been created at 5a8f993c85061c08f72f114e8cb60cc7865e7d74 (tag) tagging cde3fac565a7df8805a4e0e28d84a0f90177099a (commit) replaces v5.15 tagged by Simon Wunderlich on Mon Jan 3 18:15:20 2022 +0100 - Shortlog ------------------------------------------------------------ This cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - allow netlink usage in unprivileged containers, by Linus L��ssing - remove unneeded variable, by Minghao Chi -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAmHTLygWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoUg2D/0Rmb2xC9R/ztyc0OaVyXVr4II0 hyqeHgrWiBFqMOP8AApM2vLAzMyFOcUDwek7KURsLQXi5/wDeyQyg80S7z8voqZA opCWQVuVuGS29fs6f4OdBWoCdIjlHzoIcwgaIjxbyxaW9jh36zjarLodVqJQXlyH 2LIZD28/neji+sH0QqZz40HlV+08bw4RlTM+TjYUM1XLoX0uZJLXu2jgpWw64Ig4 lw5RbakLX1seywNWMy96w5DhjfQaaNGjaPGf4WHztnMpAsUXfwVl6tOq3UgIKJUK f/qRwE7DXBKMqY8dKPcULbAjrOUStrU+stUAqMEbjviBGAfc0Vx5c09WXe4ZLHPJ ZejIdUU8bz19yyvUwz6UXGyba3LujKeDxRsDUfkRvHe4BelBXFuyUC16UW0S7RoT r0BojmJnxOZ1+i9uVRzS7K88aggoRLCNzSdCmLbXCHNP6DDR88PWv87RGAWZ8vd2 NCM7SI9NSMG0ujwMTQ0dvKwlyabQLlRyO7cWYPHH6c2ms0PlSSvjmCjp+rb6FgLs iRmVmAT0nEg8ak1Uv6vr3PvEJHIxTtiOmpr3ywBk9XWqeIA01BAVj/48ahc5ADQH w3imur7TdKAEcb/4k/xz2e44PDKIHsxQdQH6SA6KWxt6YPbHcozS+cD5qau1Mtb0 ExMV//CNa3RFrS6QSw== =iGTA -----END PGP SIGNATURE----- Eric W. Biederman (1): exit/kthread: Have kernel threads return instead of calling do_exit Jakub Kicinski (3): batman-adv: prepare for const netdev->dev_addr batman-adv: use eth_hw_addr_set() instead of ether_addr_copy() Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net Kyungrok Chung (1): net: make use of helper netif_is_bridge_master() Linus L��ssing (1): batman-adv: allow netlink usage in unprivileged containers Linus Torvalds (1): Merge branch 'exit-cleanups-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace Minghao Chi (1): batman-adv: remove unneeded variable in batadv_nc_init Simon Wunderlich (1): batman-adv: Start new development cycle ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-net-pullrequest-20220103, created. batadv-net-pullrequest-20220103
by postmaster＠open-mesh.org 03 Jan '22

03 Jan '22

The annotated tag, batadv-net-pullrequest-20220103 has been created at b176f97c9531ff7ac76799eba28e01ec83a9dc91 (tag) tagging 938f2e0b57ffe8a6df71e1e177b2978b1b33fe5e (commit) replaces v5.15 tagged by Simon Wunderlich on Mon Jan 3 18:09:44 2022 +0100 - Shortlog ------------------------------------------------------------ Here is a batman-adv bugfix: - avoid sending link-local multicast to multicast routers, by Linus L��ssing -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAmHTLdgWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoav6D/97MFOCsOJqruKu3k8X7tw4BtVl l6nhTE/Sa+b742hzOpI/F4TS/rzoya7JsUWxzF4YcYCf/LNgXljFBoY+SBNVXR/6 uT/i6SisVEXvrxJNBhMU/27WTaBv7/HMPfQ6cCUpC6g97+smV7WJRTY8pbYvFMI3 okBLbf57NpPfmyaog1GEhiIpYUgFxN/yt0D8ZxcFe+tkfe9zv/WYvMgyrAYq81/y hceIDYurhyWYoJTUOz6BeKOnqwdAz8hlxZPkhO2cYakqwdy+MfPdxYJcH6eDTQzJ M6Q7lSufvcK43NYq4LCLLvXUth4S6rLMkP6vmQ4KI/31Hl/RbFHMrwJNs7+1NgNM jcEGe62DH+980k8yaDrGVjrHgVrYYEzziG3zAqAMwkP4GseF1PKir2vv6GN9rCIh I1xEvQXNAuCiBQlhUzJt0rWdSX44FjL2KpcyN0xeu1GMlwjqzP6fGzRG0HfxjASv 2GuP5Pw6KLkci1jOGkZrYse5jZPY/++lyC9KJJqiwpqqiqCsvmsKbo/IKzwUSBwV GfaqMG/xw3txXsClQePJGOXe3kij0uiEuw5RvPUEEkG5pDoF3SBH4tqKYuxju19b dEGSvtx2wLsT5J+xJRBK3IXWrLDeQtiLLTIrIiTdrCiPhRLLYMRknHVvYWr2iGA3 jBNOoIo9007Q/KBPQw== =fn2W -----END PGP SIGNATURE----- Eric W. Biederman (1): exit/kthread: Have kernel threads return instead of calling do_exit Jakub Kicinski (3): batman-adv: prepare for const netdev->dev_addr batman-adv: use eth_hw_addr_set() instead of ether_addr_copy() Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net Kyungrok Chung (1): net: make use of helper netif_is_bridge_master() Linus L��ssing (1): batman-adv: mcast: don't send link-local multicast to mcast routers Linus Torvalds (1): Merge branch 'exit-cleanups-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v5.16-rc8, created. v5.16-rc8
by postmaster＠open-mesh.org 02 Jan '22

02 Jan '22

The annotated tag, v5.16-rc8 has been created at da629478930871e4c9a51c56ad86078f10b83f9f (tag) tagging c9e6606c7fe92b50a02ce51dda82586ebdf99b48 (commit) replaces v5.16-rc7 tagged by Linus Torvalds on Sun Jan 2 14:23:25 2022 -0800 - Shortlog ------------------------------------------------------------ Linux 5.16-rc8 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmHSJd0eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGu4oH/jPMEQahLzfO8tJf 5/wKZQBmz1aAHH2D1zJ/Kpwc33TYM1IW6RuaLDNph8ve7z4Nj/neqGSH7ImUMuq7 Z3kID26Z1rEC/i3y9AnAluHgxduO/xdSa5EEscFx60TEGtrQsu+F2qexjpxkZxwF AaICVrp2ipkO9a2w5zfytX8pBOUls93fSmPs/0l51ScSzzFH64mjkz16IiXVF9kg MvOT1awLxSSqzWgtZtG1Nv/7baTNt3Lr20VAt9+14CO6WYdrlsHSaGNgSULEh/wh DzMBumAAc74W1gRxp7eTz4sGjFDP0kagQFukHITWgIAsg5trJkPjOi7TnsB2rxW+ DkhmtqI= =EtRa -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[alfred] master: alfred: introduce 'change batman-adv interface' IPC call (b96cc74)
by postmaster＠open-mesh.org 02 Jan '22

02 Jan '22

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit b96cc742ef3e09f3357051783d449d542749970c Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Jan 2 12:31:35 2022 +0100 alfred: introduce 'change batman-adv interface' IPC call The batman-adv interface used by alfred can be changed at runtime by sending the CHANGE_BAT_IFACE command via unix socket. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- b96cc742ef3e09f3357051783d449d542749970c alfred.h | 4 +++- client.c | 37 +++++++++++++++++++++++++++++++++++++ main.c | 10 +++++++++- man/alfred.8 | 3 +++ packet.h | 14 ++++++++++++++ unix_sock.c | 27 ++++++++++++++++++++++++++- 6 files changed, 92 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index d844261..26eb157 100644 --- a/alfred.h +++ b/alfred.h @@ -89,6 +89,7 @@ enum clientmode { CLIENT_SET_DATA, CLIENT_MODESWITCH, CLIENT_CHANGE_INTERFACE, + CLIENT_CHANGE_BAT_IFACE, }; struct interface { @@ -110,7 +111,7 @@ struct globals { char *change_interface; struct server *best_server; /* NULL if we are a server ourselves */ - const char *mesh_iface; + char *mesh_iface; enum opmode opmode; enum clientmode clientmode; int clientmode_arg; @@ -150,6 +151,7 @@ int alfred_client_request_data(struct globals *globals); int alfred_client_set_data(struct globals *globals); int alfred_client_modeswitch(struct globals *globals); int alfred_client_change_interface(struct globals *globals); +int alfred_client_change_bat_iface(struct globals *globals); /* recv.c */ int recv_alfred_packet(struct globals *globals, struct interface *interface, int recv_sock); diff --git a/client.c b/client.c index dc643f3..e1107bf 100644 --- a/client.c +++ b/client.c @@ -296,3 +296,40 @@ int alfred_client_change_interface(struct globals *globals) return 0; } + +int alfred_client_change_bat_iface(struct globals *globals) +{ + unsigned char buf[MAX_PAYLOAD]; + struct alfred_change_bat_iface_v0 *change_bat_iface; + int ret, len; + size_t interface_len; + + if (unix_sock_open_client(globals)) + return -1; + + interface_len = strlen(globals->mesh_iface); + if (interface_len > sizeof(change_bat_iface->bat_iface)) { + fprintf(stderr, "%s: batman-adv interface name list too long, not changing\n", + __func__); + return 0; + } + + change_bat_iface = (struct alfred_change_bat_iface_v0 *)buf; + len = sizeof(*change_bat_iface); + + change_bat_iface->header.type = ALFRED_CHANGE_BAT_IFACE; + change_bat_iface->header.version = ALFRED_VERSION; + change_bat_iface->header.length = htons(len - sizeof(change_bat_iface->header)); + strncpy(change_bat_iface->bat_iface, globals->mesh_iface, + sizeof(change_bat_iface->bat_iface)); + change_bat_iface->bat_iface[sizeof(change_bat_iface->bat_iface) - 1] = '\0'; + + ret = write(globals->unix_sock, buf, len); + if (ret != len) + fprintf(stderr, "%s: only wrote %d of %d bytes: %s\n", + __func__, ret, len, strerror(errno)); + + unix_sock_close(globals); + + return 0; +} diff --git a/main.c b/main.c index ad317cf..2cb6d44 100644 --- a/main.c +++ b/main.c @@ -37,6 +37,7 @@ static void alfred_usage(void) printf(" -M, --modeswitch primary switch daemon to mode primary\n"); printf(" secondary switch daemon to mode secondary\n"); printf(" -I, --change-interface [interface] change to the specified interface(s)\n"); + printf(" -B, --change-bat-iface [interface] change to the specified batman-adv interface\n"); printf("\n"); printf("server mode options:\n"); printf(" -i, --interface specify the interface (or comma separated list of interfaces) to listen on\n"); @@ -160,6 +161,7 @@ static struct globals *alfred_init(int argc, char *argv[]) {"req-version", required_argument, NULL, 'V'}, {"modeswitch", required_argument, NULL, 'M'}, {"change-interface", required_argument, NULL, 'I'}, + {"change-bat-iface", required_argument, NULL, 'B'}, {"unix-path", required_argument, NULL, 'u'}, {"update-command", required_argument, NULL, 'c'}, {"version", no_argument, NULL, 'v'}, @@ -194,7 +196,7 @@ static struct globals *alfred_init(int argc, char *argv[]) time_random_seed(); - while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:dc:p:4:f", long_options, + while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:B:u:dc:p:4:f", long_options, &opt_ind)) != -1) { switch (opt) { case 'r': @@ -252,6 +254,10 @@ static struct globals *alfred_init(int argc, char *argv[]) globals->clientmode = CLIENT_CHANGE_INTERFACE; globals->change_interface = strdup(optarg); break; + case 'B': + globals->clientmode = CLIENT_CHANGE_BAT_IFACE; + globals->mesh_iface = strdup(optarg); + break; case 'u': globals->unix_path = optarg; break; @@ -313,6 +319,8 @@ int main(int argc, char *argv[]) return alfred_client_modeswitch(globals); case CLIENT_CHANGE_INTERFACE: return alfred_client_change_interface(globals); + case CLIENT_CHANGE_BAT_IFACE: + return alfred_client_change_bat_iface(globals); } return 0; diff --git a/man/alfred.8 b/man/alfred.8 index 18e008e..4e002f0 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -91,6 +91,9 @@ to 0 ('\fB\-V\fP 0'). .TP \fB\-I\fP, \fB\-\-change\-interface\fP \fIinterface\fP Change the alfred server to use the new \fBinterface\fP(s) +.TP +\fB\-B\fP, \fB\-\-change\-bat\-iface\fP \fIinterface\fP +Change the alfred server to use the new \fBbatman-adv interface\fP . .SH SERVER OPTIONS .TP diff --git a/packet.h b/packet.h index 678f939..94c6a77 100644 --- a/packet.h +++ b/packet.h @@ -68,6 +68,7 @@ enum alfred_packet_type { ALFRED_STATUS_ERROR = 4, ALFRED_MODESWITCH = 5, ALFRED_CHANGE_INTERFACE = 6, + ALFRED_CHANGE_BAT_IFACE = 7, }; /* packets */ @@ -147,6 +148,19 @@ struct alfred_change_interface_v0 { char ifaces[IFNAMSIZ * 16]; } __packed; +/** + * struct alfred_change_bat_iface_v0 - Request to change the + * batman-adv interface + * @header: TLV header describing the complete packet + * @bat_iface: interface to be changed to + * + * Sent to the daemon by client + */ +struct alfred_change_bat_iface_v0 { + struct alfred_tlv header; + char bat_iface[IFNAMSIZ]; +} __packed; + /** * struct alfred_status_v0 - Status info of a transaction * @header: TLV header describing the complete packet diff --git a/unix_sock.c b/unix_sock.c index d9ad07b..bc39199 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -345,6 +345,27 @@ err: return ret; } +static int +unix_sock_change_bat_iface(struct globals *globals, + struct alfred_change_bat_iface_v0 *change_bat_iface, + int client_sock) +{ + int len, ret = -1; + + len = ntohs(change_bat_iface->header.length); + + if (len < (int)(sizeof(*change_bat_iface) - sizeof(change_bat_iface->header))) + goto err; + + free(globals->mesh_iface); + globals->mesh_iface = strdup(change_bat_iface->bat_iface); + + ret = 0; +err: + close(client_sock); + return ret; +} + int unix_sock_read(struct globals *globals) { int client_sock; @@ -402,7 +423,11 @@ int unix_sock_read(struct globals *globals) (struct alfred_change_interface_v0 *)packet, client_sock); break; - + case ALFRED_CHANGE_BAT_IFACE: + ret = unix_sock_change_bat_iface(globals, + (struct alfred_change_bat_iface_v0 *)packet, + client_sock); + break; default: /* unknown packet type */ ret = -1;

1 0

[alfred] master: alfred: remove meaningless printf() call (bd35ae8)
by postmaster＠open-mesh.org 02 Jan '22

02 Jan '22

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit bd35ae8ec91f48c06698dfaa84a155e08a599b64 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Jan 2 12:31:33 2022 +0100 alfred: remove meaningless printf() call Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- bd35ae8ec91f48c06698dfaa84a155e08a599b64 server.c | 1 - 1 file changed, 1 deletion(-) diff --git a/server.c b/server.c index b4925e7..85bf453 100644 --- a/server.c +++ b/server.c @@ -442,7 +442,6 @@ int alfred_server(struct globals *globals) netsock_check_error(globals, &errfds); if (FD_ISSET(globals->unix_sock, &fds)) { - printf("read unix socket\n"); unix_sock_read(globals); continue; } else {

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2022