#include "socket-util.h"
#include "openflow.h"
#include "ofp-print.h"
+#include "random.h"
#include "vconn.h"
#include "vconn-ssl.h"
#include "vlog.h"
#define THIS_MODULE VLM_dpctl
+#define DEFAULT_MAX_IDLE 60
+#define MAX_ADD_ACTS 5
+
static const char* ifconfigbin = "/sbin/ifconfig";
struct command {
" dump-flows SWITCH FLOW print matching FLOWs\n"
" dump-aggregate SWITCH print aggregate flow statistics\n"
" dump-aggregate SWITCH FLOW print aggregate stats for FLOWs\n"
+ " add-flow SWITCH FLOW add flow described by FLOW\n"
" add-flows SWITCH FILE add flows from FILE\n"
" del-flows SWITCH FLOW delete matching FLOWs\n"
"where each SWITCH is an active OpenFlow connection method.\n",
\f
/* Generic commands. */
-static uint32_t
-random_xid(void)
-{
- static bool inited = false;
- if (!inited) {
- struct timeval tv;
- inited = true;
- if (gettimeofday(&tv, NULL) < 0) {
- fatal(errno, "gettimeofday");
- }
- srand(tv.tv_sec ^ tv.tv_usec);
- }
- return rand();
-}
-
static void *
alloc_openflow_buffer(size_t openflow_len, uint8_t type,
struct buffer **bufferp)
oh->version = OFP_VERSION;
oh->type = type;
oh->length = 0;
- oh->xid = random_xid();
+ oh->xid = random_uint32();
return oh;
}
}
static void
-str_to_action(const char *str, struct ofp_action *action)
+str_to_action(char *str, struct ofp_action *action, int *n_actions)
{
uint16_t port;
+ int i;
+ int max_actions = *n_actions;
+ char *act, *arg;
+ char *saveptr = NULL;
+
+ memset(action, 0, sizeof(*action) * max_actions);
+ for (i=0, act = strtok_r(str, ", \t\r\n", &saveptr);
+ i<max_actions && act;
+ i++, act = strtok_r(NULL, ", \t\r\n", &saveptr))
+ {
+ port = OFPP_MAX;
- 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);
+ /* Arguments are separated by colons */
+ arg = strchr(act, ':');
+ if (arg) {
+ *arg = '\0';
+ arg++;
+ }
+
+ if (!strcasecmp(act, "mod_vlan")) {
+ action[i].type = htons(OFPAT_SET_DL_VLAN);
+
+ if (!strcasecmp(arg, "strip")) {
+ action[i].arg.vlan_id = htons(OFP_VLAN_NONE);
+ } else {
+ action[i].arg.vlan_id = htons(str_to_int(arg));
+ }
+ } else if (!strcasecmp(act, "output")) {
+ port = str_to_int(arg);
+ } else if (!strcasecmp(act, "TABLE")) {
+ port = OFPP_TABLE;
+ } else if (!strcasecmp(act, "NORMAL")) {
+ port = OFPP_NORMAL;
+ } else if (!strcasecmp(act, "FLOOD")) {
+ port = OFPP_FLOOD;
+ } else if (!strcasecmp(act, "ALL")) {
+ port = OFPP_ALL;
+ } else if (!strcasecmp(act, "CONTROLLER")) {
+ port = OFPP_CONTROLLER;
+ if (arg) {
+ if (!strcasecmp(arg, "all")) {
+ action[i].arg.output.max_len= htons(0);
+ } else {
+ action[i].arg.output.max_len= htons(str_to_int(arg));
+ }
+ }
+ } else if (!strcasecmp(act, "LOCAL")) {
+ port = OFPP_LOCAL;
+ } else if (strspn(act, "0123456789") == strlen(act)) {
+ port = str_to_int(act);
+ } else {
+ fatal(0, "Unknown action: %s", act);
+ }
+
+ if (port != OFPP_MAX) {
+ action[i].type = htons(OFPAT_OUTPUT);
+ action[i].arg.output.port = htons(port);
+ }
}
- memset(action, 0, sizeof *action);
- action->type = OFPAT_OUTPUT;
- action->arg.output.port = htons(port);
+ *n_actions = i;
}
static void
-str_to_flow(char *string, struct ofp_match *match, struct ofp_action *action,
- uint8_t *table_idx, uint16_t *priority)
+str_to_flow(char *string, struct ofp_match *match,
+ struct ofp_action *action, int *n_actions, uint8_t *table_idx,
+ uint16_t *priority, uint16_t *max_idle)
{
struct field {
const char *name;
char *name, *value;
uint32_t wildcards;
- bool got_action = false;
+ char *act_str;
if (table_idx) {
*table_idx = 0xff;
if (priority) {
*priority = OFP_DEFAULT_PRIORITY;
}
+ if (max_idle) {
+ *max_idle = DEFAULT_MAX_IDLE;
+ }
+ if (action) {
+ act_str = strstr(string, "action");
+ if (!act_str) {
+ fatal(0, "must specify an action");
+ }
+ *(act_str-1) = '\0';
+
+ act_str = strchr(act_str, '=');
+ if (!act_str) {
+ fatal(0, "must specify an action");
+ }
+
+ act_str++;
+
+ str_to_action(act_str, action, n_actions);
+ }
memset(match, 0, sizeof *match);
wildcards = OFPFW_ALL;
for (name = strtok(string, "="), value = strtok(NULL, ", \t\r\n");
const struct field *f;
void *data;
- if (action && !strcmp(name, "action")) {
- got_action = true;
- str_to_action(value, action);
- continue;
- }
-
if (table_idx && !strcmp(name, "table")) {
*table_idx = atoi(value);
continue;
continue;
}
+ if (max_idle && !strcmp(name, "max_idle")) {
+ *max_idle = atoi(value);
+ continue;
+ }
+
for (f = fields; f < &fields[ARRAY_SIZE(fields)]; f++) {
if (!strcmp(f->name, name)) {
goto found;
if (name && !value) {
fatal(0, "field %s missing value", name);
}
- if (action && !got_action) {
- fatal(0, "must specify an action");
- }
match->wildcards = htons(wildcards);
}
struct buffer *request;
req = alloc_stats_request(sizeof *req, OFPST_FLOW, &request);
- str_to_flow(argc > 2 ? argv[2] : "", &req->match, NULL, &req->table_id,
- NULL);
+ str_to_flow(argc > 2 ? argv[2] : "", &req->match, NULL, 0,
+ &req->table_id, NULL, NULL);
memset(req->pad, 0, sizeof req->pad);
dump_stats_transaction(argv[1], request);
struct buffer *request;
req = alloc_stats_request(sizeof *req, OFPST_AGGREGATE, &request);
- str_to_flow(argc > 2 ? argv[2] : "", &req->match, NULL, &req->table_id,
- NULL);
+ str_to_flow(argc > 2 ? argv[2] : "", &req->match, NULL, 0,
+ &req->table_id, NULL, NULL);
memset(req->pad, 0, sizeof req->pad);
dump_stats_transaction(argv[1], request);
}
+static void do_add_flow(int argc, char *argv[])
+{
+ struct vconn *vconn;
+ struct buffer *buffer;
+ struct ofp_flow_mod *ofm;
+ uint16_t priority, max_idle;
+ size_t size;
+ int n_actions = MAX_ADD_ACTS;
+
+ run(vconn_open_block(argv[1], &vconn), "connecting to %s", argv[1]);
+
+ /* Parse and send. */
+ size = sizeof *ofm + (sizeof ofm->actions[0] * MAX_ADD_ACTS);
+ ofm = alloc_openflow_buffer(size, OFPT_FLOW_MOD, &buffer);
+ str_to_flow(argv[2], &ofm->match, &ofm->actions[0], &n_actions,
+ NULL, &priority, &max_idle);
+ ofm->command = htons(OFPFC_ADD);
+ ofm->max_idle = htons(max_idle);
+ ofm->buffer_id = htonl(UINT32_MAX);
+ ofm->priority = htons(priority);
+ ofm->reserved = htonl(0);
+
+ /* xxx Should we use the buffer library? */
+ buffer->size -= (MAX_ADD_ACTS - n_actions) * sizeof ofm->actions[0];
+
+ send_openflow_buffer(vconn, buffer);
+ vconn_close(vconn);
+}
+
static void do_add_flows(int argc, char *argv[])
{
struct vconn *vconn;
while (fgets(line, sizeof line, file)) {
struct buffer *buffer;
struct ofp_flow_mod *ofm;
- uint16_t priority;
+ uint16_t priority, max_idle;
size_t size;
+ int n_actions = MAX_ADD_ACTS;
char *comment;
}
/* Parse and send. */
- size = sizeof *ofm + sizeof ofm->actions[0];
+ size = sizeof *ofm + (sizeof ofm->actions[0] * MAX_ADD_ACTS);
ofm = alloc_openflow_buffer(size, OFPT_FLOW_MOD, &buffer);
- str_to_flow(line, &ofm->match, &ofm->actions[0], NULL, &priority);
+ str_to_flow(line, &ofm->match, &ofm->actions[0], &n_actions,
+ NULL, &priority, &max_idle);
ofm->command = htons(OFPFC_ADD);
- ofm->max_idle = htons(50);
+ ofm->max_idle = htons(max_idle);
ofm->buffer_id = htonl(UINT32_MAX);
ofm->priority = htons(priority);
ofm->reserved = htonl(0);
+ /* xxx Should we use the buffer library? */
+ buffer->size -= (MAX_ADD_ACTS - n_actions) * sizeof ofm->actions[0];
+
send_openflow_buffer(vconn, buffer);
}
vconn_close(vconn);
/* Parse and send. */
size = sizeof *ofm;
ofm = alloc_openflow_buffer(size, OFPT_FLOW_MOD, &buffer);
- str_to_flow(argc > 2 ? argv[2] : "", &ofm->match, NULL, NULL, &priority);
+ str_to_flow(argc > 2 ? argv[2] : "", &ofm->match, NULL, 0, NULL,
+ &priority, NULL);
ofm->command = htons(OFPFC_DELETE);
ofm->max_idle = htons(0);
ofm->buffer_id = htonl(UINT32_MAX);
{ "dump-tables", 1, 1, do_dump_tables },
{ "dump-flows", 1, 2, do_dump_flows },
{ "dump-aggregate", 1, 2, do_dump_aggregate },
+ { "add-flow", 2, 2, do_add_flow },
{ "add-flows", 2, 2, do_add_flows },
{ "del-flows", 1, 2, do_del_flows },
{ "dump-ports", 1, 1, do_dump_ports },
git://git.onelab.eu / sliver-openvswitch.git / blobdiff