struct netdev_dev netdev_dev;
struct ofpbuf *options;
unsigned int change_seq;
-};
-
-struct netdev_vport {
- struct netdev netdev;
+ uint8_t etheraddr[ETH_ADDR_LEN];
};
struct vport_class {
size_t options_len,
struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1]);
-static const char *netdev_vport_get_tnl_iface(const struct netdev *netdev);
-
static bool
is_vport_class(const struct netdev_class *class)
{
return CONTAINER_OF(netdev_dev, struct netdev_dev_vport, netdev_dev);
}
-static struct netdev_vport *
-netdev_vport_cast(const struct netdev *netdev)
+static struct netdev_dev_vport *
+netdev_vport_get_dev(const struct netdev *netdev)
{
- struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
- assert(is_vport_class(netdev_dev_get_class(netdev_dev)));
- return CONTAINER_OF(netdev, struct netdev_vport, netdev);
+ return netdev_dev_vport_cast(netdev_get_dev(netdev));
}
/* If 'netdev' is a vport netdev, returns an ofpbuf that contains Netlink
netdev_dev_init(&dev->netdev_dev, name, netdev_class);
dev->options = NULL;
dev->change_seq = 1;
+ eth_addr_random(dev->etheraddr);
*netdev_devp = &dev->netdev_dev;
route_table_register();
}
static int
-netdev_vport_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp)
+netdev_vport_open(struct netdev_dev *netdev_dev, struct netdev **netdevp)
{
- struct netdev_vport *netdev;
-
- netdev = xmalloc(sizeof *netdev);
- netdev_init(&netdev->netdev, netdev_dev_);
-
- *netdevp = &netdev->netdev;
+ *netdevp = xmalloc(sizeof **netdevp);
+ netdev_init(*netdevp, netdev_dev);
return 0;
}
static void
-netdev_vport_close(struct netdev *netdev_)
+netdev_vport_close(struct netdev *netdev)
{
- struct netdev_vport *netdev = netdev_vport_cast(netdev_);
free(netdev);
}
netdev_vport_set_etheraddr(struct netdev *netdev,
const uint8_t mac[ETH_ADDR_LEN])
{
- struct dpif_linux_vport vport;
- int error;
-
- dpif_linux_vport_init(&vport);
- vport.cmd = OVS_VPORT_CMD_SET;
- vport.name = netdev_get_name(netdev);
- vport.address = mac;
-
- error = dpif_linux_vport_transact(&vport, NULL, NULL);
- if (!error) {
- netdev_vport_poll_notify(netdev);
- }
- return error;
+ memcpy(netdev_vport_get_dev(netdev)->etheraddr, mac, ETH_ADDR_LEN);
+ netdev_vport_poll_notify(netdev);
+ return 0;
}
static int
netdev_vport_get_etheraddr(const struct netdev *netdev,
uint8_t mac[ETH_ADDR_LEN])
{
- struct dpif_linux_vport reply;
- struct ofpbuf *buf;
- int error;
-
- error = dpif_linux_vport_get(netdev_get_name(netdev), &reply, &buf);
- if (!error) {
- if (reply.address) {
- memcpy(mac, reply.address, ETH_ADDR_LEN);
- } else {
- error = EOPNOTSUPP;
- }
- ofpbuf_delete(buf);
- }
- return error;
+ memcpy(mac, netdev_vport_get_dev(netdev)->etheraddr, ETH_ADDR_LEN);
+ return 0;
}
/* Copies 'src' into 'dst', performing format conversion in the process.
}
static int
-netdev_vport_get_drv_info(const struct netdev *netdev, struct smap *smap)
+tunnel_get_status(const struct netdev *netdev, struct smap *smap)
{
- const char *iface = netdev_vport_get_tnl_iface(netdev);
+ struct netdev_dev_vport *ndv = netdev_vport_get_dev(netdev);
+ struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1];
+ static char iface[IFNAMSIZ];
+ ovs_be32 route;
- if (iface) {
+ if (!ndv->options) {
+ /* Race condition when 'ndv' was created, but did not have it's
+ * configuration set yet. */
+ return 0;
+ }
+
+ if (tnl_port_config_from_nlattr(ndv->options->data,
+ ndv->options->size, a)) {
+ return 0;
+ }
+ route = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_DST_IPV4]);
+
+ if (route_table_get_name(route, iface)) {
struct netdev *egress_netdev;
smap_add(smap, "tunnel_egress_iface", iface);
static unsigned int
netdev_vport_change_seq(const struct netdev *netdev)
{
- return netdev_dev_vport_cast(netdev_get_dev(netdev))->change_seq;
+ return netdev_vport_get_dev(netdev)->change_seq;
}
static void
route_table_wait();
}
\f
-/* get_tnl_iface() implementation. */
-static const char *
-netdev_vport_get_tnl_iface(const struct netdev *netdev)
-{
- struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1];
- struct netdev_dev_vport *ndv;
- static char name[IFNAMSIZ];
-
- ndv = netdev_dev_vport_cast(netdev_get_dev(netdev));
- if (!ndv->options) {
- /* Race condition when 'ndv' was created, but did not have its
- * configuration set yet. */
- return NULL;
- }
-
- if (tnl_port_config_from_nlattr(ndv->options->data, ndv->options->size,
- a)) {
- return NULL;
- }
- if (a[OVS_TUNNEL_ATTR_DST_IPV4]) {
- ovs_be32 route = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_DST_IPV4]);
-
- if (route_table_get_name(route, name)) {
- return name;
- }
- }
- return NULL;
-}
-\f
/* Helper functions. */
static void
netdev_vport_poll_notify(const struct netdev *netdev)
{
- struct netdev_dev_vport *ndv;
-
- ndv = netdev_dev_vport_cast(netdev_get_dev(netdev));
+ struct netdev_dev_vport *ndv = netdev_vport_get_dev(netdev);
ndv->change_seq++;
if (!ndv->change_seq) {
if (!strcmp(node->value, "false")) {
flags &= ~TNL_F_DF_DEFAULT;
}
- } else if (!strcmp(node->key, "pmtud")) {
- if (!strcmp(node->value, "true")) {
- VLOG_WARN_ONCE("%s: The tunnel Path MTU discovery is "
- "deprecated and may be removed in February "
- "2013. Please email dev@openvswitch.org with "
- "concerns.", name);
- flags |= TNL_F_PMTUD;
- }
} else if (!strcmp(node->key, "peer_cert") && is_ipsec) {
if (smap_get(args, "certificate")) {
ipsec_mech_set = true;
if (!(flags & TNL_F_DF_DEFAULT)) {
smap_add(args, "df_default", "false");
}
- if (flags & TNL_F_PMTUD) {
- smap_add(args, "pmtud", "true");
- }
return 0;
}
{
static const struct vport_class vport_classes[] = {
{ OVS_VPORT_TYPE_GRE,
- { "gre", VPORT_FUNCTIONS(netdev_vport_get_drv_info) },
+ { "gre", VPORT_FUNCTIONS(tunnel_get_status) },
parse_tunnel_config, unparse_tunnel_config },
{ OVS_VPORT_TYPE_GRE,
- { "ipsec_gre", VPORT_FUNCTIONS(netdev_vport_get_drv_info) },
+ { "ipsec_gre", VPORT_FUNCTIONS(tunnel_get_status) },
parse_tunnel_config, unparse_tunnel_config },
{ OVS_VPORT_TYPE_GRE64,
- { "gre64", VPORT_FUNCTIONS(netdev_vport_get_drv_info) },
+ { "gre64", VPORT_FUNCTIONS(tunnel_get_status) },
parse_tunnel_config, unparse_tunnel_config },
{ OVS_VPORT_TYPE_GRE64,
- { "ipsec_gre64", VPORT_FUNCTIONS(netdev_vport_get_drv_info) },
+ { "ipsec_gre64", VPORT_FUNCTIONS(tunnel_get_status) },
parse_tunnel_config, unparse_tunnel_config },
{ OVS_VPORT_TYPE_CAPWAP,
- { "capwap", VPORT_FUNCTIONS(netdev_vport_get_drv_info) },
+ { "capwap", VPORT_FUNCTIONS(tunnel_get_status) },
parse_tunnel_config, unparse_tunnel_config },
{ OVS_VPORT_TYPE_VXLAN,
- { "vxlan", VPORT_FUNCTIONS(netdev_vport_get_drv_info) },
+ { "vxlan", VPORT_FUNCTIONS(tunnel_get_status) },
parse_tunnel_config, unparse_tunnel_config },
{ OVS_VPORT_TYPE_PATCH,
git://git.onelab.eu / sliver-openvswitch.git / blobdiff