netlink: add a basic rtnetlink parser of nsid messages

* rtnl_nsid.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* netlink_route.h (decode_rtgenmsg): New prototype.
* netlink_route.c (route_decoders): Add RTM_DELNSID, RTM_GETNSID,
and RTM_NEWNSID.

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

diff --git a/Makefile.am b/Makefile.am
index 0a6ad03c14f2c5431d90f3d5807c11bc6c8a5724..2a477f6881f779a3a32f430bb9f09880b39bc540 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -255,6 +255,7 @@ strace_SOURCES =    \
        rtnl_neigh.c    \
        rtnl_neightbl.c \
        rtnl_netconf.c  \
+       rtnl_nsid.c     \
        rtnl_route.c    \
        rtnl_rule.c     \
        rtnl_tc.c       \

diff --git a/netlink_route.c b/netlink_route.c
index ec0595fd9c7bb2481e0636dd951f4bd3f38500ff..7afc9c9fd70f10be27673296daf7e17b6666a613 100644 (file)
--- a/netlink_route.c
+++ b/netlink_route.c
@@ -113,8 +113,12 @@ static const netlink_route_decoder_t route_decoders[] = {
 #ifdef HAVE_STRUCT_BR_PORT_MSG
        [RTM_DELMDB - RTM_BASE] = decode_br_port_msg,
        [RTM_GETMDB - RTM_BASE] = decode_br_port_msg,
-       [RTM_NEWMDB - RTM_BASE] = decode_br_port_msg
+       [RTM_NEWMDB - RTM_BASE] = decode_br_port_msg,
 #endif
+
+       [RTM_DELNSID - RTM_BASE] = decode_rtgenmsg,
+       [RTM_GETNSID - RTM_BASE] = decode_rtgenmsg,
+       [RTM_NEWNSID - RTM_BASE] = decode_rtgenmsg
 };
 
 bool

diff --git a/netlink_route.h b/netlink_route.h
index bfe108def95d58673eacde1c2af0432c756c41dd..5f97250b9365411254dc70b2abc2700bfcfacc7f 100644 (file)
--- a/netlink_route.h
+++ b/netlink_route.h
@@ -48,6 +48,7 @@ extern DECL_NETLINK_ROUTE_DECODER(decode_ifinfomsg);
 extern DECL_NETLINK_ROUTE_DECODER(decode_ndmsg);
 extern DECL_NETLINK_ROUTE_DECODER(decode_ndtmsg);
 extern DECL_NETLINK_ROUTE_DECODER(decode_netconfmsg);
+extern DECL_NETLINK_ROUTE_DECODER(decode_rtgenmsg);
 extern DECL_NETLINK_ROUTE_DECODER(decode_rtm_getneigh);
 extern DECL_NETLINK_ROUTE_DECODER(decode_rtmsg);
 extern DECL_NETLINK_ROUTE_DECODER(decode_tcamsg);

diff --git a/rtnl_nsid.c b/rtnl_nsid.c
new file mode 100644 (file)
index 0000000..de28788
--- /dev/null
+++ b/rtnl_nsid.c
@@ -0,0 +1,43 @@
+/*
+ * 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"
+#include "netlink_route.h"
+#include "print_fields.h"
+
+#include "netlink.h"
+#include <linux/rtnetlink.h>
+
+DECL_NETLINK_ROUTE_DECODER(decode_rtgenmsg)
+{
+       struct rtgenmsg rtgenmsg = { .rtgen_family = family };
+
+       PRINT_FIELD_XVAL("{", rtgenmsg, rtgen_family, addrfams, "AF_???");
+       tprints("}");
+}