SunnyQjm/openflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make flow specifications more general in dpctl:

Browse Source 
- More special port names.
- Allow fields to be comma-separated, for use on command line.
- Allow ANY as a synonym for *, to avoid globbing on command line.
This commit is contained in:
Ben Pfaff
2008-06-13 10:19:46 -07:00
parent fe867d8d71
commit 72223f2a8b
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utilities/dpctl.c
+10 -4
View File
@@ -501,10 +501,16 @@ str_to_action(const char *str, struct ofp_action *action)
{
uint16_t port;
if (!strcasecmp(str, "flood")) {
if (!strcasecmp(str, "normal")) {
port = OFPP_NORMAL;
} else if (!strcasecmp(str, "flood")) {
port = OFPP_FLOOD;
} else if (!strcasecmp(str, "all")) {
port = OFPP_ALL;
} else if (!strcasecmp(str, "controller")) {
port = OFPP_CONTROLLER;
} else if (!strcasecmp(str, "local")) {
port = OFPP_LOCAL;
} else {
port = str_to_int(str);
}
@@ -551,9 +557,9 @@ str_to_flow(char *string, struct ofp_match *match, struct ofp_action *action,
}
memset(match, 0, sizeof *match);
wildcards = OFPFW_ALL;
for (name = strtok(string, "="), value = strtok(NULL, " \t\n");
for (name = strtok(string, "="), value = strtok(NULL, ", \t\r\n");
name && value;
name = strtok(NULL, "="), value = strtok(NULL, " \t\n"))
name = strtok(NULL, "="), value = strtok(NULL, ", \t\r\n"))
{
const struct field *f;
void *data;
@@ -592,7 +598,7 @@ str_to_flow(char *string, struct ofp_match *match, struct ofp_action *action,
found:
data = (char *) match + f->offset;
if (!strcmp(value, "*")) {
if (!strcmp(value, "*") || !strcmp(value, "ANY")) {
wildcards |= f->wildcard;
} else {
wildcards &= ~f->wildcard;