update xfrm async events
[XFRM] update xfrm async events
Report abbreviated async xfrm aevents.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
diff --git a/ip/xfrm_monitor.c b/ip/xfrm_monitor.c
index 154bbee..b2014b4 100644
--- a/ip/xfrm_monitor.c
+++ b/ip/xfrm_monitor.c
@@ -150,6 +150,49 @@
return 0;
}
+void xfrm_ae_flags_print(__u32 flags, void *arg)
+{
+ FILE *fp = (FILE*)arg;
+ fprintf(fp, " (0x%x) ", flags);
+ if (!flags)
+ return;
+ if (flags & XFRM_AE_CR)
+ fprintf(fp, " replay update ");
+ if (flags & XFRM_AE_CE)
+ fprintf(fp, " timer expired ");
+ if (flags & XFRM_AE_CU)
+ fprintf(fp, " policy updated ");
+
+}
+
+static int xfrm_ae_print(const struct sockaddr_nl *who,
+ struct nlmsghdr *n, void *arg)
+{
+ FILE *fp = (FILE*)arg;
+ struct xfrm_aevent_id *id = NLMSG_DATA(n);
+ char abuf[256];
+
+ fprintf(fp, "Async event ");
+ xfrm_ae_flags_print(id->flags, arg);
+ fprintf(fp,"\n\t");
+ memset(abuf, '\0', sizeof(abuf));
+ fprintf(fp, "src %s ", rt_addr_n2a(id->sa_id.family,
+ sizeof(id->saddr), &id->saddr,
+ abuf, sizeof(abuf)));
+ memset(abuf, '\0', sizeof(abuf));
+ fprintf(fp, "dst %s ", rt_addr_n2a(id->sa_id.family,
+ sizeof(id->sa_id.daddr), &id->sa_id.daddr,
+ abuf, sizeof(abuf)));
+ fprintf(fp, " reqid 0x%x", id->reqid);
+ fprintf(fp, " protocol %s ", strxf_proto(id->sa_id.proto));
+ fprintf(fp, " SPI 0x%x", ntohl(id->sa_id.spi));
+
+ fprintf(fp, "\n");
+ fflush(fp);
+
+ return 0;
+}
+
static int xfrm_accept_msg(const struct sockaddr_nl *who,
struct nlmsghdr *n, void *arg)
{
@@ -190,6 +233,10 @@
xfrm_report_print(who, n, arg);
return 0;
}
+ if (n->nlmsg_type == XFRM_MSG_NEWAE) {
+ xfrm_ae_print(who, n, arg);
+ return 0;
+ }
if (n->nlmsg_type != NLMSG_ERROR && n->nlmsg_type != NLMSG_NOOP &&
n->nlmsg_type != NLMSG_DONE) {
fprintf(fp, "Unknown message: %08d 0x%08x 0x%08x\n",
@@ -206,6 +253,7 @@
unsigned groups = ~((unsigned)0); /* XXX */
int lacquire=0;
int lexpire=0;
+ int laevent=0;
int lpolicy=0;
int lsa=0;
int lreport=0;
@@ -225,6 +273,9 @@
} else if (matches(*argv, "SA") == 0) {
lsa=1;
groups = 0;
+ } else if (matches(*argv, "aevent") == 0) {
+ laevent=1;
+ groups = 0;
} else if (matches(*argv, "policy") == 0) {
lpolicy=1;
groups = 0;
@@ -248,6 +299,8 @@
groups |= XFRMGRP_SA;
if (lpolicy)
groups |= XFRMGRP_POLICY;
+ if (laevent)
+ groups |= (1 << (XFRMNLGRP_AEVENTS - 1));
if (lreport)
groups |= XFRMGRP_REPORT;