netlink: add a basic rtnetlink parser of addrlabel messages

* rtnl_addrlabel.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* netlink_route.h (decode_ifaddrlblmsg): New prototype.
* configure.ac (AC_CHECK_TYPES): Check for struct ifaddrlblmsg
in <linux/if_addrlabel.h>.
* netlink_route.c (route_decoders): Add RTM_DELADDRLABEL,
RTM_GETADDRLABEL, and RTM_NEWADDRLABEL.

Co-authored-by: Fabien Siron <fabien.siron@epita.fr>

diff --git a/Makefile.am b/Makefile.am
index e4bafbdc84f13903312e3ac4c61d21dd7708814f..5d45bfbae726a52f9fc3c41230a64d7786651593 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -248,6 +248,7 @@ strace_SOURCES =    \
        rt_sigreturn.c  \
        rtc.c           \
        rtnl_addr.c     \
+       rtnl_addrlabel.c \
        rtnl_link.c     \
        rtnl_neigh.c    \
        rtnl_neightbl.c \

diff --git a/configure.ac b/configure.ac
index 4a5c64c73f13089ffc3c302df0a7f165d3c71d2b..12e168fe024feac9bb198428c3d6673eb84a6a97 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -442,6 +442,8 @@ AC_CHECK_HEADERS([linux/bpf.h], [
        st_CHECK_UNION_BPF_ATTR([prog_flags])
 ])
 
+AC_CHECK_TYPES([struct ifaddrlblmsg],,, [#include <linux/if_addrlabel.h>])
+
 AC_CHECK_TYPES([struct statfs], [
        AC_CHECK_MEMBERS([struct statfs.f_frsize],,, [#include <linux/types.h>
 #include <asm/statfs.h>])

diff --git a/netlink_route.c b/netlink_route.c
index c6986a48808eaad7199c26b4540400385f0e8dc0..1208bf8a684ebdc02849d15433abe1fdc7437f7d 100644 (file)
--- a/netlink_route.c
+++ b/netlink_route.c
@@ -91,7 +91,13 @@ static const netlink_route_decoder_t route_decoders[] = {
 
        [RTM_DELACTION - RTM_BASE] = decode_tcamsg,
        [RTM_GETACTION - RTM_BASE] = decode_tcamsg,
-       [RTM_NEWACTION - RTM_BASE] = decode_tcamsg
+       [RTM_NEWACTION - RTM_BASE] = decode_tcamsg,
+
+#ifdef HAVE_STRUCT_IFADDRLBLMSG
+       [RTM_DELADDRLABEL - RTM_BASE] = decode_ifaddrlblmsg,
+       [RTM_GETADDRLABEL - RTM_BASE] = decode_ifaddrlblmsg,
+       [RTM_NEWADDRLABEL - RTM_BASE] = decode_ifaddrlblmsg
+#endif
 };
 
 bool

diff --git a/netlink_route.h b/netlink_route.h
index 3789e07c9b67cacc781de09010334b0b86500749..d172f013d8cbfc84ab17371aa41fc4a332c5d5d6 100644 (file)
--- a/netlink_route.h
+++ b/netlink_route.h
@@ -40,6 +40,7 @@ route_decode_name(struct tcb *tcp,                    \
 /* End of DECL_NETLINK_ROUTE_DECODER definition. */
 
 extern DECL_NETLINK_ROUTE_DECODER(decode_fib_rule_hdr);
+extern DECL_NETLINK_ROUTE_DECODER(decode_ifaddrlblmsg);
 extern DECL_NETLINK_ROUTE_DECODER(decode_ifaddrmsg);
 extern DECL_NETLINK_ROUTE_DECODER(decode_ifinfomsg);
 extern DECL_NETLINK_ROUTE_DECODER(decode_ndmsg);

diff --git a/rtnl_addrlabel.c b/rtnl_addrlabel.c
new file mode 100644 (file)
index 0000000..42dc65e
--- /dev/null
+++ b/rtnl_addrlabel.c
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016 Fabien Siron <fabien.siron@epita.fr>
+ * Copyright (c) 2017 JingPiao Chen <chenjingpiao@gmail.com>
+ * Copyright (c) 2016-2017 The strace developers.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "defs.h"
+
+#ifdef HAVE_STRUCT_IFADDRLBLMSG
+
+# include "netlink_route.h"
+# include "print_fields.h"
+
+# include <linux/if_addrlabel.h>
+
+DECL_NETLINK_ROUTE_DECODER(decode_ifaddrlblmsg)
+{
+       struct ifaddrlblmsg ifal = { .ifal_family = family };
+       const size_t offset = sizeof(ifal.ifal_family);
+
+       PRINT_FIELD_XVAL("{", ifal, ifal_family, addrfams, "AF_???");
+
+       tprints(", ");
+       if (len >= sizeof(ifal)) {
+               if (!umoven_or_printaddr(tcp, addr + offset,
+                                        sizeof(ifal) - offset,
+                                        (void *) &ifal + offset)) {
+                       PRINT_FIELD_U("", ifal, ifal_prefixlen);
+                       PRINT_FIELD_U(", ", ifal, ifal_flags);
+                       PRINT_FIELD_IFINDEX(", ", ifal, ifal_index);
+                       PRINT_FIELD_U(", ", ifal, ifal_seq);
+               }
+       } else
+               tprints("...");
+       tprints("}");
+}
+
+#endif