#include "vconn.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(openflowd)
+VLOG_DEFINE_THIS_MODULE(openflowd);
/* Settings that may be configured by the user. */
struct ofsettings {
/* Failure behavior. */
int max_idle; /* Idle time for flows in fail-open mode. */
- /* Spanning tree protocol. */
- bool enable_stp;
-
/* NetFlow. */
struct svec netflow; /* NetFlow targets. */
};
if (error) {
ovs_fatal(error, "failed to configure NetFlow collectors");
}
- error = ofproto_set_stp(ofproto, s.enable_stp);
- if (error) {
- ovs_fatal(error, "failed to configure STP");
- }
ofproto_set_controllers(ofproto, s.controllers, s.n_controllers);
ofproto_set_fail_mode(ofproto, s.fail_mode);
OPT_RATE_LIMIT,
OPT_BURST_LIMIT,
OPT_BOOTSTRAP_CA_CERT,
- OPT_STP,
- OPT_NO_STP,
OPT_OUT_OF_BAND,
OPT_IN_BAND,
OPT_NETFLOW,
{"snoop", required_argument, 0, OPT_SNOOP},
{"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},
{"netflow", required_argument, 0, OPT_NETFLOW},
svec_init(&controllers);
svec_init(&s->snoops);
s->max_idle = 0;
- s->enable_stp = false;
svec_init(&s->netflow);
svec_init(&s->ports);
for (;;) {
}
break;
- case OPT_STP:
- s->enable_stp = true;
- break;
-
- case OPT_NO_STP:
- s->enable_stp = false;
- break;
-
case OPT_OUT_OF_BAND:
controller_opts.band = OFPROTO_OUT_OF_BAND;
break;
/* Set up controllers. */
s->n_controllers = controllers.n;
s->controllers = xmalloc(s->n_controllers * sizeof *s->controllers);
- if (argc > 1) {
- size_t i;
-
- for (i = 0; i < s->n_controllers; i++) {
- s->controllers[i] = controller_opts;
- s->controllers[i].target = controllers.names[i];
- }
+ for (i = 0; i < s->n_controllers; i++) {
+ s->controllers[i] = controller_opts;
+ s->controllers[i].target = controllers.names[i];
}
/* Sanity check. */
if (controller_opts.band == OFPROTO_OUT_OF_BAND) {
- size_t i;
-
for (i = 0; i < s->n_controllers; i++) {
if (!strcmp(s->controllers[i].target, "discover")) {
ovs_fatal(0, "Cannot perform discovery with out-of-band "