#include "flow.h"
#include "mac-learning.h"
#include "ofpbuf.h"
+#include "ofp-parse.h"
#include "ofp-print.h"
#include "ofp-util.h"
#include "openflow/openflow.h"
#include "stp.h"
#include "timeval.h"
#include "vconn.h"
+#include "vlog.h"
#include "xtoxll.h"
-#define THIS_MODULE VLM_learning_switch
-#include "vlog.h"
+VLOG_DEFINE_THIS_MODULE(learning_switch)
enum port_state {
P_DISABLED = 1 << 0,
struct mac_learning *ml; /* NULL to act as hub instead of switch. */
uint32_t wildcards; /* Wildcards to apply to flows. */
bool action_normal; /* Use OFPP_NORMAL? */
+ uint32_t queue; /* OpenFlow queue to use, or UINT32_MAX. */
/* Number of outgoing queued packets on the rconn. */
struct rconn_packet_counter *queued;
static void queue_tx(struct lswitch *, struct rconn *, struct ofpbuf *);
static void send_features_request(struct lswitch *, struct rconn *);
+static void send_default_flows(struct lswitch *sw, struct rconn *rconn,
+ FILE *default_flows);
static void schedule_query(struct lswitch *, long long int delay);
static bool may_learn(const struct lswitch *, uint16_t port_no);
static bool may_recv(const struct lswitch *, uint16_t port_no,
* after the given number of seconds (or never expire, if 'max_idle' is
* OFP_FLOW_PERMANENT). Otherwise, the new switch will process every packet.
*
+ * The caller may provide the file stream 'default_flows' that defines
+ * default flows that should be pushed when a switch connects. Each
+ * line is a flow entry in the format described for "add-flows" command
+ * in the Flow Syntax section of the ovs-ofct(8) man page. The caller
+ * is responsible for closing the stream.
+ *
* 'rconn' is used to send out an OpenFlow features request. */
struct lswitch *
lswitch_create(struct rconn *rconn, bool learn_macs,
- bool exact_flows, int max_idle, bool action_normal)
+ bool exact_flows, int max_idle, bool action_normal,
+ FILE *default_flows)
{
struct lswitch *sw;
size_t i;
sw->wildcards = (OFPFW_DL_TYPE | OFPFW_NW_SRC_MASK | OFPFW_NW_DST_MASK
| OFPFW_NW_PROTO | OFPFW_TP_SRC | OFPFW_TP_DST);
}
+ sw->queue = UINT32_MAX;
sw->queued = rconn_packet_counter_create();
sw->next_query = LLONG_MIN;
sw->last_query = LLONG_MIN;
sw->port_states[i] = P_DISABLED;
}
send_features_request(sw, rconn);
+ if (default_flows) {
+ send_default_flows(sw, rconn, default_flows);
+ }
return sw;
}
}
}
+/* Sets 'queue' as the OpenFlow queue used by packets and flows set up by 'sw'.
+ * Specify UINT32_MAX to avoid specifying a particular queue, which is also the
+ * default if this function is never called for 'sw'. */
+void
+lswitch_set_queue(struct lswitch *sw, uint32_t queue)
+{
+ sw->queue = queue;
+}
+
/* Takes care of necessary 'sw' activity, except for receiving packets (which
* the caller must do). */
void
long long int now = time_msec();
if (sw->ml) {
- mac_learning_run(sw->ml, NULL);
+ mac_learning_run(sw->ml);
}
/* If we're waiting for more replies, keeping waiting for up to 10 s. */
}
}
+static void
+send_default_flows(struct lswitch *sw, struct rconn *rconn,
+ FILE *default_flows)
+{
+ char line[1024];
+
+ while (fgets(line, sizeof line, default_flows)) {
+ struct ofpbuf *b;
+ struct ofp_flow_mod *ofm;
+ uint16_t priority, idle_timeout, hard_timeout;
+ uint64_t cookie;
+ struct ofp_match match;
+
+ char *comment;
+
+ /* Delete comments. */
+ comment = strchr(line, '#');
+ if (comment) {
+ *comment = '\0';
+ }
+
+ /* Drop empty lines. */
+ if (line[strspn(line, " \t\n")] == '\0') {
+ continue;
+ }
+
+ /* Parse and send. str_to_flow() will expand and reallocate the data
+ * in 'buffer', so we can't keep pointers to across the str_to_flow()
+ * call. */
+ make_openflow(sizeof *ofm, OFPT_FLOW_MOD, &b);
+ parse_ofp_str(line, &match, b,
+ NULL, NULL, &priority, &idle_timeout, &hard_timeout,
+ &cookie);
+ ofm = b->data;
+ ofm->match = match;
+ ofm->command = htons(OFPFC_ADD);
+ ofm->cookie = htonll(cookie);
+ ofm->idle_timeout = htons(idle_timeout);
+ ofm->hard_timeout = htons(hard_timeout);
+ ofm->buffer_id = htonl(UINT32_MAX);
+ ofm->priority = htons(priority);
+
+ update_openflow_length(b);
+ queue_tx(sw, rconn, b);
+ }
+}
+
static void
queue_tx(struct lswitch *sw, struct rconn *rconn, struct ofpbuf *b)
{
uint16_t in_port = ntohs(opi->in_port);
uint16_t out_port;
+ struct ofp_action_header actions[2];
+ size_t actions_len;
+
size_t pkt_ofs, pkt_len;
struct ofpbuf pkt;
flow_t flow;
/* Choose output port. */
out_port = lswitch_choose_destination(sw, &flow);
+ /* Make actions. */
+ if (out_port == OFPP_NONE) {
+ actions_len = 0;
+ } else if (sw->queue == UINT32_MAX || out_port >= OFPP_MAX) {
+ struct ofp_action_output oao;
+
+ memset(&oao, 0, sizeof oao);
+ oao.type = htons(OFPAT_OUTPUT);
+ oao.len = htons(sizeof oao);
+ oao.port = htons(out_port);
+
+ memcpy(actions, &oao, sizeof oao);
+ actions_len = sizeof oao;
+ } else {
+ struct ofp_action_enqueue oae;
+
+ memset(&oae, 0, sizeof oae);
+ oae.type = htons(OFPAT_ENQUEUE);
+ oae.len = htons(sizeof oae);
+ oae.port = htons(out_port);
+ oae.queue_id = htonl(sw->queue);
+
+ memcpy(actions, &oae, sizeof oae);
+ actions_len = sizeof oae;
+ }
+ assert(actions_len <= sizeof actions);
+
/* Send the packet, and possibly the whole flow, to the output port. */
if (sw->max_idle >= 0 && (!sw->ml || out_port != OFPP_FLOOD)) {
struct ofpbuf *buffer;
/* The output port is known, or we always flood everything, so add a
* new flow. */
- buffer = make_add_simple_flow(&flow, ntohl(opi->buffer_id),
- out_port, sw->max_idle);
+ buffer = make_add_flow(&flow, ntohl(opi->buffer_id),
+ sw->max_idle, actions_len);
+ ofpbuf_put(buffer, actions, actions_len);
ofm = buffer->data;
ofm->match.wildcards = htonl(sw->wildcards);
queue_tx(sw, rconn, buffer);
/* If the switch didn't buffer the packet, we need to send a copy. */
- if (ntohl(opi->buffer_id) == UINT32_MAX && out_port != OFPP_NONE) {
+ if (ntohl(opi->buffer_id) == UINT32_MAX && actions_len > 0) {
queue_tx(sw, rconn,
- make_unbuffered_packet_out(&pkt, in_port, out_port));
+ make_packet_out(&pkt, UINT32_MAX, in_port,
+ actions, actions_len / sizeof *actions));
}
} else {
/* We don't know that MAC, or we don't set up flows. Send along the
* packet without setting up a flow. */
- if (ntohl(opi->buffer_id) == UINT32_MAX) {
- if (out_port != OFPP_NONE) {
- queue_tx(sw, rconn,
- make_unbuffered_packet_out(&pkt, in_port, out_port));
- }
- } else {
+ if (ntohl(opi->buffer_id) != UINT32_MAX || actions_len > 0) {
queue_tx(sw, rconn,
- make_buffered_packet_out(ntohl(opi->buffer_id),
- in_port, out_port));
+ make_packet_out(&pkt, ntohl(opi->buffer_id), in_port,
+ actions, actions_len / sizeof *actions));
}
}
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff