fatal(retval, "Could not listen for vlog connections");
}
+ die_if_already_running();
daemonize();
VLOG_WARN("OpenFlow reference implementation version %s", VERSION);
return mac && eth_addr_equals(mac, dl_addr);
}
+static void
+in_band_learn_mac(struct in_band_data *in_band, const struct flow *flow)
+{
+ uint16_t in_port = ntohs(flow->in_port);
+ if (mac_learning_learn(in_band->ml, flow->dl_src, in_port)) {
+ VLOG_DBG_RL(&vrl, "learned that "ETH_ADDR_FMT" is on port %"PRIu16,
+ ETH_ADDR_ARGS(flow->dl_src), in_port);
+ }
+}
+
static bool
in_band_packet_cb(struct relay *r, int half, void *in_band_)
{
} else if (eth_addr_equals(flow.dl_dst, in_band->mac)) {
/* Sent to secure channel. */
out_port = OFPP_LOCAL;
- if (mac_learning_learn(in_band->ml, flow.dl_src, in_port)) {
- VLOG_DBG_RL(&vrl, "learned that "ETH_ADDR_FMT" is on port %"PRIu16,
- ETH_ADDR_ARGS(flow.dl_src), in_port);
- }
+ in_band_learn_mac(in_band, &flow);
} else if (flow.dl_type == htons(ETH_TYPE_ARP)
&& eth_addr_is_broadcast(flow.dl_dst)
&& is_controller_mac(flow.dl_src, in_band)) {
/* ARP sent by controller. */
out_port = OFPP_FLOOD;
} else if (is_controller_mac(flow.dl_dst, in_band)
- && in_port == mac_learning_lookup(in_band->ml,
- controller_mac)) {
- /* Drop controller traffic that arrives on the controller port. */
- queue_tx(rc, in_band, make_add_flow(&flow, ntohl(opi->buffer_id),
- in_band->s->max_idle, 0));
- return true;
+ || is_controller_mac(flow.dl_src, in_band)) {
+ /* Traffic to or from controller. Switch it by hand. */
+ in_band_learn_mac(in_band, &flow);
+ out_port = mac_learning_lookup(in_band->ml, controller_mac);
} else {
return false;
}
- if (out_port != OFPP_FLOOD) {
+ if (in_port == out_port) {
+ /* The input and output port match. Set up a flow to drop packets. */
+ queue_tx(rc, in_band, make_add_flow(&flow, ntohl(opi->buffer_id),
+ in_band->s->max_idle, 0));
+ } else if (out_port != OFPP_FLOOD) {
/* The output port is known, so add a new flow. */
queue_tx(rc, in_band,
make_add_simple_flow(&flow, ntohl(opi->buffer_id),
status_reply_put(sr, "name=%s", rconn_get_name(rconn));
status_reply_put(sr, "state=%s", rconn_get_state(rconn));
+ status_reply_put(sr, "backoff=%d", rconn_get_backoff(rconn));
status_reply_put(sr, "is-connected=%s",
rconn_is_connected(rconn) ? "true" : "false");
status_reply_put(sr, "sent-msgs=%u", rconn_packets_sent(rconn));
(long int) (now - rconn_get_last_connection(rconn)));
status_reply_put(sr, "time-connected=%lu",
rconn_get_total_time_connected(rconn));
+ status_reply_put(sr, "state-elapsed=%u", rconn_get_state_elapsed(rconn));
}
static void
{
struct discovery *d = d_;
- status_reply_put(sr, "discovery.accept-remote=%s",
- d->s->accept_controller_re);
- status_reply_put(sr, "discovery.n-changes=%d", d->n_changes);
- status_reply_put(sr, "discovery.state=%s", dhclient_get_state(d->dhcp));
- status_reply_put(sr, "discovery.state-elapsed=%u",
+ 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);
char *domain_name;
int i;
- status_reply_put(sr, "discovery.ip="IP_FMT, IP_ARGS(&ip));
- status_reply_put(sr, "discovery.netmask="IP_FMT, IP_ARGS(&netmask));
+ 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, "discovery.router="IP_FMT, IP_ARGS(&router));
+ status_reply_put(sr, "router="IP_FMT, IP_ARGS(&router));
}
for (i = 0; dhcp_msg_get_ip(cfg, DHCP_CODE_DNS_SERVER, i, &dns_server);
i++) {
- status_reply_put(sr, "discovery.dns%d="IP_FMT,
- i, IP_ARGS(&dns_server));
+ 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, "discovery.domain=%s", domain_name);
+ status_reply_put(sr, "domain=%s", domain_name);
free(domain_name);
}
- status_reply_put(sr, "discovery.lease-remaining=%u",
+ status_reply_put(sr, "lease-remaining=%u",
dhclient_get_lease_remaining(d->dhcp));
}
}
static struct option long_options[] = {
{"accept-vconn", required_argument, 0, OPT_ACCEPT_VCONN},
{"no-resolv-conf", no_argument, 0, OPT_NO_RESOLV_CONF},
- {"fail", required_argument, 0, 'f'},
+ {"fail", required_argument, 0, 'F'},
{"inactivity-probe", required_argument, 0, OPT_INACTIVITY_PROBE},
{"max-idle", required_argument, 0, OPT_MAX_IDLE},
{"max-backoff", required_argument, 0, OPT_MAX_BACKOFF},
{"rate-limit", optional_argument, 0, OPT_RATE_LIMIT},
{"burst-limit", required_argument, 0, OPT_BURST_LIMIT},
{"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'},
s->update_resolv_conf = false;
break;
- case 'f':
+ case 'F':
if (!strcmp(optarg, "open")) {
s->fail_mode = FAIL_OPEN;
} else if (!strcmp(optarg, "closed")) {
set_pidfile(optarg);
break;
+ case 'f':
+ ignore_existing_pidfile();
+ break;
+
case 'l':
if (s->n_listeners >= MAX_MGMT) {
fatal(0, "-l or --listen may be specified at most %d times",
" --accept-vconn=REGEX accept matching discovered controllers\n"
" --no-resolv-conf do not update /etc/resolv.conf\n"
"\nNetworking options:\n"
- " -f, --fail=open|closed when controller connection fails:\n"
+ " -F, --fail=open|closed when controller connection fails:\n"
" closed: drop all packets\n"
" open (default): act as learning switch\n"
" --inactivity-probe=SECS time between inactivity probes\n"
"\nOther options:\n"
" -D, --detach run in background as daemon\n"
" -P, --pidfile[=FILE] create pidfile (default: %s/secchan.pid)\n"
+ " -f, --force with -P, start even if already running\n"
" -v, --verbose=MODULE[:FACILITY[:LEVEL]] set logging levels\n"
" -v, --verbose set maximum verbosity level\n"
" -h, --help display this help message\n"