Commit 77219712 authored by Stephen Hemminger's avatar Stephen Hemminger

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=383133Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
parent 302d3fb7
...@@ -152,9 +152,10 @@ static int xfrm_accept_msg(const struct sockaddr_nl *who, ...@@ -152,9 +152,10 @@ static int xfrm_accept_msg(const struct sockaddr_nl *who,
return 0; return 0;
} }
extern struct rtnl_handle rth;
int do_xfrm_monitor(int argc, char **argv) int do_xfrm_monitor(int argc, char **argv)
{ {
struct rtnl_handle rth;
char *file = NULL; char *file = NULL;
unsigned groups = ~((unsigned)0); /* XXX */ unsigned groups = ~((unsigned)0); /* XXX */
int lacquire=0; int lacquire=0;
...@@ -162,6 +163,8 @@ int do_xfrm_monitor(int argc, char **argv) ...@@ -162,6 +163,8 @@ int do_xfrm_monitor(int argc, char **argv)
int lpolicy=0; int lpolicy=0;
int lsa=0; int lsa=0;
rtnl_close(&rth);
while (argc > 0) { while (argc > 0) {
if (matches(*argv, "file") == 0) { if (matches(*argv, "file") == 0) {
NEXT_ARG(); NEXT_ARG();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment