git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netlink-socket: Add functions for joining and leaving multicast groups.
[sliver-openvswitch.git]
/
lib
/
netdev-vport.c
diff --git
a/lib/netdev-vport.c
b/lib/netdev-vport.c
index
2d0d984
..
bb9e510
100644
(file)
--- a/
lib/netdev-vport.c
+++ b/
lib/netdev-vport.c
@@
-362,7
+362,16
@@
netdev_vport_get_status(const struct netdev *netdev, struct shash *sh)
const char *iface = netdev_vport_get_tnl_iface(netdev);
if (iface) {
const char *iface = netdev_vport_get_tnl_iface(netdev);
if (iface) {
+ struct netdev *egress_netdev;
+
shash_add(sh, "tunnel_egress_iface", xstrdup(iface));
shash_add(sh, "tunnel_egress_iface", xstrdup(iface));
+
+ if (!netdev_open_default(iface, &egress_netdev)) {
+ shash_add(sh, "tunnel_egress_iface_carrier",
+ xstrdup(netdev_get_carrier(egress_netdev)
+ ? "up" : "down"));
+ netdev_close(egress_netdev);
+ }
}
return 0;
}
return 0;
@@
-480,7
+489,7
@@
netdev_vport_reset_names(void)
free(nn);
}
free(nn);
}
- error = nl_sock_create(NETLINK_ROUTE,
0, 0, 0,
&rtnl_sock);
+ error = nl_sock_create(NETLINK_ROUTE, &rtnl_sock);
if (error) {
VLOG_WARN_RL(&rl, "Failed to create NETLINK_ROUTE socket");
return error;
if (error) {
VLOG_WARN_RL(&rl, "Failed to create NETLINK_ROUTE socket");
return error;