X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Fnetdev-vport.c;h=be269415922d215f283d6d6decbb0e7a9b860910;hb=42bb6c72b58ba99e59e740f8cca4e201d7efaa02;hp=ae043c266a8df9bc2d6c2c3060bf9a37d4409a86;hpb=b46ccdf582946f30d80735345c533c23a7f035c0;p=openvswitch diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index ae043c26..be269415 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -26,6 +26,8 @@ #include #include "byte-order.h" +#include "daemon.h" +#include "dirs.h" #include "dpif-linux.h" #include "hash.h" #include "hmap.h" @@ -54,6 +56,8 @@ struct netdev_vport_notifier { struct netdev_dev_vport { struct netdev_dev netdev_dev; struct ofpbuf *options; + int dp_ifindex; /* -1 if unknown. */ + uint32_t port_no; /* UINT32_MAX if unknown. */ }; struct netdev_vport { @@ -183,10 +187,14 @@ netdev_vport_create(const struct netdev_class *netdev_class, const char *name, const struct vport_class *vport_class = vport_class_cast(netdev_class); struct ofpbuf *options = NULL; struct shash fetched_args; + int dp_ifindex; + uint32_t port_no; int error; shash_init(&fetched_args); + dp_ifindex = -1; + port_no = UINT32_MAX; if (!shash_is_empty(args)) { /* Parse the provided configuration. */ options = ofpbuf_new(64); @@ -213,6 +221,8 @@ netdev_vport_create(const struct netdev_class *netdev_class, const char *name, name, strerror(error)); } else { options = ofpbuf_clone_data(reply.options, reply.options_len); + dp_ifindex = reply.dp_ifindex; + port_no = reply.port_no; } ofpbuf_delete(buf); } else { @@ -229,6 +239,8 @@ netdev_vport_create(const struct netdev_class *netdev_class, const char *name, shash_is_empty(&fetched_args) ? args : &fetched_args, netdev_class); dev->options = options; + dev->dp_ifindex = dp_ifindex; + dev->port_no = port_no; *netdev_devp = &dev->netdev_dev; route_table_register(); @@ -309,6 +321,32 @@ netdev_vport_set_config(struct netdev_dev *dev_, const struct shash *args) return error; } +static int +netdev_vport_send(struct netdev *netdev, const void *data, size_t size) +{ + struct netdev_dev *dev_ = netdev_get_dev(netdev); + struct netdev_dev_vport *dev = netdev_dev_vport_cast(dev_); + + if (dev->dp_ifindex == -1) { + const char *name = netdev_get_name(netdev); + struct dpif_linux_vport reply; + struct ofpbuf *buf; + int error; + + error = dpif_linux_vport_get(name, &reply, &buf); + if (error) { + VLOG_ERR_RL(&rl, "%s: failed to query vport for send (%s)", + name, strerror(error)); + return error; + } + dev->dp_ifindex = reply.dp_ifindex; + dev->port_no = reply.port_no; + ofpbuf_delete(buf); + } + + return dpif_linux_vport_send(dev->dp_ifindex, dev->port_no, data, size); +} + static int netdev_vport_set_etheraddr(struct netdev *netdev, const uint8_t mac[ETH_ADDR_LEN]) @@ -502,7 +540,7 @@ netdev_vport_poll_add(struct netdev *netdev, struct list *list; struct shash_node *shash_node; - shash_node = shash_find_data(&netdev_vport_notifiers, poll_name); + shash_node = shash_find(&netdev_vport_notifiers, poll_name); if (!shash_node) { list = xmalloc(sizeof *list); list_init(list); @@ -693,8 +731,8 @@ parse_tunnel_config(const char *name, const char *type, */ use_ssl_cert = shash_find_data(args, "use_ssl_cert"); if (!use_ssl_cert || strcmp(use_ssl_cert, "true")) { - VLOG_WARN("%s: 'peer_cert' requires 'certificate' argument", - name); + VLOG_ERR("%s: 'peer_cert' requires 'certificate' argument", + name); return EINVAL; } ipsec_mech_set = true; @@ -706,8 +744,8 @@ parse_tunnel_config(const char *name, const char *type, || !strcmp(node->name, "private_key") || !strcmp(node->name, "use_ssl_cert"))) { /* Ignore options not used by the netdev. */ - } else if (is_gre && (!strcmp(node->name, "key") && - !strcmp(node->name, "in_key") && + } else if (is_gre && (!strcmp(node->name, "key") || + !strcmp(node->name, "in_key") || !strcmp(node->name, "out_key"))) { /* Handled separately below. */ } else { @@ -716,14 +754,24 @@ parse_tunnel_config(const char *name, const char *type, } if (is_ipsec) { + char *file_name = xasprintf("%s/%s", ovs_rundir(), + "ovs-monitor-ipsec.pid"); + pid_t pid = read_pidfile(file_name); + free(file_name); + if (pid < 0) { + VLOG_ERR("%s: IPsec requires the ovs-monitor-ipsec daemon", + name); + return EINVAL; + } + if (shash_find(args, "peer_cert") && shash_find(args, "psk")) { - VLOG_WARN("%s: cannot define both 'peer_cert' and 'psk'", name); + VLOG_ERR("%s: cannot define both 'peer_cert' and 'psk'", name); return EINVAL; } if (!ipsec_mech_set) { - VLOG_WARN("%s: IPsec requires an 'peer_cert' or psk' argument", - name); + VLOG_ERR("%s: IPsec requires an 'peer_cert' or psk' argument", + name); return EINVAL; } } @@ -734,8 +782,8 @@ parse_tunnel_config(const char *name, const char *type, } if (!daddr) { - VLOG_WARN("%s: %s type requires valid 'remote_ip' argument", - name, type); + VLOG_ERR("%s: %s type requires valid 'remote_ip' argument", + name, type); return EINVAL; } nl_msg_put_be32(options, ODP_TUNNEL_ATTR_DST_IPV4, daddr); @@ -858,22 +906,22 @@ parse_patch_config(const char *name, const char *type OVS_UNUSED, peer = shash_find_data(args, "peer"); if (!peer) { - VLOG_WARN("%s: patch type requires valid 'peer' argument", name); + VLOG_ERR("%s: patch type requires valid 'peer' argument", name); return EINVAL; } if (shash_count(args) > 1) { - VLOG_WARN("%s: patch type takes only a 'peer' argument", name); + VLOG_ERR("%s: patch type takes only a 'peer' argument", name); return EINVAL; } if (strlen(peer) >= IFNAMSIZ) { - VLOG_WARN("%s: patch 'peer' arg too long", name); + VLOG_ERR("%s: patch 'peer' arg too long", name); return EINVAL; } if (!strcmp(name, peer)) { - VLOG_WARN("%s: patch peer must not be self", name); + VLOG_ERR("%s: patch peer must not be self", name); return EINVAL; } @@ -924,7 +972,7 @@ unparse_patch_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED, NULL, /* recv_wait */ \ NULL, /* drain */ \ \ - NULL, /* send */ \ + netdev_vport_send, /* send */ \ NULL, /* send_wait */ \ \ netdev_vport_set_etheraddr, \