mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

odp-util: Add support for named ports to odp_flow_key_from_string().

Browse Source 
Really the "trace" command should support this but in fact I need it for
an upcoming update to a test.
This commit is contained in:
Ben Pfaff
2011-10-26 10:01:32 -07:00
parent 39db78a0fb
commit b2a60db8e4
4 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/odp-util.c
View File

@@ -31,12 +31,16 @@
#include "ofpbuf.h"
#include "openvswitch/tunnel.h"
#include "packets.h"
#include "shash.h"
#include "timeval.h"
#include "util.h"
#include "vlog.h"
VLOG_DEFINE_THIS_MODULE(odp_util);
static int parse_odp_key_attr(const char *, const struct shash *port_names,
struct ofpbuf *);
/* The interface between userspace and kernel uses an "OVS_*" prefix.
* Since this is fairly non-specific for the OVS userspace components,
* "ODP_*" (Open vSwitch Datapath) is used as the prefix for
@@ -564,7 +568,8 @@ ovs_frag_type_from_string(const char *s, enum ovs_frag_type *type)
}
static int
parse_odp_key_attr(const char *s, struct ofpbuf *key)
parse_odp_key_attr(const char *s, const struct shash *port_names,
struct ofpbuf *key)
{
/* Many of the sscanf calls in this function use oversized destination
* fields because some sscanf() implementations truncate the range of %i
@@ -608,6 +613,20 @@ parse_odp_key_attr(const char *s, struct ofpbuf *key)
}
}
if (port_names && !strncmp(s, "in_port(", 8)) {
const char *name;
const struct shash_node *node;
int name_len;
name = s + 8;
name_len = strcspn(s, ")");
node = shash_find_len(port_names, name, name_len);
if (node) {
nl_msg_put_u32(key, OVS_KEY_ATTR_IN_PORT, (uintptr_t) node->data);
return 8 + name_len + 1;
}
}
{
struct ovs_key_ethernet eth_key;
int n = -1;
@@ -880,11 +899,16 @@ parse_odp_key_attr(const char *s, struct ofpbuf *key)
* data is appended to 'key'. Either way, 'key''s data might be
* reallocated.
*
* If 'port_names' is nonnull, it points to an shash that maps from a port name
* to a port number cast to void *. (Port names may be used instead of port
* numbers in in_port.)
*
* On success, the attributes appended to 'key' are individually syntactically
* valid, but they may not be valid as a sequence. 'key' might, for example,
* have duplicated keys. odp_flow_key_to_flow() will detect those errors. */
int
odp_flow_key_from_string(const char *s, struct ofpbuf *key)
odp_flow_key_from_string(const char *s, const struct shash *port_names,
struct ofpbuf *key)
{
const size_t old_size = key->size;
for (;;) {
@@ -895,7 +919,7 @@ odp_flow_key_from_string(const char *s, struct ofpbuf *key)
return 0;
}
retval = parse_odp_key_attr(s, key);
retval = parse_odp_key_attr(s, port_names, key);
if (retval < 0) {
key->size = old_size;
return -retval;