summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2022-11-28 12:39:12 +0200
committerGitHub <noreply@github.com>2022-11-28 12:39:12 +0200
commit3e717bd02472b6c8bb52155db2292aa158d8064b (patch)
tree6f1753091b0e124936b66c5c2f8784327fa1caaa
parent2801239675c84e0a674d6c3905c8e6e9e9220bc7 (diff)
parentc8191b7c00bce5a4e037d76ec6d8f3a71eb633b3 (diff)
Merge pull request #12407 from FRRouting/mergify/bp/stable/8.4/pr-12403
Echo exclusion (backport #12403)
-rw-r--r--lib/vty.c3
-rw-r--r--zebra/zebra_trace.h43
2 files changed, 45 insertions, 1 deletions
diff --git a/lib/vty.c b/lib/vty.c
index 92db07677a..5fe8a7955b 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -444,7 +444,8 @@ static int vty_command(struct vty *vty, char *buf)
/*
* Log non empty command lines
*/
- if (do_log_commands)
+ if (do_log_commands &&
+ strncmp(buf, "echo PING", strlen("echo PING")) != 0)
cp = buf;
if (cp != NULL) {
/* Skip white spaces. */
diff --git a/zebra/zebra_trace.h b/zebra/zebra_trace.h
index 49a0c8e793..374305fcda 100644
--- a/zebra/zebra_trace.h
+++ b/zebra/zebra_trace.h
@@ -123,6 +123,49 @@ TRACEPOINT_EVENT(
)
)
+TRACEPOINT_EVENT(
+ frr_zebra,
+ netlink_tc_qdisc_change,
+ TP_ARGS(
+ struct nlmsghdr *, header,
+ ns_id_t, ns_id,
+ int, startup),
+ TP_FIELDS(
+ ctf_integer_hex(intptr_t, header, header)
+ ctf_integer(uint32_t, ns_id, ns_id)
+ ctf_integer(uint32_t, startup, startup)
+ )
+ )
+
+TRACEPOINT_EVENT(
+ frr_zebra,
+ netlink_tc_class_change,
+ TP_ARGS(
+ struct nlmsghdr *, header,
+ ns_id_t, ns_id,
+ int, startup),
+ TP_FIELDS(
+ ctf_integer_hex(intptr_t, header, header)
+ ctf_integer(uint32_t, ns_id, ns_id)
+ ctf_integer(uint32_t, startup, startup)
+ )
+ )
+
+
+TRACEPOINT_EVENT(
+ frr_zebra,
+ netlink_tc_filter_change,
+ TP_ARGS(
+ struct nlmsghdr *, header,
+ ns_id_t, ns_id,
+ int, startup),
+ TP_FIELDS(
+ ctf_integer_hex(intptr_t, header, header)
+ ctf_integer(uint32_t, ns_id, ns_id)
+ ctf_integer(uint32_t, startup, startup)
+ )
+ )
+
#include <lttng/tracepoint-event.h>
#endif /* HAVE_LTTNG */