projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dpif-linux: Use get_32aligned_u64() in an appropriate place.
[openvswitch]
/
utilities
/
nlmon.c
diff --git
a/utilities/nlmon.c
b/utilities/nlmon.c
index addee1ffa90545b06eae704bde7d9cb05fef2c7c..b6396d50b9da8c89bfa864ac031db7864e59904d 100644
(file)
--- a/
utilities/nlmon.c
+++ b/
utilities/nlmon.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010 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.
*
* 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 <stddef.h>
#include <linux/rtnetlink.h>
#include "netlink.h"
+#include "netlink-socket.h"
#include "ofpbuf.h"
#include "poll-loop.h"
#include "timeval.h"
#include "ofpbuf.h"
#include "poll-loop.h"
#include "timeval.h"
@@
-42,14
+43,18
@@
main(int argc OVS_UNUSED, char *argv[])
int error;
set_program_name(argv[0]);
int error;
set_program_name(argv[0]);
- 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");
}
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;
for (;;) {
struct ofpbuf *buf;