netlink: add a basic rtnetlink parser of dcb messages

* rtnl_dcb.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* netlink_route.h (decode_dcbmsg): New prototype.
* configure.ac (AC_CHECK_HEADERS): Add linux/dcbnl.h.
(AC_CHECK_TYPES): Check for struct dcbmsg in <linux/dcbnl.h>.
* netlink_route.c (route_decoders): Add RTM_GETDCB and RTM_SETDCB.
* xlat/dcb_commands.in: New file.

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

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

diff --git a/configure.ac b/configure.ac
index 12e168fe024feac9bb198428c3d6673eb84a6a97..a3e3ecc312db4b862ac671b8f632e5fe36354a27 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -374,6 +374,7 @@ AC_CHECK_HEADERS(m4_normalize([
        inttypes.h
        linux/bsg.h
        linux/cryptouser.h
+       linux/dcbnl.h
        linux/dm-ioctl.h
        linux/dqblk_xfs.h
        linux/falloc.h
@@ -442,6 +443,7 @@ AC_CHECK_HEADERS([linux/bpf.h], [
        st_CHECK_UNION_BPF_ATTR([prog_flags])
 ])
 
+AC_CHECK_TYPES([struct dcbmsg],,, [#include <linux/dcbnl.h>])
 AC_CHECK_TYPES([struct ifaddrlblmsg],,, [#include <linux/if_addrlabel.h>])
 
 AC_CHECK_TYPES([struct statfs], [

diff --git a/netlink_route.c b/netlink_route.c
index 1208bf8a684ebdc02849d15433abe1fdc7437f7d..a91f77c895fb899c3b533a53531fcf648781f31f 100644 (file)
--- a/netlink_route.c
+++ b/netlink_route.c
@@ -96,7 +96,12 @@ static const netlink_route_decoder_t route_decoders[] = {
 #ifdef HAVE_STRUCT_IFADDRLBLMSG
        [RTM_DELADDRLABEL - RTM_BASE] = decode_ifaddrlblmsg,
        [RTM_GETADDRLABEL - RTM_BASE] = decode_ifaddrlblmsg,
-       [RTM_NEWADDRLABEL - RTM_BASE] = decode_ifaddrlblmsg
+       [RTM_NEWADDRLABEL - RTM_BASE] = decode_ifaddrlblmsg,
+#endif
+
+#ifdef HAVE_STRUCT_DCBMSG
+       [RTM_GETDCB - RTM_BASE] = decode_dcbmsg,
+       [RTM_SETDCB - RTM_BASE] = decode_dcbmsg
 #endif
 };
 

diff --git a/netlink_route.h b/netlink_route.h
index d172f013d8cbfc84ab17371aa41fc4a332c5d5d6..7c1b711b6b780fc2e2f9fcc9f90d85f6e2e9bd27 100644 (file)
--- a/netlink_route.h
+++ b/netlink_route.h
@@ -39,6 +39,7 @@ route_decode_name(struct tcb *tcp,                    \
                  unsigned int len)                     \
 /* End of DECL_NETLINK_ROUTE_DECODER definition. */
 
+extern DECL_NETLINK_ROUTE_DECODER(decode_dcbmsg);
 extern DECL_NETLINK_ROUTE_DECODER(decode_fib_rule_hdr);
 extern DECL_NETLINK_ROUTE_DECODER(decode_ifaddrlblmsg);
 extern DECL_NETLINK_ROUTE_DECODER(decode_ifaddrmsg);

diff --git a/rtnl_dcb.c b/rtnl_dcb.c
new file mode 100644 (file)
index 0000000..0c9719b
--- /dev/null
+++ b/rtnl_dcb.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_LINUX_DCBNL_H
+
+# include "netlink_route.h"
+# include "print_fields.h"
+
+# include <linux/dcbnl.h>
+
+# include "xlat/dcb_commands.h"
+
+DECL_NETLINK_ROUTE_DECODER(decode_dcbmsg)
+{
+       struct dcbmsg dcb = { .dcb_family = family };
+       const size_t offset = sizeof(dcb.dcb_family);
+
+       PRINT_FIELD_XVAL("{", dcb, dcb_family, addrfams, "AF_???");
+
+       tprints(", ");
+       if (len >= sizeof(dcb)) {
+               if (!umoven_or_printaddr(tcp, addr + offset,
+                                        sizeof(dcb) - offset,
+                                        (void *) &dcb + offset)) {
+                       PRINT_FIELD_XVAL("", dcb, cmd,
+                                        dcb_commands, "DCB_CMD_???");
+               }
+       } else
+               tprints("...");
+       tprints("}");
+}
+
+#endif

diff --git a/xlat/dcb_commands.in b/xlat/dcb_commands.in
new file mode 100644 (file)
index 0000000..6a5e613
--- /dev/null
+++ b/xlat/dcb_commands.in
@@ -0,0 +1,28 @@
+DCB_CMD_UNDEFINED      0
+DCB_CMD_GSTATE         1
+DCB_CMD_SSTATE         2
+DCB_CMD_PGTX_GCFG      3
+DCB_CMD_PGTX_SCFG      4
+DCB_CMD_PGRX_GCFG      5
+DCB_CMD_PGRX_SCFG      6
+DCB_CMD_PFC_GCFG       7
+DCB_CMD_PFC_SCFG       8
+DCB_CMD_SET_ALL                9
+DCB_CMD_GPERM_HWADDR   10
+DCB_CMD_GCAP           11
+DCB_CMD_GNUMTCS                12
+DCB_CMD_SNUMTCS                13
+DCB_CMD_PFC_GSTATE     14
+DCB_CMD_PFC_SSTATE     15
+DCB_CMD_BCN_GCFG       16
+DCB_CMD_BCN_SCFG       17
+DCB_CMD_GAPP           18
+DCB_CMD_SAPP           19
+DCB_CMD_IEEE_SET       20
+DCB_CMD_IEEE_GET       21
+DCB_CMD_GDCBX          22
+DCB_CMD_SDCBX          23
+DCB_CMD_GFEATCFG       24
+DCB_CMD_SFEATCFG       25
+DCB_CMD_CEE_GET                26
+DCB_CMD_IEEE_DEL       27