From 77219712bf5bbb1a65961c9b322e4a68c55276ab Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 25 Sep 2006 17:27:37 -0700 Subject: [PATCH] Fix XFRM monitor The change to hold open the netlink socket (for ip batch mode), broke XFRM monitoring. Bug report: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=383133 Signed-off-by: Stephen Hemminger --- ip/xfrm_monitor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ip/xfrm_monitor.c b/ip/xfrm_monitor.c index 153621f7..baa46106 100644 --- a/ip/xfrm_monitor.c +++ b/ip/xfrm_monitor.c @@ -152,9 +152,10 @@ static int xfrm_accept_msg(const struct sockaddr_nl *who, return 0; } +extern struct rtnl_handle rth; + int do_xfrm_monitor(int argc, char **argv) { - struct rtnl_handle rth; char *file = NULL; unsigned groups = ~((unsigned)0); /* XXX */ int lacquire=0; @@ -162,6 +163,8 @@ int do_xfrm_monitor(int argc, char **argv) int lpolicy=0; int lsa=0; + rtnl_close(&rth); + while (argc > 0) { if (matches(*argv, "file") == 0) { NEXT_ARG();