commits

commits@lists.open-mesh.org

1 participants
12395 discussions

[batman-adv] master: batman-adv: tracing: Use the new __vstring() helper (fce06f6d)
by postmaster＠open-mesh.org 17 Aug '22

17 Aug '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit fce06f6da01b39e16391de141466fb7e0a35c02e Author: Steven Rostedt (Google) <rostedt(a)goodmis.org> Date: Sun Jul 31 15:03:31 2022 -0400 batman-adv: tracing: Use the new __vstring() helper Instead of open coding a __dynamic_array() with a fixed length (which defeats the purpose of the dynamic array in the first place). Use the new __vstring() helper that will use a va_list and only write enough of the string into the ring buffer that is needed. Link: https://lkml.kernel.org/r/20220724191650.236b1355@rorschach.local.home Cc: Marek Lindner <mareklindner(a)neomailbox.ch> Cc: Ingo Molnar <mingo(a)kernel.org> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Simon Wunderlich <sw(a)simonwunderlich.de> Cc: Antonio Quartulli <a(a)unstable.cc> Cc: "David S. Miller" <davem(a)davemloft.net> Cc: Eric Dumazet <edumazet(a)google.com> Cc: Jakub Kicinski <kuba(a)kernel.org> Cc: Paolo Abeni <pabeni(a)redhat.com> Cc: b.a.t.m.a.n(a)lists.open-mesh.org Cc: netdev(a)vger.kernel.org Acked-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org> [sven(a)narfation.org: add compat code] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- fce06f6da01b39e16391de141466fb7e0a35c02e compat-include/linux/tracepoint.h | 24 ++++++++++++++++++++++++ net/batman-adv/trace.h | 9 ++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/compat-include/linux/tracepoint.h b/compat-include/linux/tracepoint.h new file mode 100644 index 00000000..4a79f51a --- /dev/null +++ b/compat-include/linux/tracepoint.h @@ -0,0 +1,24 @@ +/* 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_TRACEPOINT_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_TRACEPOINT_H_ + +#include <linux/version.h> +#include_next <linux/tracepoint.h> + +#if LINUX_VERSION_IS_LESS(6, 0, 0) + +#define __vstring(item, fmt, ap) __dynamic_array(char, item, 256) +#define __assign_vstr(dst, fmt, va) \ + WARN_ON_ONCE(vsnprintf(__get_dynamic_array(dst), 256, fmt, *va) >= 256) + +#endif /* LINUX_VERSION_IS_LESS(6, 0, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_TRACEPOINT_H_ */ diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index d673ebdd..31c8f922 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -28,8 +28,6 @@ #endif /* CONFIG_BATMAN_ADV_TRACING */ -#define BATADV_MAX_MSG_LEN 256 - TRACE_EVENT(batadv_dbg, TP_PROTO(struct batadv_priv *bat_priv, @@ -40,16 +38,13 @@ TRACE_EVENT(batadv_dbg, TP_STRUCT__entry( __string(device, bat_priv->soft_iface->name) __string(driver, KBUILD_MODNAME) - __dynamic_array(char, msg, BATADV_MAX_MSG_LEN) + __vstring(msg, vaf->fmt, vaf->va) ), TP_fast_assign( __assign_str(device, bat_priv->soft_iface->name); __assign_str(driver, KBUILD_MODNAME); - WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg), - BATADV_MAX_MSG_LEN, - vaf->fmt, - *vaf->va) >= BATADV_MAX_MSG_LEN); + __assign_vstr(msg, vaf->fmt, vaf->va); ), TP_printk(

1 0

[batman-adv] master: Merge branch 'maint' (19a1d311)
by postmaster＠open-mesh.org 17 Aug '22

17 Aug '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 19a1d31184040623b8fa752a12a4bc0e10c61121 Merge: 2e8d8067 fce06f6d Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Aug 17 12:00:45 2022 +0200 Merge branch 'maint' >--------------------------------------------------------------- 19a1d31184040623b8fa752a12a4bc0e10c61121 compat-include/linux/tracepoint.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[batman-adv] master: batman-adv: Drop unused headers in trace.h (4a329f32)
by postmaster＠open-mesh.org 17 Aug '22

17 Aug '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 4a329f32a8a389b6f2ab26d99411a633ff4c6900 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Aug 17 12:01:44 2022 +0200 batman-adv: Drop unused headers in trace.h The commit fce06f6da01b ("batman-adv: tracing: Use the new __vstring() helper") removed the usage of WARN_ON_ONCE and __dynamic_array in this file. But it was forgotten to adjust the headers accordingly (dropping the now no longer used ones). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 4a329f32a8a389b6f2ab26d99411a633ff4c6900 net/batman-adv/trace.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index 31c8f922..5dd52bc5 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -9,8 +9,6 @@ #include "main.h" -#include <linux/bug.h> -#include <linux/kernel.h> #include <linux/netdevice.h> #include <linux/percpu.h> #include <linux/printk.h>

1 0

[linux-merge]linux integration; annotated tag, v6.0-rc1, created. v6.0-rc1
by postmaster＠open-mesh.org 15 Aug '22

15 Aug '22

The annotated tag, v6.0-rc1 has been created at 09e4144cab94d10fec58b9296d6fc22a8b42b30a (tag) tagging 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 (commit) replaces v5.19 tagged by Linus Torvalds on Sun Aug 14 15:50:18 2022 -0700 - Shortlog ------------------------------------------------------------ Linux 6.0-rc1 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmL5fCoeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGgU8H/2WLD7yJB+EE8Rjs 4N6PQLCSBYPL4Tb23SfdVEV/olTafqUUULtUCfxzHkeiZS0kfAOj1/9xZcirxlNC RRKzQL8wvUaSNj+9Mko61Z0F4xlVFca7rwb4IkrqURMIGFiM673vmvwX7zafS/Z4 pZ1qdcrbQpFwM0mWdgXoc8ZaSYGDGuIs3t0U6f8Qo+L1LZ+ubDVOk216mmvKiP9X 63M3xkPkAIogypbNKKGHbHQ+k+j51WN+IAlCdSXLVXoE9yNFlmoMl5JLaVKhb5x7 2CJF9LaDtk3ZOwtzQK4HgMzhDuh5pJ6m53yTZcta1lp9qZMCp63+n5lo1071FJNi tcrLsiY= =nlqR -----END PGP SIGNATURE----- Steven Rostedt (Google) (1): batman-adv: tracing: Use the new __vstring() helper ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: tracing: Use the new __vstring() helper (2e8d8067)
by postmaster＠open-mesh.org 13 Aug '22

13 Aug '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 2e8d806773050394f8f6fca93b631d145e43f658 Author: Steven Rostedt (Google) <rostedt(a)goodmis.org> Date: Sun Jul 31 15:03:31 2022 -0400 batman-adv: tracing: Use the new __vstring() helper Instead of open coding a __dynamic_array() with a fixed length (which defeats the purpose of the dynamic array in the first place). Use the new __vstring() helper that will use a va_list and only write enough of the string into the ring buffer that is needed. Link: https://lkml.kernel.org/r/20220724191650.236b1355@rorschach.local.home Cc: Marek Lindner <mareklindner(a)neomailbox.ch> Cc: Ingo Molnar <mingo(a)kernel.org> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Simon Wunderlich <sw(a)simonwunderlich.de> Cc: Antonio Quartulli <a(a)unstable.cc> Cc: "David S. Miller" <davem(a)davemloft.net> Cc: Eric Dumazet <edumazet(a)google.com> Cc: Jakub Kicinski <kuba(a)kernel.org> Cc: Paolo Abeni <pabeni(a)redhat.com> Cc: b.a.t.m.a.n(a)lists.open-mesh.org Cc: netdev(a)vger.kernel.org Acked-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org> [sven(a)narfation.org: add compat code] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 2e8d806773050394f8f6fca93b631d145e43f658 compat-include/linux/tracepoint.h | 24 ++++++++++++++++++++++++ net/batman-adv/trace.h | 9 ++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/compat-include/linux/tracepoint.h b/compat-include/linux/tracepoint.h new file mode 100644 index 00000000..61df01a3 --- /dev/null +++ b/compat-include/linux/tracepoint.h @@ -0,0 +1,24 @@ +/* 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_TRACEPOINT_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_TRACEPOINT_H_ + +#include <linux/version.h> +#include_next <linux/tracepoint.h> + +#if LINUX_VERSION_IS_LESS(5, 19, 0) + +#define __vstring(item, fmt, ap) __dynamic_array(char, item, 256) +#define __assign_vstr(dst, fmt, va) \ + WARN_ON_ONCE(vsnprintf(__get_dynamic_array(dst), 256, fmt, *va) >= 256) + +#endif /* LINUX_VERSION_IS_LESS(5, 19, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_TRACEPOINT_H_ */ diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index d673ebdd..31c8f922 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -28,8 +28,6 @@ #endif /* CONFIG_BATMAN_ADV_TRACING */ -#define BATADV_MAX_MSG_LEN 256 - TRACE_EVENT(batadv_dbg, TP_PROTO(struct batadv_priv *bat_priv, @@ -40,16 +38,13 @@ TRACE_EVENT(batadv_dbg, TP_STRUCT__entry( __string(device, bat_priv->soft_iface->name) __string(driver, KBUILD_MODNAME) - __dynamic_array(char, msg, BATADV_MAX_MSG_LEN) + __vstring(msg, vaf->fmt, vaf->va) ), TP_fast_assign( __assign_str(device, bat_priv->soft_iface->name); __assign_str(driver, KBUILD_MODNAME); - WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg), - BATADV_MAX_MSG_LEN, - vaf->fmt, - *vaf->va) >= BATADV_MAX_MSG_LEN); + __assign_vstr(msg, vaf->fmt, vaf->va); ), TP_printk(

1 0

[alfred] master: alfred: add missing alfred_event_notify_v0 struct documentation (907b545)
by postmaster＠open-mesh.org 04 Aug '22

04 Aug '22

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit 907b54535599e0420c68af8dc3db3fbb6dd907aa Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu Aug 4 20:52:10 2022 +0200 alfred: add missing alfred_event_notify_v0 struct documentation Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 907b54535599e0420c68af8dc3db3fbb6dd907aa packet.h | 1 + 1 file changed, 1 insertion(+) diff --git a/packet.h b/packet.h index b8d528e..c0723b8 100644 --- a/packet.h +++ b/packet.h @@ -247,6 +247,7 @@ struct alfred_event_register_v0 { * struct alfred_event_notify_v0 - event notification message * @header: TLV header describing the complete packet * @type: Type of the data triggering the event + * @source: Mac address of the original source of the data * * Sent by the daemon to client on data record update */

1 0

[alfred] master: alfred: fix erroneous documentation of '-r' argument (166d5dc)
by postmaster＠open-mesh.org 04 Aug '22

04 Aug '22

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit 166d5dcaa1034b410b4758a3bdde6786264e4d30 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu Aug 4 20:52:11 2022 +0200 alfred: fix erroneous documentation of '-r' argument Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 166d5dcaa1034b410b4758a3bdde6786264e4d30 main.c | 2 +- man/alfred.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index 3fe7b42..2c3f06e 100644 --- a/main.c +++ b/main.c @@ -31,7 +31,7 @@ static void alfred_usage(void) printf(" -s, --set-data [data type] sets new data to distribute from stdin\n"); printf(" for the supplied data type (0-255)\n"); printf(" -r, --request [data type] collect data from the network and prints\n"); - printf(" it on the network\n"); + printf(" it on stdout\n"); printf(" -d, --verbose Show extra information in the data output\n"); printf(" -V, --req-version specify the data version set for -s\n"); printf(" -M, --modeswitch primary switch daemon to mode primary\n"); diff --git a/man/alfred.8 b/man/alfred.8 index ca83f02..20c703b 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -67,7 +67,7 @@ must be periodically written again to alfred, otherwise it will timeout and alfred will forget about it (after 10 minutes). .TP \fB\-r\fP, \fB\-\-request\fP \fIdata\-type\fP -Collect data from the network and prints it on the network +Collect data from the network and prints it on stdout .TP \fB\-d\fP, \fB\-\-verbose\fP Show extra information in the data output

1 0

[alfred] master: alfred: mismaching declarations of is_valid_ether_addr() (bca529c)
by postmaster＠open-mesh.org 04 Aug '22

04 Aug '22

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit bca529cccf6c70f5169e89b68fc3329b213b7e15 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu Aug 4 20:52:12 2022 +0200 alfred: mismaching declarations of is_valid_ether_addr() util.c:57:34: warning: argument 1 of type ��uint8_t[6]�� {aka ��unsigned char[6]��} with mismatched bound [-Warray-parameter=] 57 | bool is_valid_ether_addr(uint8_t addr[ETH_ALEN]) | ~~~~~~~~^~~~~~~~~~~~~~ In file included from util.c:20: alfred.h:231:35: note: previously declared as ��uint8_t *�� {aka ��unsigned char *��} 231 | bool is_valid_ether_addr(uint8_t *addr); | ~~~~~~~~~^~~~ Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- bca529cccf6c70f5169e89b68fc3329b213b7e15 alfred.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alfred.h b/alfred.h index 6fb57ce..97f0093 100644 --- a/alfred.h +++ b/alfred.h @@ -228,7 +228,7 @@ int time_diff(struct timespec *tv1, struct timespec *tv2, struct timespec *tvdiff); void time_random_seed(void); uint16_t get_random_id(void); -bool is_valid_ether_addr(uint8_t *addr); +bool is_valid_ether_addr(uint8_t addr[ETH_ALEN]); bool is_iface_disabled(char *iface); int ipv4_arp_request(struct interface *interface, const alfred_addr *addr, struct ether_addr *mac);

1 0

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

31 Jul '22

The annotated tag, v5.19 has been created at 2c1ad8d25ec27ecee5910b62b26b93074091a3e4 (tag) tagging 3d7cb6b04c3f3115719235cc6866b10326de34cd (commit) replaces v5.19-rc8 tagged by Linus Torvalds on Sun Jul 31 14:03:01 2022 -0700 - Shortlog ------------------------------------------------------------ Linux 5.19 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmLm7gUeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGRaUH/jVPh2erEHOf/yfb uaJGjOjkBMp2OMWIUxZXmpeqkwl3hiDttZ6hPqXyprEvyDgHTtKcbXAu0Wje+FxP TQOq+Kz83liTYs5AerpJve5wAtb1Qbwo9UDl3wbJH3TRAQ/QRsVUdC/2m1+HlM6J lrakkRdWg7iXQuLY22/DHmY1TxeeWaIGTIQqAwRwMcp4gYp0nPb4JEP+Dr6wne5K ryPaFqltm/i4GjMYEuZyzVrSHipTAagp3shZn3YhjVrbNJ+0fafduBdffWAKB4VW 9JmGRgd9S5T5fkSB40XJQ9VrtUzQZtvgvhcAE2CHvvu9/hw4X8rumNAdSS9CZD3z dHhw10I= =wEjs -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[alfred] master: alfred: Start new development cycle (2944d24)
by postmaster＠open-mesh.org 26 Jul '22

26 Jul '22

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit 2944d24669fd0e223839da0f7fa784c0bdd9c15e Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Jul 26 16:33:14 2022 +0200 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 2944d24669fd0e223839da0f7fa784c0bdd9c15e alfred.h | 2 +- gpsd/alfred-gpsd.h | 2 +- vis/vis.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index 127b115..6fb57ce 100644 --- a/alfred.h +++ b/alfred.h @@ -7,7 +7,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2022.2" +#define SOURCE_VERSION "2022.3" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 3d2651d..42989c3 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -25,7 +25,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2022.2" +#define SOURCE_VERSION "2022.3" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index 5996ca0..adba612 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -14,7 +14,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2022.2" +#define SOURCE_VERSION "2022.3" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits