Add define for nlmsg_types with timestamp

Add #define for nlmsg_type = 15

Signed-off-by: Vadim Kochan <vadim4j@gmail.com>

diff --git a/bridge/monitor.c b/bridge/monitor.c
index 76e7d477be662a59339e501bd59c89f33c07c8aa..f00e0a6b942fb94db3326a55a2d6dcb618468d36 100644 (file)
--- a/bridge/monitor.c
+++ b/bridge/monitor.c
@@ -74,14 +74,12 @@ static int accept_msg(const struct sockaddr_nl *who,
                        fprintf(fp, "[MDB]");
                return print_mdb(who, n, arg);
 
-       case 15:
+       case NLMSG_TSTAMP:
                return show_mark(fp, n);
 
        default:
                return 0;
        }
-
-
 }
 
 int do_monitor(int argc, char **argv)

diff --git a/include/libnetlink.h b/include/libnetlink.h
index de7c85f3731edee48cde67c879c7ac7a6420123d..d081e54210eab6bbc822c767ab483742219829e3 100644 (file)
--- a/include/libnetlink.h
+++ b/include/libnetlink.h
@@ -158,5 +158,9 @@ extern int rtnl_from_file(FILE *, rtnl_filter_t handler,
 #define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndtmsg))
 #endif
 
+/* User defined nlmsg_type which is used mostly for logging netlink
+ * messages from dump file */
+#define NLMSG_TSTAMP   15
+
 #endif /* __LIBNETLINK_H__ */
 

diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c
index 4708e54d2405dc64f7b1c81c7267e917795ec3a0..f40daac0d72fb676231148719f9e87e94e15c768 100644 (file)
--- a/ip/ipmonitor.c
+++ b/ip/ipmonitor.c
@@ -125,7 +125,7 @@ static int accept_msg(const struct sockaddr_nl *who,
                print_netconf(who, n, arg);
                return 0;
        }
-       if (n->nlmsg_type == 15) {
+       if (n->nlmsg_type == NLMSG_TSTAMP) {
                char *tstr;
                time_t secs = ((__u32*)NLMSG_DATA(n))[0];
                long usecs = ((__u32*)NLMSG_DATA(n))[1];

diff --git a/ip/rtmon.c b/ip/rtmon.c
index 9227eacc10f835372fd63d719c060349a22bc9dd..ff685e530d95db1af3566b7b7887e78deb9bc721 100644 (file)
--- a/ip/rtmon.c
+++ b/ip/rtmon.c
@@ -34,7 +34,7 @@ static void write_stamp(FILE *fp)
        struct nlmsghdr *n1 = (void*)buf;
        struct timeval tv;
 
-       n1->nlmsg_type = 15;
+       n1->nlmsg_type = NLMSG_TSTAMP;
        n1->nlmsg_flags = 0;
        n1->nlmsg_seq = 0;
        n1->nlmsg_pid = 0;