X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fnlmon.c;h=b6396d50b9da8c89bfa864ac031db7864e59904d;hb=7fae5e7bb62af3b8ac74fe20052064eb01feada0;hp=1da026b02f624ec21eaef07c30647a762513f66a;hpb=34e63086edddcae06d7c1a4fa84fec0861e50758;p=sliver-openvswitch.git

diff --git a/utilities/nlmon.c b/utilities/nlmon.c
index 1da026b02..b6396d50b 100644
--- a/utilities/nlmon.c
+++ b/utilities/nlmon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 #include <stddef.h>
 #include <linux/rtnetlink.h>
 #include "netlink.h"
+#include "netlink-socket.h"
 #include "ofpbuf.h"
 #include "poll-loop.h"
 #include "timeval.h"
@@ -36,21 +37,24 @@ static const struct nl_policy rtnlgrp_link_policy[] = {
 };
 
 int
-main(int argc UNUSED, char *argv[])
+main(int argc OVS_UNUSED, char *argv[])
 {
     struct nl_sock *sock;
     int error;
 
     set_program_name(argv[0]);
-    time_init();
-    vlog_init();
-    vlog_set_levels(VLM_ANY_MODULE, VLF_ANY_FACILITY, VLL_DBG);
+    vlog_set_levels(NULL, VLF_ANY_FACILITY, VLL_DBG);
 
-    error = nl_sock_create(NETLINK_ROUTE, RTNLGRP_LINK, 0, 0, &sock);
+    error = nl_sock_create(NETLINK_ROUTE, &sock);
     if (error) {
         ovs_fatal(error, "could not create rtnetlink socket");
     }
 
+    error = nl_sock_join_mcgroup(sock, RTNLGRP_LINK);
+    if (error) {
+        ovs_fatal(error, "could not join RTNLGRP_LINK multicast group");
+    }
+
     for (;;) {
         struct ofpbuf *buf;