From 27b14f2e87c721e361e1926087a6f9566d25d764 Mon Sep 17 00:00:00 2001 From: Vadim Kochan Date: Tue, 13 Jan 2015 20:14:23 +0200 Subject: [PATCH] Add define for nlmsg_types with timestamp Add #define for nlmsg_type = 15 Signed-off-by: Vadim Kochan --- bridge/monitor.c | 4 +--- include/libnetlink.h | 4 ++++ ip/ipmonitor.c | 2 +- ip/rtmon.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bridge/monitor.c b/bridge/monitor.c index 76e7d477b..f00e0a6b9 100644 --- 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 de7c85f37..d081e5421 100644 --- 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 4708e54d2..f40daac0d 100644 --- 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 9227eacc1..ff685e530 100644 --- 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; -- 2.47.3