projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-util: Allow decoding of Open Flow 1.2 Flow Statistics Response Messages
[openvswitch]
/
lib
/
netdev-vport.c
diff --git
a/lib/netdev-vport.c
b/lib/netdev-vport.c
index 7bd50a41c306c0fae5822ff3a3259805ee4bea82..db5c3db8d71cf77da9dd05e284ab2dd18bbe2222 100644
(file)
--- a/
lib/netdev-vport.c
+++ b/
lib/netdev-vport.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2010, 2011
Nicira Networks
.
+ * Copyright (c) 2010, 2011
, 2012 Nicira, Inc
.
*
* 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.
@@
-65,10
+65,10
@@
struct vport_class {
enum ovs_vport_type type;
struct netdev_class netdev_class;
int (*parse_config)(const char *name, const char *type,
enum ovs_vport_type type;
struct netdev_class netdev_class;
int (*parse_config)(const char *name, const char *type,
- const struct s
hash
*args, struct ofpbuf *options);
+ const struct s
map
*args, struct ofpbuf *options);
int (*unparse_config)(const char *name, const char *type,
const struct nlattr *options, size_t options_len,
int (*unparse_config)(const char *name, const char *type,
const struct nlattr *options, size_t options_len,
- struct s
hash
*args);
+ struct s
map
*args);
};
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
};
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
@@
-198,6
+198,7
@@
netdev_vport_destroy(struct netdev_dev *netdev_dev_)
{
struct netdev_dev_vport *netdev_dev = netdev_dev_vport_cast(netdev_dev_);
{
struct netdev_dev_vport *netdev_dev = netdev_dev_vport_cast(netdev_dev_);
+ ofpbuf_delete(netdev_dev->options);
route_table_unregister();
free(netdev_dev);
}
route_table_unregister();
free(netdev_dev);
}
@@
-222,7
+223,7
@@
netdev_vport_close(struct netdev *netdev_)
}
static int
}
static int
-netdev_vport_get_config(struct netdev_dev *dev_, struct s
hash
*args)
+netdev_vport_get_config(struct netdev_dev *dev_, struct s
map
*args)
{
const struct netdev_class *netdev_class = netdev_dev_get_class(dev_);
const struct vport_class *vport_class = vport_class_cast(netdev_class);
{
const struct netdev_class *netdev_class = netdev_dev_get_class(dev_);
const struct vport_class *vport_class = vport_class_cast(netdev_class);
@@
-259,7
+260,7
@@
netdev_vport_get_config(struct netdev_dev *dev_, struct shash *args)
}
static int
}
static int
-netdev_vport_set_config(struct netdev_dev *dev_, const struct s
hash
*args)
+netdev_vport_set_config(struct netdev_dev *dev_, const struct s
map
*args)
{
const struct netdev_class *netdev_class = netdev_dev_get_class(dev_);
const struct vport_class *vport_class = vport_class_cast(netdev_class);
{
const struct netdev_class *netdev_class = netdev_dev_get_class(dev_);
const struct vport_class *vport_class = vport_class_cast(netdev_class);
@@
-458,19
+459,18
@@
netdev_vport_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
}
static int
}
static int
-netdev_vport_get_drv_info(const struct netdev *netdev, struct s
hash *sh
)
+netdev_vport_get_drv_info(const struct netdev *netdev, struct s
map *smap
)
{
const char *iface = netdev_vport_get_tnl_iface(netdev);
if (iface) {
struct netdev *egress_netdev;
{
const char *iface = netdev_vport_get_tnl_iface(netdev);
if (iface) {
struct netdev *egress_netdev;
- s
hash_add(sh, "tunnel_egress_iface", xstrdup(iface)
);
+ s
map_add(smap, "tunnel_egress_iface", iface
);
if (!netdev_open(iface, "system", &egress_netdev)) {
if (!netdev_open(iface, "system", &egress_netdev)) {
- shash_add(sh, "tunnel_egress_iface_carrier",
- xstrdup(netdev_get_carrier(egress_netdev)
- ? "up" : "down"));
+ smap_add(smap, "tunnel_egress_iface_carrier",
+ netdev_get_carrier(egress_netdev) ? "up" : "down");
netdev_close(egress_netdev);
}
}
netdev_close(egress_netdev);
}
}
@@
-550,14
+550,14
@@
netdev_vport_poll_notify(const struct netdev *netdev)
/* Code specific to individual vport types. */
static void
/* Code specific to individual vport types. */
static void
-set_key(const struct s
hash
*args, const char *name, uint16_t type,
+set_key(const struct s
map
*args, const char *name, uint16_t type,
struct ofpbuf *options)
{
const char *s;
struct ofpbuf *options)
{
const char *s;
- s = s
hash_find_data
(args, name);
+ s = s
map_get
(args, name);
if (!s) {
if (!s) {
- s = s
hash_find_data
(args, "key");
+ s = s
map_get
(args, "key");
if (!s) {
s = "0";
}
if (!s) {
s = "0";
}
@@
-572,11
+572,11
@@
set_key(const struct shash *args, const char *name, uint16_t type,
static int
parse_tunnel_config(const char *name, const char *type,
static int
parse_tunnel_config(const char *name, const char *type,
- const struct s
hash
*args, struct ofpbuf *options)
+ const struct s
map
*args, struct ofpbuf *options)
{
bool is_gre = false;
bool is_ipsec = false;
{
bool is_gre = false;
bool is_ipsec = false;
- struct s
hash
_node *node;
+ struct s
map
_node *node;
bool ipsec_mech_set = false;
ovs_be32 daddr = htonl(0);
ovs_be32 saddr = htonl(0);
bool ipsec_mech_set = false;
ovs_be32 daddr = htonl(0);
ovs_be32 saddr = htonl(0);
@@
-592,55
+592,62
@@
parse_tunnel_config(const char *name, const char *type,
flags &= ~TNL_F_HDR_CACHE;
}
flags &= ~TNL_F_HDR_CACHE;
}
- S
HASH
_FOR_EACH (node, args) {
- if (!strcmp(node->
name
, "remote_ip")) {
+ S
MAP
_FOR_EACH (node, args) {
+ if (!strcmp(node->
key
, "remote_ip")) {
struct in_addr in_addr;
struct in_addr in_addr;
- if (lookup_ip(node->
data
, &in_addr)) {
+ if (lookup_ip(node->
value
, &in_addr)) {
VLOG_WARN("%s: bad %s 'remote_ip'", name, type);
} else {
daddr = in_addr.s_addr;
}
VLOG_WARN("%s: bad %s 'remote_ip'", name, type);
} else {
daddr = in_addr.s_addr;
}
- } else if (!strcmp(node->
name
, "local_ip")) {
+ } else if (!strcmp(node->
key
, "local_ip")) {
struct in_addr in_addr;
struct in_addr in_addr;
- if (lookup_ip(node->
data
, &in_addr)) {
+ if (lookup_ip(node->
value
, &in_addr)) {
VLOG_WARN("%s: bad %s 'local_ip'", name, type);
} else {
saddr = in_addr.s_addr;
}
VLOG_WARN("%s: bad %s 'local_ip'", name, type);
} else {
saddr = in_addr.s_addr;
}
- } else if (!strcmp(node->
name
, "tos")) {
- if (!strcmp(node->
data
, "inherit")) {
+ } else if (!strcmp(node->
key
, "tos")) {
+ if (!strcmp(node->
value
, "inherit")) {
flags |= TNL_F_TOS_INHERIT;
} else {
flags |= TNL_F_TOS_INHERIT;
} else {
- nl_msg_put_u8(options, OVS_TUNNEL_ATTR_TOS, atoi(node->data));
+ char *endptr;
+ int tos;
+ tos = strtol(node->value, &endptr, 0);
+ if (*endptr == '\0' && tos == (tos & IP_DSCP_MASK)) {
+ nl_msg_put_u8(options, OVS_TUNNEL_ATTR_TOS, tos);
+ } else {
+ VLOG_WARN("%s: invalid TOS %s", name, node->value);
+ }
}
}
- } else if (!strcmp(node->
name
, "ttl")) {
- if (!strcmp(node->
data
, "inherit")) {
+ } else if (!strcmp(node->
key
, "ttl")) {
+ if (!strcmp(node->
value
, "inherit")) {
flags |= TNL_F_TTL_INHERIT;
} else {
flags |= TNL_F_TTL_INHERIT;
} else {
- nl_msg_put_u8(options, OVS_TUNNEL_ATTR_TTL, atoi(node->
data
));
+ nl_msg_put_u8(options, OVS_TUNNEL_ATTR_TTL, atoi(node->
value
));
}
}
- } else if (!strcmp(node->
name
, "csum") && is_gre) {
- if (!strcmp(node->
data
, "true")) {
+ } else if (!strcmp(node->
key
, "csum") && is_gre) {
+ if (!strcmp(node->
value
, "true")) {
flags |= TNL_F_CSUM;
}
flags |= TNL_F_CSUM;
}
- } else if (!strcmp(node->
name
, "df_inherit")) {
- if (!strcmp(node->
data
, "true")) {
+ } else if (!strcmp(node->
key
, "df_inherit")) {
+ if (!strcmp(node->
value
, "true")) {
flags |= TNL_F_DF_INHERIT;
}
flags |= TNL_F_DF_INHERIT;
}
- } else if (!strcmp(node->
name
, "df_default")) {
- if (!strcmp(node->
data
, "false")) {
+ } else if (!strcmp(node->
key
, "df_default")) {
+ if (!strcmp(node->
value
, "false")) {
flags &= ~TNL_F_DF_DEFAULT;
}
flags &= ~TNL_F_DF_DEFAULT;
}
- } else if (!strcmp(node->
name
, "pmtud")) {
- if (!strcmp(node->
data
, "false")) {
+ } else if (!strcmp(node->
key
, "pmtud")) {
+ if (!strcmp(node->
value
, "false")) {
flags &= ~TNL_F_PMTUD;
}
flags &= ~TNL_F_PMTUD;
}
- } else if (!strcmp(node->
name
, "header_cache")) {
- if (!strcmp(node->
data
, "false")) {
+ } else if (!strcmp(node->
key
, "header_cache")) {
+ if (!strcmp(node->
value
, "false")) {
flags &= ~TNL_F_HDR_CACHE;
}
flags &= ~TNL_F_HDR_CACHE;
}
- } else if (!strcmp(node->
name
, "peer_cert") && is_ipsec) {
- if (s
hash_find
(args, "certificate")) {
+ } else if (!strcmp(node->
key
, "peer_cert") && is_ipsec) {
+ if (s
map_get
(args, "certificate")) {
ipsec_mech_set = true;
} else {
const char *use_ssl_cert;
ipsec_mech_set = true;
} else {
const char *use_ssl_cert;
@@
-651,7
+658,7
@@
parse_tunnel_config(const char *name, const char *type,
* will like be removed when multiple SSL configurations
* are supported by OVS.
*/
* will like be removed when multiple SSL configurations
* are supported by OVS.
*/
- use_ssl_cert = s
hash_find_data
(args, "use_ssl_cert");
+ use_ssl_cert = s
map_get
(args, "use_ssl_cert");
if (!use_ssl_cert || strcmp(use_ssl_cert, "true")) {
VLOG_ERR("%s: 'peer_cert' requires 'certificate' argument",
name);
if (!use_ssl_cert || strcmp(use_ssl_cert, "true")) {
VLOG_ERR("%s: 'peer_cert' requires 'certificate' argument",
name);
@@
-659,34
+666,38
@@
parse_tunnel_config(const char *name, const char *type,
}
ipsec_mech_set = true;
}
}
ipsec_mech_set = true;
}
- } else if (!strcmp(node->
name
, "psk") && is_ipsec) {
+ } else if (!strcmp(node->
key
, "psk") && is_ipsec) {
ipsec_mech_set = true;
} else if (is_ipsec
ipsec_mech_set = true;
} else if (is_ipsec
- && (!strcmp(node->
name
, "certificate")
- || !strcmp(node->
name
, "private_key")
- || !strcmp(node->
name
, "use_ssl_cert"))) {
+ && (!strcmp(node->
key
, "certificate")
+ || !strcmp(node->
key
, "private_key")
+ || !strcmp(node->
key
, "use_ssl_cert"))) {
/* Ignore options not used by the netdev. */
/* Ignore options not used by the netdev. */
- } else if (!strcmp(node->
name
, "key") ||
- !strcmp(node->
name
, "in_key") ||
- !strcmp(node->
name
, "out_key")) {
+ } else if (!strcmp(node->
key
, "key") ||
+ !strcmp(node->
key
, "in_key") ||
+ !strcmp(node->
key
, "out_key")) {
/* Handled separately below. */
} else {
/* Handled separately below. */
} else {
- VLOG_WARN("%s: unknown %s argument '%s'", name, type, node->
name
);
+ VLOG_WARN("%s: unknown %s argument '%s'", name, type, node->
key
);
}
}
if (is_ipsec) {
}
}
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);
+ static pid_t pid = 0;
+ if (pid <= 0) {
+ char *file_name = xasprintf("%s/%s", ovs_rundir(),
+ "ovs-monitor-ipsec.pid");
+ 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 (pid < 0) {
VLOG_ERR("%s: IPsec requires the ovs-monitor-ipsec daemon",
name);
return EINVAL;
}
- if (s
hash_find(args, "peer_cert") && shash_find
(args, "psk")) {
+ if (s
map_get(args, "peer_cert") && smap_get
(args, "psk")) {
VLOG_ERR("%s: cannot define both 'peer_cert' and 'psk'", name);
return EINVAL;
}
VLOG_ERR("%s: cannot define both 'peer_cert' and 'psk'", name);
return EINVAL;
}
@@
-753,7
+764,7
@@
get_be64_or_zero(const struct nlattr *a)
static int
unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
const struct nlattr *options, size_t options_len,
static int
unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
const struct nlattr *options, size_t options_len,
- struct s
hash
*args)
+ struct s
map
*args)
{
struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1];
ovs_be32 daddr;
{
struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1];
ovs_be32 daddr;
@@
-772,11
+783,11
@@
unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
}
daddr = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_DST_IPV4]);
}
daddr = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_DST_IPV4]);
- s
hash_add(args, "remote_ip", xasprintf(IP_FMT, IP_ARGS(&daddr)
));
+ s
map_add_format(args, "remote_ip", IP_FMT, IP_ARGS(&daddr
));
if (a[OVS_TUNNEL_ATTR_SRC_IPV4]) {
ovs_be32 saddr = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_SRC_IPV4]);
if (a[OVS_TUNNEL_ATTR_SRC_IPV4]) {
ovs_be32 saddr = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_SRC_IPV4]);
- s
hash_add(args, "local_ip", xasprintf(IP_FMT, IP_ARGS(&saddr)
));
+ s
map_add_format(args, "local_ip", IP_FMT, IP_ARGS(&saddr
));
}
if (!a[OVS_TUNNEL_ATTR_IN_KEY] && !a[OVS_TUNNEL_ATTR_OUT_KEY]) {
}
if (!a[OVS_TUNNEL_ATTR_IN_KEY] && !a[OVS_TUNNEL_ATTR_OUT_KEY]) {
@@
-786,18
+797,18
@@
unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
uint64_t out_key = get_be64_or_zero(a[OVS_TUNNEL_ATTR_OUT_KEY]);
if (in_key && in_key == out_key) {
uint64_t out_key = get_be64_or_zero(a[OVS_TUNNEL_ATTR_OUT_KEY]);
if (in_key && in_key == out_key) {
- s
hash_add(args, "key", xasprintf("%"PRIu64, in_key)
);
+ s
map_add_format(args, "key", "%"PRIu64, in_key
);
} else {
if (!a[OVS_TUNNEL_ATTR_IN_KEY]) {
smap_add(args, "in_key", "flow");
} else if (in_key) {
} else {
if (!a[OVS_TUNNEL_ATTR_IN_KEY]) {
smap_add(args, "in_key", "flow");
} else if (in_key) {
- s
hash_add(args, "in_key", xasprintf("%"PRIu64, in_key)
);
+ s
map_add_format(args, "in_key", "%"PRIu64, in_key
);
}
if (!a[OVS_TUNNEL_ATTR_OUT_KEY]) {
smap_add(args, "out_key", "flow");
} else if (out_key) {
}
if (!a[OVS_TUNNEL_ATTR_OUT_KEY]) {
smap_add(args, "out_key", "flow");
} else if (out_key) {
- s
hash_add(args, "out_key", xasprintf("%"PRIu64, out_key)
);
+ s
map_add_format(args, "out_key", "%"PRIu64, out_key
);
}
}
}
}
}
}
@@
-806,14
+817,14
@@
unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
smap_add(args, "tos", "inherit");
} else if (a[OVS_TUNNEL_ATTR_TTL]) {
int ttl = nl_attr_get_u8(a[OVS_TUNNEL_ATTR_TTL]);
smap_add(args, "tos", "inherit");
} else if (a[OVS_TUNNEL_ATTR_TTL]) {
int ttl = nl_attr_get_u8(a[OVS_TUNNEL_ATTR_TTL]);
- s
hash_add(args, "tos", xasprintf("%d", ttl)
);
+ s
map_add_format(args, "tos", "%d", ttl
);
}
if (flags & TNL_F_TOS_INHERIT) {
smap_add(args, "tos", "inherit");
} else if (a[OVS_TUNNEL_ATTR_TOS]) {
int tos = nl_attr_get_u8(a[OVS_TUNNEL_ATTR_TOS]);
}
if (flags & TNL_F_TOS_INHERIT) {
smap_add(args, "tos", "inherit");
} else if (a[OVS_TUNNEL_ATTR_TOS]) {
int tos = nl_attr_get_u8(a[OVS_TUNNEL_ATTR_TOS]);
- s
hash_add(args, "tos", xasprintf("%d", tos)
);
+ s
map_add_format(args, "tos", "0x%x", tos
);
}
if (flags & TNL_F_CSUM) {
}
if (flags & TNL_F_CSUM) {
@@
-834,17
+845,17
@@
unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
static int
parse_patch_config(const char *name, const char *type OVS_UNUSED,
static int
parse_patch_config(const char *name, const char *type OVS_UNUSED,
- const struct s
hash
*args, struct ofpbuf *options)
+ const struct s
map
*args, struct ofpbuf *options)
{
const char *peer;
{
const char *peer;
- peer = s
hash_find_data
(args, "peer");
+ peer = s
map_get
(args, "peer");
if (!peer) {
VLOG_ERR("%s: patch type requires valid 'peer' argument", name);
return EINVAL;
}
if (!peer) {
VLOG_ERR("%s: patch type requires valid 'peer' argument", name);
return EINVAL;
}
- if (s
hash
_count(args) > 1) {
+ if (s
map
_count(args) > 1) {
VLOG_ERR("%s: patch type takes only a 'peer' argument", name);
return EINVAL;
}
VLOG_ERR("%s: patch type takes only a 'peer' argument", name);
return EINVAL;
}
@@
-867,7
+878,7
@@
parse_patch_config(const char *name, const char *type OVS_UNUSED,
static int
unparse_patch_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
const struct nlattr *options, size_t options_len,
static int
unparse_patch_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
const struct nlattr *options, size_t options_len,
- struct s
hash
*args)
+ struct s
map
*args)
{
static const struct nl_policy ovs_patch_policy[] = {
[OVS_PATCH_ATTR_PEER] = { .type = NL_A_STRING,
{
static const struct nl_policy ovs_patch_policy[] = {
[OVS_PATCH_ATTR_PEER] = { .type = NL_A_STRING,