#include <time.h>
#include <unistd.h>
-#include "buffer.h"
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
-#include "dhcp.h"
#include "dhcp-client.h"
+#include "dhcp.h"
#include "dynamic-string.h"
#include "fault.h"
#include "flow.h"
#include "list.h"
#include "mac-learning.h"
#include "netdev.h"
+#include "nicira-ext.h"
+#include "ofpbuf.h"
#include "openflow.h"
#include "packets.h"
#include "poll-loop.h"
bool in_band; /* Connect to controller in-band? */
/* Related vconns and network devices. */
- const char *nl_name; /* Local datapath (must be "nl:" vconn). */
- char *of_name; /* ofX network device name. */
+ const char *dp_name; /* Local datapath. */
const char *controller_name; /* Controller (if not discovery mode). */
const char *listener_names[MAX_MGMT]; /* Listen for mgmt connections. */
size_t n_listeners; /* Number of mgmt connection listeners. */
bool update_resolv_conf; /* Update /etc/resolv.conf? */
/* Spanning tree protocol. */
- bool stp; /* Enable spanning tree protocol? */
+ bool enable_stp;
};
struct half {
struct rconn *rconn;
- struct buffer *rxbuf;
+ struct ofpbuf *rxbuf;
int n_txq; /* No. of packets queued for tx on 'rconn'. */
};
static void parse_options(int argc, char *argv[], struct settings *);
static void usage(void) NO_RETURN;
-static struct vconn *open_passive_vconn(const char *name);
-static struct vconn *accept_vconn(struct vconn *vconn);
+static struct pvconn *open_passive_vconn(const char *name);
+static struct vconn *accept_vconn(struct pvconn *pvconn);
static struct relay *relay_create(struct rconn *local, struct rconn *remote,
bool is_mgmt_conn);
-static struct relay *relay_accept(const struct settings *, struct vconn *);
+static struct relay *relay_accept(const struct settings *, struct pvconn *);
static void relay_run(struct relay *, const struct hook[], size_t n_hooks);
static void relay_wait(struct relay *);
static void relay_destroy(struct relay *);
static struct ofp_packet_in *get_ofp_packet_in(struct relay *);
static bool get_ofp_packet_eth_header(struct relay *, struct ofp_packet_in **,
struct eth_header **);
-static void get_ofp_packet_payload(struct ofp_packet_in *, struct buffer *);
+static void get_ofp_packet_payload(struct ofp_packet_in *, struct ofpbuf *);
struct switch_status;
struct status_reply;
static void rconn_status_cb(struct status_reply *, void *rconn_);
+struct port_watcher;
static struct discovery *discovery_init(const struct settings *,
+ struct port_watcher *,
struct switch_status *);
static void discovery_question_connectivity(struct discovery *);
static bool discovery_run(struct discovery *, char **controller_name);
static struct hook in_band_hook_create(const struct settings *,
struct switch_status *,
+ struct port_watcher *,
struct rconn *remote);
-struct port_watcher;
static struct hook port_watcher_create(struct rconn *local,
struct rconn *remote,
struct port_watcher **);
-static uint32_t port_watcher_get_flags(const struct port_watcher *,
+static uint32_t port_watcher_get_config(const struct port_watcher *,
int port_no);
-static void port_watcher_set_flags(struct port_watcher *,
- int port_no, uint32_t flags, uint32_t mask);
+static void port_watcher_set_flags(struct port_watcher *, int port_no,
+ uint32_t config, uint32_t c_mask,
+ uint32_t state, uint32_t s_mask);
static struct hook stp_hook_create(const struct settings *,
struct port_watcher *,
struct hook hooks[8];
size_t n_hooks = 0;
- struct vconn *monitor;
+ struct pvconn *monitor;
- struct vconn *listeners[MAX_MGMT];
+ struct pvconn *listeners[MAX_MGMT];
size_t n_listeners;
struct rconn *local_rconn, *remote_rconn;
struct relay *controller_relay;
struct discovery *discovery;
struct switch_status *switch_status;
+ struct port_watcher *pw;
int i;
int retval;
/* Initialize switch status hook. */
hooks[n_hooks++] = switch_status_hook_create(&s, &switch_status);
- /* Start controller discovery. */
- discovery = s.discovery ? discovery_init(&s, switch_status) : NULL;
-
/* Start listening for vlogconf requests. */
retval = vlog_server_listen(NULL, NULL);
if (retval) {
- fatal(retval, "Could not listen for vlog connections");
+ ofp_fatal(retval, "Could not listen for vlog connections");
}
die_if_already_running();
/* Connect to datapath. */
local_rconn = rconn_create(0, s.max_backoff);
- rconn_connect(local_rconn, s.nl_name);
+ rconn_connect(local_rconn, s.dp_name);
switch_status_register_category(switch_status, "local",
rconn_status_cb, local_rconn);
if (s.controller_name) {
retval = rconn_connect(remote_rconn, s.controller_name);
if (retval == EAFNOSUPPORT) {
- fatal(0, "No support for %s vconn", s.controller_name);
+ ofp_fatal(0, "No support for %s vconn", s.controller_name);
}
}
switch_status_register_category(switch_status, "remote",
list_push_back(&relays, &controller_relay->node);
/* Set up hooks. */
- if (s.stp) {
- struct port_watcher *pw;
- hooks[n_hooks++] = port_watcher_create(local_rconn, remote_rconn, &pw);
+ hooks[n_hooks++] = port_watcher_create(local_rconn, remote_rconn, &pw);
+ discovery = s.discovery ? discovery_init(&s, pw, switch_status) : NULL;
+ if (s.enable_stp) {
hooks[n_hooks++] = stp_hook_create(&s, pw, local_rconn, remote_rconn);
}
if (s.in_band) {
- hooks[n_hooks++] = in_band_hook_create(&s, switch_status,
+ hooks[n_hooks++] = in_band_hook_create(&s, switch_status, pw,
remote_rconn);
}
if (s.fail_mode == FAIL_OPEN) {
relay_wait(r);
}
for (i = 0; i < n_listeners; i++) {
- vconn_accept_wait(listeners[i]);
+ pvconn_wait(listeners[i]);
}
if (monitor) {
- vconn_accept_wait(monitor);
+ pvconn_wait(monitor);
}
for (i = 0; i < n_hooks; i++) {
if (hooks[i].wait_cb) {
return 0;
}
-static struct vconn *
-open_passive_vconn(const char *name)
+static struct pvconn *
+open_passive_vconn(const char *name)
{
- struct vconn *vconn;
+ struct pvconn *pvconn;
int retval;
- retval = vconn_open(name, &vconn);
+ retval = pvconn_open(name, &pvconn);
if (retval && retval != EAGAIN) {
- fatal(retval, "opening %s", name);
- }
- if (!vconn_is_passive(vconn)) {
- fatal(0, "%s is not a passive vconn", name);
+ ofp_fatal(retval, "opening %s", name);
}
- return vconn;
+ return pvconn;
}
static struct vconn *
-accept_vconn(struct vconn *vconn)
+accept_vconn(struct pvconn *pvconn)
{
struct vconn *new;
int retval;
- retval = vconn_accept(vconn, &new);
+ retval = pvconn_accept(pvconn, OFP_VERSION, &new);
if (retval && retval != EAGAIN) {
VLOG_WARN_RL(&vrl, "accept failed (%s)", strerror(retval));
}
static struct ofp_packet_in *
get_ofp_packet_in(struct relay *r)
{
- struct buffer *msg = r->halves[HALF_LOCAL].rxbuf;
+ struct ofpbuf *msg = r->halves[HALF_LOCAL].rxbuf;
struct ofp_header *oh = msg->data;
if (oh->type == OFPT_PACKET_IN) {
if (msg->size >= offsetof (struct ofp_packet_in, data)) {
/* OpenFlow message relaying. */
static struct relay *
-relay_accept(const struct settings *s, struct vconn *listen_vconn)
+relay_accept(const struct settings *s, struct pvconn *pvconn)
{
struct vconn *new_remote, *new_local;
- char *nl_name_without_subscription;
struct rconn *r1, *r2;
+ char *vconn_name;
+ int nl_index;
int retval;
- new_remote = accept_vconn(listen_vconn);
+ new_remote = accept_vconn(pvconn);
if (!new_remote) {
return NULL;
}
- /* nl:123 or nl:123:1 opens a netlink connection to local datapath 123. We
- * only accept the former syntax in main().
- *
- * nl:123:0 opens a netlink connection to local datapath 123 without
- * obtaining a subscription for ofp_packet_in or ofp_flow_expired
- * messages.*/
- nl_name_without_subscription = xasprintf("%s:0", s->nl_name);
- retval = vconn_open(nl_name_without_subscription, &new_local);
+ if (sscanf(s->dp_name, "nl:%d", &nl_index) == 1) {
+ /* nl:123 or nl:123:1 opens a netlink connection to local datapath 123.
+ * nl:123:0 opens a netlink connection to local datapath 123 without
+ * obtaining a subscription for ofp_packet_in or ofp_flow_expired
+ * messages. That's what we want here; management connections should
+ * not receive those messages, at least by default. */
+ vconn_name = xasprintf("nl:%d:0", nl_index);
+ } else {
+ /* We don't have a way to specify not to subscribe to those messages
+ * for other transports. (That's a defect: really this should be in
+ * the OpenFlow protocol, not the Netlink transport). */
+ VLOG_WARN_RL(&vrl, "new management connection will receive "
+ "asynchronous messages");
+ vconn_name = xstrdup(s->dp_name);
+ }
+
+ retval = vconn_open(vconn_name, OFP_VERSION, &new_local);
if (retval) {
VLOG_ERR_RL(&vrl, "could not connect to %s (%s)",
- nl_name_without_subscription, strerror(retval));
+ vconn_name, strerror(retval));
vconn_close(new_remote);
- free(nl_name_without_subscription);
+ free(vconn_name);
return NULL;
}
/* Create and return relay. */
r1 = rconn_create(0, 0);
- rconn_connect_unreliably(r1, nl_name_without_subscription, new_local);
- free(nl_name_without_subscription);
+ rconn_connect_unreliably(r1, vconn_name, new_local);
+ free(vconn_name);
r2 = rconn_create(0, 0);
rconn_connect_unreliably(r2, "passive", new_remote);
const struct hook *h;
for (h = hooks; h < &hooks[n_hooks]; h++) {
if (h->packet_cb[i] && h->packet_cb[i](r, h->aux)) {
- buffer_delete(this->rxbuf);
+ ofpbuf_delete(this->rxbuf);
this->rxbuf = NULL;
progress = true;
break;
if (!retval) {
progress = true;
} else {
- buffer_delete(this->rxbuf);
+ ofpbuf_delete(this->rxbuf);
}
this->rxbuf = NULL;
}
for (i = 0; i < 2; i++) {
struct half *this = &r->halves[i];
rconn_destroy(this->rconn);
- buffer_delete(this->rxbuf);
+ ofpbuf_delete(this->rxbuf);
}
free(r);
}
\f
/* Port status watcher. */
-typedef void port_watcher_cb_func(uint16_t port_no,
+typedef void port_changed_cb_func(uint16_t port_no,
const struct ofp_phy_port *old,
const struct ofp_phy_port *new,
void *aux);
struct port_watcher_cb {
- port_watcher_cb_func *function;
+ port_changed_cb_func *port_changed;
+ void *aux;
+};
+
+typedef void local_port_changed_cb_func(const struct ofp_phy_port *new,
+ void *aux);
+
+struct port_watcher_local_cb {
+ local_port_changed_cb_func *local_port_changed;
void *aux;
};
int n_txq;
struct port_watcher_cb cbs[2];
int n_cbs;
+ struct port_watcher_local_cb local_cbs[2];
+ int n_local_cbs;
+ char local_port_name[OFP_MAX_PORT_NAME_LEN + 1];
};
/* Returns the number of fields that differ from 'a' to 'b'. */
static int
opp_differs(const struct ofp_phy_port *a, const struct ofp_phy_port *b)
{
- BUILD_ASSERT_DECL(sizeof *a == 36); /* Trips when we add or remove fields. */
+ BUILD_ASSERT_DECL(sizeof *a == 48); /* Trips when we add or remove fields. */
return ((a->port_no != b->port_no)
+ (memcmp(a->hw_addr, b->hw_addr, sizeof a->hw_addr) != 0)
+ (memcmp(a->name, b->name, sizeof a->name) != 0)
- + (a->flags != b->flags)
- + (a->speed != b->speed)
- + (a->features != b->features));
+ + (a->config != b->config)
+ + (a->state != b->state)
+ + (a->curr != b->curr)
+ + (a->advertised != b->advertised)
+ + (a->supported != b->supported)
+ + (a->peer != b->peer));
}
static void
}
static void
-call_pw_callbacks(struct port_watcher *pw, int port_no,
- const struct ofp_phy_port *old,
- const struct ofp_phy_port *new)
+call_port_changed_callbacks(struct port_watcher *pw, int port_no,
+ const struct ofp_phy_port *old,
+ const struct ofp_phy_port *new)
{
if (opp_differs(old, new)) {
int i;
for (i = 0; i < pw->n_cbs; i++) {
- pw->cbs[i].function(port_no, old, new, pw->cbs[i].aux);
+ port_changed_cb_func *port_changed = pw->cbs[i].port_changed;
+ (port_changed)(port_no, old, new, pw->cbs[i].aux);
+ }
+ }
+}
+
+static void
+get_port_name(const struct ofp_phy_port *port, char *name, size_t name_size)
+{
+ char *p;
+
+ memcpy(name, port->name, MIN(name_size, sizeof port->name));
+ name[name_size - 1] = '\0';
+ for (p = name; *p != '\0'; p++) {
+ if (*p < 32 || *p > 126) {
+ *p = '.';
+ }
+ }
+}
+
+static void
+call_local_port_changed_callbacks(struct port_watcher *pw)
+{
+ char name[OFP_MAX_PORT_NAME_LEN + 1];
+ const struct ofp_phy_port *port;
+ int i;
+
+ /* Pass the local port to the callbacks, if it exists.
+ Pass a null pointer if there is no local port. */
+ port = &pw->ports[port_no_to_pw_idx(OFPP_LOCAL)];
+ if (port->port_no != htons(OFPP_LOCAL)) {
+ port = NULL;
+ }
+
+ /* Log the name of the local port. */
+ if (port) {
+ get_port_name(port, name, sizeof name);
+ } else {
+ name[0] = '\0';
+ }
+ if (strcmp(pw->local_port_name, name)) {
+ if (name[0]) {
+ VLOG_WARN("Identified data path local port as \"%s\".", name);
+ } else {
+ VLOG_WARN("Data path has no local port.");
}
+ strcpy(pw->local_port_name, name);
+ }
+
+ /* Invoke callbacks. */
+ for (i = 0; i < pw->n_local_cbs; i++) {
+ local_port_changed_cb_func *cb = pw->local_cbs[i].local_port_changed;
+ (cb)(port, pw->local_cbs[i].aux);
}
}
if (reason == OFPPR_DELETE) {
memset(pw_opp, 0, sizeof *pw_opp);
pw_opp->port_no = htons(OFPP_NONE);
- } else if (reason == OFPPR_MOD || reason == OFPPR_ADD) {
+ } else if (reason == OFPPR_MODIFY || reason == OFPPR_ADD) {
*pw_opp = *opp;
sanitize_opp(pw_opp);
}
- call_pw_callbacks(pw, port_no, &old, pw_opp);
+ call_port_changed_callbacks(pw, port_no, &old, pw_opp);
}
static bool
port_watcher_local_packet_cb(struct relay *r, void *pw_)
{
struct port_watcher *pw = pw_;
- struct buffer *msg = r->halves[HALF_LOCAL].rxbuf;
+ struct ofpbuf *msg = r->halves[HALF_LOCAL].rxbuf;
struct ofp_header *oh = msg->data;
if (oh->type == OFPT_FEATURES_REPLY
n_ports = ((msg->size - offsetof(struct ofp_switch_features, ports))
/ sizeof *osf->ports);
for (i = 0; i < n_ports; i++) {
- update_phy_port(pw, &osf->ports[i], OFPPR_MOD, seen);
+ struct ofp_phy_port *opp = &osf->ports[i];
+ update_phy_port(pw, opp, OFPPR_MODIFY, seen);
}
/* Delete all the ports not included in the message. */
update_phy_port(pw, &pw->ports[i], OFPPR_DELETE, NULL);
}
}
+
+ call_local_port_changed_callbacks(pw);
} else if (oh->type == OFPT_PORT_STATUS
&& msg->size >= sizeof(struct ofp_port_status)) {
struct ofp_port_status *ops = msg->data;
update_phy_port(pw, &ops->desc, ops->reason, NULL);
+ if (ops->desc.port_no == htons(OFPP_LOCAL)) {
+ call_local_port_changed_callbacks(pw);
+ }
+ }
+ return false;
+}
+
+static bool
+port_watcher_remote_packet_cb(struct relay *r, void *pw_)
+{
+ struct port_watcher *pw = pw_;
+ struct ofpbuf *msg = r->halves[HALF_REMOTE].rxbuf;
+ struct ofp_header *oh = msg->data;
+
+ if (oh->type == OFPT_PORT_MOD
+ && msg->size >= sizeof(struct ofp_port_mod)) {
+ struct ofp_port_mod *opm = msg->data;
+ uint16_t port_no = ntohs(opm->port_no);
+ int idx = port_no_to_pw_idx(port_no);
+ if (idx >= 0) {
+ struct ofp_phy_port *pw_opp = &pw->ports[idx];
+ if (pw_opp->port_no != htons(OFPP_NONE)) {
+ struct ofp_phy_port old = *pw_opp;
+ pw_opp->config = ((pw_opp->config & ~opm->mask)
+ | (opm->config & opm->mask));
+ call_port_changed_callbacks(pw, port_no, &old, pw_opp);
+ if (pw_opp->port_no == htons(OFPP_LOCAL)) {
+ call_local_port_changed_callbacks(pw);
+ }
+ }
+ }
}
return false;
}
{
struct port_watcher *pw = pw_;
- if (!pw->got_feature_reply && time_now() >= pw->last_feature_request + 5) {
- struct buffer *b;
+ if (!pw->got_feature_reply
+ && time_now() >= pw->last_feature_request + 5
+ && rconn_is_connected(pw->local_rconn)) {
+ struct ofpbuf *b;
make_openflow(sizeof(struct ofp_header), OFPT_FEATURES_REQUEST, &b);
rconn_send_with_limit(pw->local_rconn, b, &pw->n_txq, 1);
pw->last_feature_request = time_now();
}
}
+static void
+port_watcher_wait_cb(void *pw_)
+{
+ struct port_watcher *pw = pw_;
+ if (!pw->got_feature_reply && rconn_is_connected(pw->local_rconn)) {
+ if (pw->last_feature_request != TIME_MIN) {
+ poll_timer_wait(pw->last_feature_request + 5 - time_now());
+ } else {
+ poll_immediate_wake();
+ }
+ }
+}
+
static void
put_duplexes(struct ds *ds, const char *name, uint32_t features,
uint32_t hd_bit, uint32_t fd_bit)
}
}
+static void
+put_features(struct ds *ds, const char *name, uint32_t features)
+{
+ if (features & (OFPPF_10MB_HD | OFPPF_10MB_FD
+ | OFPPF_100MB_HD | OFPPF_100MB_FD
+ | OFPPF_1GB_HD | OFPPF_1GB_FD | OFPPF_10GB_FD)) {
+ ds_put_cstr(ds, name);
+ put_duplexes(ds, "10M", features, OFPPF_10MB_HD, OFPPF_10MB_FD);
+ put_duplexes(ds, "100M", features,
+ OFPPF_100MB_HD, OFPPF_100MB_FD);
+ put_duplexes(ds, "1G", features, OFPPF_100MB_HD, OFPPF_100MB_FD);
+ if (features & OFPPF_10GB_FD) {
+ ds_put_cstr(ds, " 10G");
+ }
+ if (features & OFPPF_AUTONEG) {
+ ds_put_cstr(ds, " AUTO_NEG");
+ }
+ if (features & OFPPF_PAUSE) {
+ ds_put_cstr(ds, " PAUSE");
+ }
+ if (features & OFPPF_PAUSE_ASYM) {
+ ds_put_cstr(ds, " PAUSE_ASYM");
+ }
+ }
+}
+
static void
log_port_status(uint16_t port_no,
const struct ofp_phy_port *old,
if (VLOG_IS_DBG_ENABLED()) {
bool was_enabled = old->port_no != htons(OFPP_NONE);
bool now_enabled = new->port_no != htons(OFPP_NONE);
- uint32_t features = ntohl(new->features);
+ uint32_t curr = ntohl(new->curr);
+ uint32_t supported = ntohl(new->supported);
struct ds ds;
- if (old->flags != new->flags && opp_differs(old, new) == 1) {
+ if (((old->config != new->config) || (old->state != new->state))
+ && opp_differs(old, new) == 1) {
/* Don't care if only flags changed. */
return;
}
ds_init(&ds);
ds_put_format(&ds, "\"%s\", "ETH_ADDR_FMT, new->name,
ETH_ADDR_ARGS(new->hw_addr));
- if (ntohl(new->speed)) {
- ds_put_format(&ds, ", speed %"PRIu32, ntohl(new->speed));
- }
- if (features & (OFPPF_10MB_HD | OFPPF_10MB_FD
- | OFPPF_100MB_HD | OFPPF_100MB_FD
- | OFPPF_1GB_HD | OFPPF_1GB_FD | OFPPF_10GB_FD)) {
- ds_put_cstr(&ds, ", supports");
- put_duplexes(&ds, "10M", features, OFPPF_10MB_HD, OFPPF_10MB_FD);
- put_duplexes(&ds, "100M", features,
- OFPPF_100MB_HD, OFPPF_100MB_FD);
- put_duplexes(&ds, "1G", features, OFPPF_100MB_HD, OFPPF_100MB_FD);
- if (features & OFPPF_10GB_FD) {
- ds_put_cstr(&ds, " 10G");
- }
+ if (curr) {
+ put_features(&ds, ", current", curr);
+ }
+ if (supported) {
+ put_features(&ds, ", supports", supported);
}
if (was_enabled != now_enabled) {
if (now_enabled) {
static void
port_watcher_register_callback(struct port_watcher *pw,
- port_watcher_cb_func *function,
+ port_changed_cb_func *port_changed,
void *aux)
{
assert(pw->n_cbs < ARRAY_SIZE(pw->cbs));
- pw->cbs[pw->n_cbs].function = function;
+ pw->cbs[pw->n_cbs].port_changed = port_changed;
pw->cbs[pw->n_cbs].aux = aux;
pw->n_cbs++;
}
+static void
+port_watcher_register_local_port_callback(struct port_watcher *pw,
+ local_port_changed_cb_func *cb,
+ void *aux)
+{
+ assert(pw->n_local_cbs < ARRAY_SIZE(pw->local_cbs));
+ pw->local_cbs[pw->n_local_cbs].local_port_changed = cb;
+ pw->local_cbs[pw->n_local_cbs].aux = aux;
+ pw->n_local_cbs++;
+}
+
static uint32_t
-port_watcher_get_flags(const struct port_watcher *pw, int port_no)
+port_watcher_get_config(const struct port_watcher *pw, int port_no)
{
int idx = port_no_to_pw_idx(port_no);
- return idx >= 0 ? ntohl(pw->ports[idx].flags) : 0;
+ return idx >= 0 ? ntohl(pw->ports[idx].config) : 0;
}
static void
-port_watcher_set_flags(struct port_watcher *pw,
- int port_no, uint32_t flags, uint32_t mask)
+port_watcher_set_flags(struct port_watcher *pw, int port_no,
+ uint32_t config, uint32_t c_mask,
+ uint32_t state, uint32_t s_mask)
{
struct ofp_phy_port old;
struct ofp_phy_port *p;
struct ofp_port_mod *opm;
struct ofp_port_status *ops;
- struct buffer *b;
+ struct ofpbuf *b;
int idx;
idx = port_no_to_pw_idx(port_no);
}
p = &pw->ports[idx];
- if (!((ntohl(p->flags) ^ flags) & mask)) {
+ if (!((ntohl(p->state) ^ state) & s_mask)
+ && (!((ntohl(p->config) ^ config) & c_mask))) {
return;
}
old = *p;
/* Update our idea of the flags. */
- p->flags = ntohl(flags);
- call_pw_callbacks(pw, port_no, &old, p);
+ p->config = htonl((ntohl(p->config) & ~c_mask) | (config & c_mask));
+ p->state = htonl((ntohl(p->state) & ~s_mask) | (state & s_mask));
+ call_port_changed_callbacks(pw, port_no, &old, p);
/* Change the flags in the datapath. */
opm = make_openflow(sizeof *opm, OFPT_PORT_MOD, &b);
- opm->mask = htonl(mask);
- opm->desc = *p;
+ opm->port_no = p->port_no;
+ memcpy(opm->hw_addr, p->hw_addr, OFP_ETH_ALEN);
+ opm->config = p->config;
+ opm->mask = htonl(c_mask);
+ opm->advertise = htonl(0);
rconn_send(pw->local_rconn, b, NULL);
/* Notify the controller that the flags changed. */
ops = make_openflow(sizeof *ops, OFPT_PORT_STATUS, &b);
- ops->reason = OFPPR_MOD;
+ ops->reason = OFPPR_MODIFY;
ops->desc = *p;
rconn_send(pw->remote_rconn, b, NULL);
}
for (i = 0; i < OFPP_MAX; i++) {
pw->ports[i].port_no = htons(OFPP_NONE);
}
+ pw->local_port_name[0] = '\0';
port_watcher_register_callback(pw, log_port_status, NULL);
- return make_hook(port_watcher_local_packet_cb, NULL,
- port_watcher_periodic_cb, NULL, pw);
+ return make_hook(port_watcher_local_packet_cb,
+ port_watcher_remote_packet_cb,
+ port_watcher_periodic_cb,
+ port_watcher_wait_cb, pw);
}
\f
/* Spanning tree protocol. */
struct port_watcher *pw;
struct rconn *local_rconn;
struct rconn *remote_rconn;
- uint8_t dpid[ETH_ADDR_LEN];
long long int last_tick_256ths;
int n_txq;
};
static bool
stp_local_packet_cb(struct relay *r, void *stp_)
{
+ struct ofpbuf *msg = r->halves[HALF_LOCAL].rxbuf;
+ struct ofp_header *oh;
struct stp_data *stp = stp_;
struct ofp_packet_in *opi;
struct eth_header *eth;
struct llc_header *llc;
- struct buffer payload;
+ struct ofpbuf payload;
uint16_t port_no;
struct flow flow;
+ oh = msg->data;
+ if (oh->type == OFPT_FEATURES_REPLY
+ && msg->size >= offsetof(struct ofp_switch_features, ports)) {
+ struct ofp_switch_features *osf = msg->data;
+ osf->capabilities |= htonl(OFPC_STP);
+ return false;
+ }
+
if (!get_ofp_packet_eth_header(r, &opi, ð)
|| !eth_addr_equals(eth->eth_dst, stp_eth_addr)) {
return false;
/* STP only supports 255 ports. */
return false;
}
- if (port_watcher_get_flags(stp->pw, port_no) & OFPPFL_NO_STP) {
+ if (port_watcher_get_config(stp->pw, port_no) & OFPPC_NO_STP) {
/* We're not doing STP on this port. */
return false;
}
VLOG_DBG("non-LLC frame received on STP multicast address");
return false;
}
- llc = buffer_at_assert(&payload, sizeof *eth, sizeof *llc);
+ llc = ofpbuf_at_assert(&payload, sizeof *eth, sizeof *llc);
if (llc->llc_dsap != STP_LLC_DSAP) {
VLOG_DBG("bad DSAP 0x%02"PRIx8" received on STP multicast address",
llc->llc_dsap);
if (payload.size > ntohs(eth->eth_type) + ETH_HEADER_LEN) {
payload.size = ntohs(eth->eth_type) + ETH_HEADER_LEN;
}
- if (buffer_try_pull(&payload, ETH_HEADER_LEN + LLC_HEADER_LEN)) {
+ if (ofpbuf_try_pull(&payload, ETH_HEADER_LEN + LLC_HEADER_LEN)) {
struct stp_port *p = stp_get_port(stp->stp, port_no);
stp_received_bpdu(p, payload.data, payload.size);
}
while (stp_get_changed_port(stp->stp, &p)) {
int port_no = stp_port_no(p);
- enum stp_state state = stp_port_get_state(p);
+ enum stp_state s_state = stp_port_get_state(p);
- if (state != STP_DISABLED) {
+ if (s_state != STP_DISABLED) {
VLOG_WARN("STP: Port %d entered %s state",
- port_no, stp_state_name(state));
+ port_no, stp_state_name(s_state));
}
- if (!(port_watcher_get_flags(stp->pw, port_no) & OFPPFL_NO_STP)) {
- uint32_t flags;
- switch (state) {
+ if (!(port_watcher_get_config(stp->pw, port_no) & OFPPC_NO_STP)) {
+ uint32_t p_config = 0;
+ uint32_t p_state;
+ switch (s_state) {
case STP_LISTENING:
- flags = OFPPFL_STP_LISTEN;
+ p_state = OFPPS_STP_LISTEN;
break;
case STP_LEARNING:
- flags = OFPPFL_STP_LEARN;
+ p_state = OFPPS_STP_LEARN;
break;
case STP_DISABLED:
case STP_FORWARDING:
- flags = OFPPFL_STP_FORWARD;
+ p_state = OFPPS_STP_FORWARD;
break;
case STP_BLOCKING:
- flags = OFPPFL_STP_BLOCK;
+ p_state = OFPPS_STP_BLOCK;
break;
default:
VLOG_DBG_RL(&vrl, "STP: Port %d has bad state %x",
- port_no, state);
- flags = OFPPFL_STP_FORWARD;
+ port_no, s_state);
+ p_state = OFPPS_STP_FORWARD;
break;
}
- if (!stp_forward_in_state(state)) {
- flags |= OFPPFL_NO_FLOOD;
+ if (!stp_forward_in_state(s_state)) {
+ p_config = OFPPC_NO_FLOOD;
}
- port_watcher_set_flags(stp->pw, port_no, flags,
- OFPPFL_STP_MASK | OFPPFL_NO_FLOOD);
+ port_watcher_set_flags(stp->pw, port_no,
+ p_config, OFPPC_NO_FLOOD,
+ p_state, OFPPS_STP_MASK);
} else {
/* We don't own those flags. */
}
struct stp_data *stp = stp_;
struct eth_header *eth;
struct llc_header *llc;
- struct buffer pkt, *opo;
+ struct ofpbuf pkt, *opo;
/* Packet skeleton. */
- buffer_init(&pkt, ETH_HEADER_LEN + LLC_HEADER_LEN + bpdu_size);
- eth = buffer_put_uninit(&pkt, sizeof *eth);
- llc = buffer_put_uninit(&pkt, sizeof *llc);
- buffer_put(&pkt, bpdu, bpdu_size);
+ ofpbuf_init(&pkt, ETH_HEADER_LEN + LLC_HEADER_LEN + bpdu_size);
+ eth = ofpbuf_put_uninit(&pkt, sizeof *eth);
+ llc = ofpbuf_put_uninit(&pkt, sizeof *llc);
+ ofpbuf_put(&pkt, bpdu, bpdu_size);
/* 802.2 header. */
memcpy(eth->eth_dst, stp_eth_addr, ETH_ADDR_LEN);
llc->llc_cntl = STP_LLC_CNTL;
opo = make_unbuffered_packet_out(&pkt, OFPP_NONE, port_no);
- buffer_uninit(&pkt);
+ ofpbuf_uninit(&pkt);
rconn_send_with_limit(stp->local_rconn, opo, &stp->n_txq, OFPP_MAX);
}
+static bool
+stp_is_port_supported(uint16_t port_no)
+{
+ /* We should be able to support STP on all possible OpenFlow physical
+ * ports. (But we don't support STP on OFPP_LOCAL.) */
+ BUILD_ASSERT_DECL(STP_MAX_PORTS >= OFPP_MAX);
+ return port_no < STP_MAX_PORTS;
+}
+
static void
-stp_port_watcher_cb(uint16_t port_no,
+stp_port_changed_cb(uint16_t port_no,
const struct ofp_phy_port *old,
const struct ofp_phy_port *new,
void *stp_)
struct stp_data *stp = stp_;
struct stp_port *p;
- /* STP only supports a maximum of 255 ports, one less than OpenFlow. We
- * don't support STP on OFPP_LOCAL, either. */
- if (port_no >= STP_MAX_PORTS) {
+ if (!stp_is_port_supported(port_no)) {
return;
}
p = stp_get_port(stp->stp, port_no);
if (new->port_no == htons(OFPP_NONE)
- || new->flags & htonl(OFPPFL_NO_STP)) {
+ || new->config & htonl(OFPPC_NO_STP | OFPPC_PORT_DOWN)
+ || new->state & htonl(OFPPS_LINK_DOWN)) {
stp_port_disable(p);
} else {
+ int speed = 0;
stp_port_enable(p);
- stp_port_set_speed(p, new->speed);
+ if (new->curr & (OFPPF_10MB_HD | OFPPF_10MB_FD)) {
+ speed = 10;
+ } else if (new->curr & (OFPPF_100MB_HD | OFPPF_100MB_FD)) {
+ speed = 100;
+ } else if (new->curr & (OFPPF_1GB_HD | OFPPF_1GB_FD)) {
+ speed = 1000;
+ } else if (new->curr & OFPPF_100MB_FD) {
+ speed = 10000;
+ }
+ stp_port_set_speed(p, speed);
+ }
+}
+
+static void
+stp_local_port_changed_cb(const struct ofp_phy_port *port, void *stp_)
+{
+ struct stp_data *stp = stp_;
+ if (port) {
+ stp_set_bridge_id(stp->stp, eth_addr_to_uint64(port->hw_addr));
}
}
struct rconn *local, struct rconn *remote)
{
uint8_t dpid[ETH_ADDR_LEN];
- struct netdev *netdev;
struct stp_data *stp;
- int retval;
-
- retval = netdev_open(s->of_name, NETDEV_ETH_TYPE_NONE, &netdev);
- if (retval) {
- fatal(retval, "Could not open %s device", s->of_name);
- }
- memcpy(dpid, netdev_get_etheraddr(netdev), ETH_ADDR_LEN);
- netdev_close(netdev);
stp = xcalloc(1, sizeof *stp);
+ eth_addr_random(dpid);
stp->stp = stp_create("stp", eth_addr_to_uint64(dpid), send_bpdu, stp);
stp->pw = pw;
- memcpy(stp->dpid, dpid, ETH_ADDR_LEN);
stp->local_rconn = local;
stp->remote_rconn = remote;
stp->last_tick_256ths = time_256ths();
- port_watcher_register_callback(pw, stp_port_watcher_cb, stp);
+ port_watcher_register_callback(pw, stp_port_changed_cb, stp);
+ port_watcher_register_local_port_callback(pw, stp_local_port_changed_cb,
+ stp);
return make_hook(stp_local_packet_cb, NULL,
stp_periodic_cb, stp_wait_cb, stp);
}
struct mac_learning *ml;
struct netdev *of_device;
struct rconn *controller;
- uint8_t mac[ETH_ADDR_LEN];
int n_queued;
};
static void
-queue_tx(struct rconn *rc, struct in_band_data *in_band, struct buffer *b)
+queue_tx(struct rconn *rc, struct in_band_data *in_band, struct ofpbuf *b)
{
rconn_send_with_limit(rc, b, &in_band->n_queued, 10);
}
/* Look up MAC address. */
memset(mac, 0, sizeof mac);
- if (ip) {
+ if (ip && in_band->of_device) {
int retval = netdev_arp_lookup(in_band->of_device, ip, mac);
if (retval) {
- VLOG_DBG("cannot look up controller hw address ("IP_FMT"): %s",
- IP_ARGS(&ip), strerror(retval));
+ VLOG_DBG_RL(&vrl, "cannot look up controller hw address "
+ "("IP_FMT"): %s", IP_ARGS(&ip), strerror(retval));
}
}
have_mac = !eth_addr_is_zero(mac);
struct rconn *rc = r->halves[HALF_LOCAL].rconn;
struct ofp_packet_in *opi;
struct eth_header *eth;
- struct buffer payload;
+ struct ofpbuf payload;
struct flow flow;
uint16_t in_port;
int out_port;
- if (!get_ofp_packet_eth_header(r, &opi, ð)) {
+ if (!get_ofp_packet_eth_header(r, &opi, ð) || !in_band->of_device) {
return false;
}
in_port = ntohs(opi->in_port);
if (in_port == OFPP_LOCAL) {
/* Sent by secure channel. */
out_port = mac_learning_lookup(in_band->ml, eth->eth_dst);
- } else if (eth_addr_equals(eth->eth_dst, in_band->mac)) {
+ } else if (eth_addr_equals(eth->eth_dst,
+ netdev_get_etheraddr(in_band->of_device))) {
/* Sent to secure channel. */
out_port = OFPP_LOCAL;
in_band_learn_mac(in_band, in_port, eth->eth_src);
} else {
/* We don't know that MAC. Send along the packet without setting up a
* flow. */
- struct buffer *b;
+ struct ofpbuf *b;
if (ntohl(opi->buffer_id) == UINT32_MAX) {
b = make_unbuffered_packet_out(&payload, in_port, out_port);
} else {
uint32_t controller_ip;
const uint8_t *controller_mac;
- if (netdev_get_in4(in_band->of_device, &local_ip)) {
- status_reply_put(sr, "local-ip="IP_FMT, IP_ARGS(&local_ip.s_addr));
- }
- status_reply_put(sr, "local-mac="ETH_ADDR_FMT,
- ETH_ADDR_ARGS(in_band->mac));
+ if (in_band->of_device) {
+ const uint8_t *mac = netdev_get_etheraddr(in_band->of_device);
+ if (netdev_get_in4(in_band->of_device, &local_ip)) {
+ status_reply_put(sr, "local-ip="IP_FMT, IP_ARGS(&local_ip.s_addr));
+ }
+ status_reply_put(sr, "local-mac="ETH_ADDR_FMT, ETH_ADDR_ARGS(mac));
- controller_ip = rconn_get_ip(in_band->controller);
- if (controller_ip) {
- status_reply_put(sr, "controller-ip="IP_FMT,
- IP_ARGS(&controller_ip));
- }
- controller_mac = get_controller_mac(in_band);
- if (controller_mac) {
- status_reply_put(sr, "controller-mac="ETH_ADDR_FMT,
- ETH_ADDR_ARGS(controller_mac));
+ controller_ip = rconn_get_ip(in_band->controller);
+ if (controller_ip) {
+ status_reply_put(sr, "controller-ip="IP_FMT,
+ IP_ARGS(&controller_ip));
+ }
+ controller_mac = get_controller_mac(in_band);
+ if (controller_mac) {
+ status_reply_put(sr, "controller-mac="ETH_ADDR_FMT,
+ ETH_ADDR_ARGS(controller_mac));
+ }
}
}
static void
-get_ofp_packet_payload(struct ofp_packet_in *opi, struct buffer *payload)
+get_ofp_packet_payload(struct ofp_packet_in *opi, struct ofpbuf *payload)
{
payload->data = opi->data;
payload->size = ntohs(opi->header.length) - offsetof(struct ofp_packet_in,
data);
}
+static void
+in_band_local_port_cb(const struct ofp_phy_port *port, void *in_band_)
+{
+ struct in_band_data *in_band = in_band_;
+ if (port) {
+ char name[sizeof port->name + 1];
+ get_port_name(port, name, sizeof name);
+
+ if (!in_band->of_device
+ || strcmp(netdev_get_name(in_band->of_device), name))
+ {
+ int error;
+ netdev_close(in_band->of_device);
+ error = netdev_open(name, NETDEV_ETH_TYPE_NONE,
+ &in_band->of_device);
+ if (error) {
+ VLOG_ERR("failed to open in-band control network device "
+ "\"%s\": %s", name, strerror(errno));
+ }
+ }
+ } else {
+ netdev_close(in_band->of_device);
+ in_band->of_device = NULL;
+ }
+}
+
static struct hook
in_band_hook_create(const struct settings *s, struct switch_status *ss,
- struct rconn *remote)
+ struct port_watcher *pw, struct rconn *remote)
{
struct in_band_data *in_band;
- int retval;
in_band = xcalloc(1, sizeof *in_band);
in_band->s = s;
in_band->ml = mac_learning_create();
- retval = netdev_open(s->of_name, NETDEV_ETH_TYPE_NONE,
- &in_band->of_device);
- if (retval) {
- fatal(retval, "Could not open %s device", s->of_name);
- }
- memcpy(in_band->mac, netdev_get_etheraddr(in_band->of_device),
- ETH_ADDR_LEN);
+ in_band->of_device = NULL;
in_band->controller = remote;
switch_status_register_category(ss, "in-band", in_band_status_cb, in_band);
+ port_watcher_register_local_port_callback(pw, in_band_local_port_cb,
+ in_band);
return make_hook(in_band_local_packet_cb, NULL, NULL, NULL, in_band);
}
\f
if (time_now() < fail_open->boot_deadline) {
return;
}
- disconn_secs = rconn_disconnected_duration(fail_open->remote_rconn);
+ disconn_secs = rconn_failure_duration(fail_open->remote_rconn);
open = disconn_secs >= fail_open->s->probe_interval * 3;
if (open != (fail_open->lswitch != NULL)) {
if (!open) {
struct fail_open_data *fail_open = fail_open_;
const struct settings *s = fail_open->s;
int trigger_duration = s->probe_interval * 3;
- int cur_duration = rconn_disconnected_duration(fail_open->remote_rconn);
+ int cur_duration = rconn_failure_duration(fail_open->remote_rconn);
status_reply_put(sr, "trigger-duration=%d", trigger_duration);
status_reply_put(sr, "current-duration=%d", cur_duration);
fail_open->remote_rconn = remote_rconn;
fail_open->lswitch = NULL;
fail_open->boot_deadline = time_now() + s->probe_interval * 3;
- if (s->stp) {
+ if (s->enable_stp) {
fail_open->boot_deadline += STP_EXTRA_BOOT_TIME;
}
switch_status_register_category(ss, "fail-open",
struct rconn *remote_rconn;
/* One queue per physical port. */
- struct queue queues[OFPP_MAX];
+ struct ofp_queue queues[OFPP_MAX];
int n_queued; /* Sum over queues[*].n. */
int next_tx_port; /* Next port to check in round-robin. */
static void
drop_packet(struct rate_limiter *rl)
{
- struct queue *longest; /* Queue currently selected as longest. */
+ struct ofp_queue *longest; /* Queue currently selected as longest. */
int n_longest; /* # of queues of same length as 'longest'. */
- struct queue *q;
+ struct ofp_queue *q;
longest = &rl->queues[0];
n_longest = 1;
}
/* FIXME: do we want to pop the tail instead? */
- buffer_delete(queue_pop_head(longest));
+ ofpbuf_delete(queue_pop_head(longest));
rl->n_queued--;
}
/* Remove and return the next packet to transmit (in round-robin order). */
-static struct buffer *
+static struct ofpbuf *
dequeue_packet(struct rate_limiter *rl)
{
unsigned int i;
for (i = 0; i < OFPP_MAX; i++) {
unsigned int port = (rl->next_tx_port + i) % OFPP_MAX;
- struct queue *q = &rl->queues[port];
+ struct ofp_queue *q = &rl->queues[port];
if (q->n) {
rl->next_tx_port = (port + 1) % OFPP_MAX;
rl->n_queued--;
return false;
} else {
/* Otherwise queue it up for the periodic callback to drain out. */
- struct buffer *msg = r->halves[HALF_LOCAL].rxbuf;
+ struct ofpbuf *msg = r->halves[HALF_LOCAL].rxbuf;
int port = ntohs(opi->in_port) % OFPP_MAX;
if (rl->n_queued >= s->burst_limit) {
drop_packet(rl);
}
- queue_push_tail(&rl->queues[port], buffer_clone(msg));
+ queue_push_tail(&rl->queues[port], ofpbuf_clone(msg));
rl->n_queued++;
rl->n_limited++;
return true;
* because the TCP connection is responsible for buffering and there is
* no point in trying to transmit faster than the TCP connection can
* handle. */
- struct buffer *b = dequeue_packet(rl);
+ struct ofpbuf *b = dequeue_packet(rl);
if (rconn_send_with_limit(rl->remote_rconn, b, &rl->n_txq, 10)) {
rl->n_tx_dropped++;
}
{
struct switch_status *ss = ss_;
struct rconn *rc = r->halves[HALF_REMOTE].rconn;
- struct buffer *msg = r->halves[HALF_REMOTE].rxbuf;
+ struct ofpbuf *msg = r->halves[HALF_REMOTE].rxbuf;
struct switch_status_category *c;
- struct ofp_stats_request *osr;
- struct ofp_stats_reply *reply;
+ struct nicira_header *request;
+ struct nicira_header *reply;
struct status_reply sr;
- struct ofp_header *oh;
- struct buffer *b;
+ struct ofpbuf *b;
int retval;
- oh = msg->data;
- if (oh->type != OFPT_STATS_REQUEST) {
+ if (msg->size < sizeof(struct nicira_header)) {
return false;
}
- if (msg->size < sizeof(struct ofp_stats_request)) {
- VLOG_WARN_RL(&vrl, "packet too short (%zu bytes) for stats_request",
- msg->size);
- return false;
- }
-
- osr = msg->data;
- if (osr->type != htons(OFPST_SWITCH)) {
+ request = msg->data;
+ if (request->header.type != OFPT_VENDOR
+ || request->vendor_id != htonl(NX_VENDOR_ID)
+ || request->subtype != htonl(NXT_STATUS_REQUEST)) {
return false;
}
- sr.request.string = (void *) (osr + 1);
- sr.request.length = msg->size - sizeof *osr;
+ sr.request.string = (void *) (request + 1);
+ sr.request.length = msg->size - sizeof *request;
ds_init(&sr.output);
for (c = ss->categories; c < &ss->categories[ss->n_categories]; c++) {
if (!memcmp(c->name, sr.request.string,
c->cb(&sr, c->aux);
}
}
- reply = make_openflow_xid((offsetof(struct ofp_stats_reply, body)
- + sr.output.length),
- OFPT_STATS_REPLY, osr->header.xid, &b);
- reply->type = htons(OFPST_SWITCH);
- reply->flags = 0;
- memcpy(reply->body, sr.output.string, sr.output.length);
+ reply = make_openflow_xid(sizeof *reply + sr.output.length,
+ OFPT_VENDOR, request->header.xid, &b);
+ reply->vendor_id = htonl(NX_VENDOR_ID);
+ reply->subtype = htonl(NXT_STATUS_REPLY);
+ memcpy(reply + 1, sr.output.string, sr.output.length);
retval = rconn_send(rc, b, NULL);
if (retval && retval != EAGAIN) {
VLOG_WARN("send failed (%s)", strerror(retval));
status_reply_put(sr, "accept-remote=%s", d->s->accept_controller_re);
status_reply_put(sr, "n-changes=%d", d->n_changes);
- status_reply_put(sr, "state=%s", dhclient_get_state(d->dhcp));
- status_reply_put(sr, "state-elapsed=%u",
- dhclient_get_state_elapsed(d->dhcp));
- if (dhclient_is_bound(d->dhcp)) {
- uint32_t ip = dhclient_get_ip(d->dhcp);
- uint32_t netmask = dhclient_get_netmask(d->dhcp);
- uint32_t router = dhclient_get_router(d->dhcp);
+ if (d->dhcp) {
+ status_reply_put(sr, "state=%s", dhclient_get_state(d->dhcp));
+ status_reply_put(sr, "state-elapsed=%u",
+ dhclient_get_state_elapsed(d->dhcp));
+ if (dhclient_is_bound(d->dhcp)) {
+ uint32_t ip = dhclient_get_ip(d->dhcp);
+ uint32_t netmask = dhclient_get_netmask(d->dhcp);
+ uint32_t router = dhclient_get_router(d->dhcp);
+
+ const struct dhcp_msg *cfg = dhclient_get_config(d->dhcp);
+ uint32_t dns_server;
+ char *domain_name;
+ int i;
+
+ status_reply_put(sr, "ip="IP_FMT, IP_ARGS(&ip));
+ status_reply_put(sr, "netmask="IP_FMT, IP_ARGS(&netmask));
+ if (router) {
+ status_reply_put(sr, "router="IP_FMT, IP_ARGS(&router));
+ }
- const struct dhcp_msg *cfg = dhclient_get_config(d->dhcp);
- uint32_t dns_server;
- char *domain_name;
- int i;
+ for (i = 0; dhcp_msg_get_ip(cfg, DHCP_CODE_DNS_SERVER, i,
+ &dns_server);
+ i++) {
+ status_reply_put(sr, "dns%d="IP_FMT, i, IP_ARGS(&dns_server));
+ }
+
+ domain_name = dhcp_msg_get_string(cfg, DHCP_CODE_DOMAIN_NAME);
+ if (domain_name) {
+ status_reply_put(sr, "domain=%s", domain_name);
+ free(domain_name);
+ }
- status_reply_put(sr, "ip="IP_FMT, IP_ARGS(&ip));
- status_reply_put(sr, "netmask="IP_FMT, IP_ARGS(&netmask));
- if (router) {
- status_reply_put(sr, "router="IP_FMT, IP_ARGS(&router));
+ status_reply_put(sr, "lease-remaining=%u",
+ dhclient_get_lease_remaining(d->dhcp));
}
+ }
+}
+
+static void
+discovery_local_port_cb(const struct ofp_phy_port *port, void *d_)
+{
+ struct discovery *d = d_;
+ if (port) {
+ char name[OFP_MAX_PORT_NAME_LEN + 1];
+ struct netdev *netdev;
+ int retval;
- for (i = 0; dhcp_msg_get_ip(cfg, DHCP_CODE_DNS_SERVER, i, &dns_server);
- i++) {
- status_reply_put(sr, "dns%d="IP_FMT, i, IP_ARGS(&dns_server));
+ /* Check that this was really a change. */
+ get_port_name(port, name, sizeof name);
+ if (d->dhcp && !strcmp(netdev_get_name(dhclient_get_netdev(d->dhcp)),
+ name)) {
+ return;
}
- domain_name = dhcp_msg_get_string(cfg, DHCP_CODE_DOMAIN_NAME);
- if (domain_name) {
- status_reply_put(sr, "domain=%s", domain_name);
- free(domain_name);
+ /* Destroy current DHCP client. */
+ dhclient_destroy(d->dhcp);
+ d->dhcp = NULL;
+
+ /* Bring local network device up. */
+ retval = netdev_open(name, NETDEV_ETH_TYPE_NONE, &netdev);
+ if (retval) {
+ VLOG_ERR("Could not open %s device, discovery disabled: %s",
+ name, strerror(retval));
+ return;
}
+ retval = netdev_turn_flags_on(netdev, NETDEV_UP, true);
+ if (retval) {
+ VLOG_ERR("Could not bring %s device up, discovery disabled: %s",
+ name, strerror(retval));
+ return;
+ }
+ netdev_close(netdev);
- status_reply_put(sr, "lease-remaining=%u",
- dhclient_get_lease_remaining(d->dhcp));
+ /* Initialize DHCP client. */
+ retval = dhclient_create(name, modify_dhcp_request,
+ validate_dhcp_offer, (void *) d->s, &d->dhcp);
+ if (retval) {
+ VLOG_ERR("Failed to initialize DHCP client, "
+ "discovery disabled: %s", strerror(retval));
+ return;
+ }
+ dhclient_init(d->dhcp, 0);
+ } else {
+ dhclient_destroy(d->dhcp);
+ d->dhcp = NULL;
}
}
+
static struct discovery *
-discovery_init(const struct settings *s, struct switch_status *ss)
+discovery_init(const struct settings *s, struct port_watcher *pw,
+ struct switch_status *ss)
{
- struct netdev *netdev;
struct discovery *d;
- struct dhclient *dhcp;
- int retval;
-
- /* Bring ofX network device up. */
- retval = netdev_open(s->of_name, NETDEV_ETH_TYPE_NONE, &netdev);
- if (retval) {
- fatal(retval, "Could not open %s device", s->of_name);
- }
- retval = netdev_turn_flags_on(netdev, NETDEV_UP, true);
- if (retval) {
- fatal(retval, "Could not bring %s device up", s->of_name);
- }
- netdev_close(netdev);
-
- /* Initialize DHCP client. */
- retval = dhclient_create(s->of_name, modify_dhcp_request,
- validate_dhcp_offer, (void *) s, &dhcp);
- if (retval) {
- fatal(retval, "Failed to initialize DHCP client");
- }
- dhclient_init(dhcp, 0);
d = xmalloc(sizeof *d);
d->s = s;
- d->dhcp = dhcp;
+ d->dhcp = NULL;
d->n_changes = 0;
switch_status_register_category(ss, "discovery", discovery_status_cb, d);
+ port_watcher_register_local_port_callback(pw, discovery_local_port_cb, d);
return d;
}
static void
discovery_question_connectivity(struct discovery *d)
{
- dhclient_force_renew(d->dhcp, 15);
+ if (d->dhcp) {
+ dhclient_force_renew(d->dhcp, 15);
+ }
}
static bool
discovery_run(struct discovery *d, char **controller_name)
{
+ if (!d->dhcp) {
+ *controller_name = NULL;
+ return true;
+ }
+
dhclient_run(d->dhcp);
if (!dhclient_changed(d->dhcp)) {
return false;
static void
discovery_wait(struct discovery *d)
{
- dhclient_wait(d->dhcp);
+ if (d->dhcp) {
+ dhclient_wait(d->dhcp);
+ }
}
static void
OPT_MAX_IDLE,
OPT_MAX_BACKOFF,
OPT_RATE_LIMIT,
- OPT_BURST_LIMIT
+ OPT_BURST_LIMIT,
+ OPT_BOOTSTRAP_CA_CERT,
+ OPT_STP,
+ OPT_NO_STP,
+ OPT_OUT_OF_BAND,
+ OPT_IN_BAND
};
static struct option long_options[] = {
{"accept-vconn", required_argument, 0, OPT_ACCEPT_VCONN},
{"monitor", required_argument, 0, 'm'},
{"rate-limit", optional_argument, 0, OPT_RATE_LIMIT},
{"burst-limit", required_argument, 0, OPT_BURST_LIMIT},
+ {"stp", no_argument, 0, OPT_STP},
+ {"no-stp", no_argument, 0, OPT_NO_STP},
+ {"out-of-band", no_argument, 0, OPT_OUT_OF_BAND},
+ {"in-band", no_argument, 0, OPT_IN_BAND},
{"detach", no_argument, 0, 'D'},
{"force", no_argument, 0, 'f'},
{"pidfile", optional_argument, 0, 'P'},
{"verbose", optional_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
+#ifdef HAVE_OPENSSL
VCONN_SSL_LONG_OPTIONS
+ {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
+#endif
{0, 0, 0, 0},
};
char *short_options = long_options_to_short_options(long_options);
s->update_resolv_conf = true;
s->rate_limit = 0;
s->burst_limit = 0;
+ s->enable_stp = false;
+ s->in_band = true;
for (;;) {
int c;
} else if (!strcmp(optarg, "closed")) {
s->fail_mode = FAIL_CLOSED;
} else {
- fatal(0,
- "-f or --fail argument must be \"open\" or \"closed\"");
+ ofp_fatal(0, "-f or --fail argument must be \"open\" "
+ "or \"closed\"");
}
break;
case OPT_INACTIVITY_PROBE:
s->probe_interval = atoi(optarg);
if (s->probe_interval < 5) {
- fatal(0, "--inactivity-probe argument must be at least 5");
+ ofp_fatal(0, "--inactivity-probe argument must be at least 5");
}
break;
} else {
s->max_idle = atoi(optarg);
if (s->max_idle < 1 || s->max_idle > 65535) {
- fatal(0, "--max-idle argument must be between 1 and "
- "65535 or the word 'permanent'");
+ ofp_fatal(0, "--max-idle argument must be between 1 and "
+ "65535 or the word 'permanent'");
}
}
break;
case OPT_MAX_BACKOFF:
s->max_backoff = atoi(optarg);
if (s->max_backoff < 1) {
- fatal(0, "--max-backoff argument must be at least 1");
+ ofp_fatal(0, "--max-backoff argument must be at least 1");
} else if (s->max_backoff > 3600) {
s->max_backoff = 3600;
}
if (optarg) {
s->rate_limit = atoi(optarg);
if (s->rate_limit < 1) {
- fatal(0, "--rate-limit argument must be at least 1");
+ ofp_fatal(0, "--rate-limit argument must be at least 1");
}
} else {
s->rate_limit = 1000;
case OPT_BURST_LIMIT:
s->burst_limit = atoi(optarg);
if (s->burst_limit < 1) {
- fatal(0, "--burst-limit argument must be at least 1");
+ ofp_fatal(0, "--burst-limit argument must be at least 1");
}
break;
+ case OPT_STP:
+ s->enable_stp = true;
+ break;
+
+ case OPT_NO_STP:
+ s->enable_stp = false;
+ break;
+
+ case OPT_OUT_OF_BAND:
+ s->in_band = false;
+ break;
+
+ case OPT_IN_BAND:
+ s->in_band = true;
+ break;
+
case 'D':
set_detach();
break;
case 'l':
if (s->n_listeners >= MAX_MGMT) {
- fatal(0, "-l or --listen may be specified at most %d times",
- MAX_MGMT);
+ ofp_fatal(0,
+ "-l or --listen may be specified at most %d times",
+ MAX_MGMT);
}
s->listener_names[s->n_listeners++] = optarg;
break;
case 'm':
if (s->monitor_name) {
- fatal(0, "-m or --monitor may only be specified once");
+ ofp_fatal(0, "-m or --monitor may only be specified once");
}
s->monitor_name = optarg;
break;
vlog_set_verbosity(optarg);
break;
+#ifdef HAVE_OPENSSL
VCONN_SSL_OPTION_HANDLERS
+ case OPT_BOOTSTRAP_CA_CERT:
+ vconn_ssl_set_ca_cert_file(optarg, true);
+ break;
+#endif
+
case '?':
exit(EXIT_FAILURE);
argc -= optind;
argv += optind;
if (argc < 1 || argc > 2) {
- fatal(0, "need one or two non-option arguments; use --help for usage");
+ ofp_fatal(0, "need one or two non-option arguments; "
+ "use --help for usage");
}
/* Local and remote vconns. */
- s->nl_name = argv[0];
- if (strncmp(s->nl_name, "nl:", 3)
- || strlen(s->nl_name) < 4
- || s->nl_name[strspn(s->nl_name + 3, "0123456789") + 3]) {
- fatal(0, "%s: argument is not of the form \"nl:DP_IDX\"", s->nl_name);
- }
- s->of_name = xasprintf("of%s", s->nl_name + 3);
+ s->dp_name = argv[0];
s->controller_name = argc > 1 ? xstrdup(argv[1]) : NULL;
/* Set accept_controller_regex. */
size_t length = regerror(retval, &s->accept_controller_regex, NULL, 0);
char *buffer = xmalloc(length);
regerror(retval, &s->accept_controller_regex, buffer, length);
- fatal(0, "%s: %s", accept_re, buffer);
+ ofp_fatal(0, "%s: %s", accept_re, buffer);
}
s->accept_controller_re = accept_re;
/* Mode of operation. */
s->discovery = s->controller_name == NULL;
- if (s->discovery) {
- s->in_band = true;
- } else {
- enum netdev_flags flags;
- struct netdev *netdev;
-
- retval = netdev_open(s->of_name, NETDEV_ETH_TYPE_NONE, &netdev);
- if (retval) {
- fatal(retval, "Could not open %s device", s->of_name);
- }
-
- retval = netdev_get_flags(netdev, &flags);
- if (retval) {
- fatal(retval, "Could not get flags for %s device", s->of_name);
- }
-
- s->in_band = (flags & NETDEV_UP) != 0;
- if (s->in_band && netdev_get_in6(netdev, NULL)) {
- VLOG_WARN("Ignoring IPv6 address on %s device: IPv6 not supported",
- s->of_name);
- }
-
- netdev_close(netdev);
+ if (s->discovery && !s->in_band) {
+ ofp_fatal(0, "Cannot perform discovery with out-of-band control");
}
/* Rate limiting. */
"CONTROLLER is an active OpenFlow connection method; if it is\n"
"omitted, then secchan performs controller discovery.\n",
program_name, program_name);
- vconn_usage(true, true);
+ vconn_usage(true, true, true);
printf("\nController discovery options:\n"
" --accept-vconn=REGEX accept matching discovered controllers\n"
" --no-resolv-conf do not update /etc/resolv.conf\n"
" (a passive OpenFlow connection method)\n"
" -m, --monitor=METHOD copy traffic to/from kernel to METHOD\n"
" (a passive OpenFlow connection method)\n"
+ " --out-of-band controller connection is out-of-band\n"
+ " --stp enable 802.1D Spanning Tree Protocol\n"
+ " --no-stp disable 802.1D Spanning Tree Protocol\n"
"\nRate-limiting of \"packet-in\" messages to the controller:\n"
" --rate-limit[=PACKETS] max rate, in packets/s (default: 1000)\n"
" --burst-limit=BURST limit on packet credit for idle time\n"
git://git.onelab.eu / sliver-openvswitch.git / blobdiff