X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fin-band.c;h=42b3efbed43c367efa561599842dd8f22fc797f8;hb=HEAD;hp=9b699ca3554eaebca11604af0765e7b882267a76;hpb=baa905d36b831881ceb20686f567dead3ec0bf14;p=sliver-openvswitch.git diff --git a/ofproto/in-band.c b/ofproto/in-band.c index 9b699ca35..42b3efbed 100644 --- a/ofproto/in-band.c +++ b/ofproto/in-band.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,331 +19,500 @@ #include #include #include +#include #include #include #include +#include "classifier.h" +#include "dhcp.h" #include "flow.h" -#include "mac-learning.h" #include "netdev.h" +#include "netlink.h" #include "odp-util.h" -#include "ofp-print.h" +#include "ofp-actions.h" #include "ofproto.h" #include "ofpbuf.h" +#include "ofproto-provider.h" #include "openflow/openflow.h" #include "packets.h" #include "poll-loop.h" -#include "rconn.h" -#include "status.h" #include "timeval.h" -#include "vconn.h" - -#define THIS_MODULE VLM_in_band #include "vlog.h" -#define IB_BASE_PRIORITY 18181800 +VLOG_DEFINE_THIS_MODULE(in_band); +/* Priorities used in classifier for in-band rules. These values are higher + * than any that may be set with OpenFlow, and "18" kind of looks like "IB". + * The ordering of priorities is not important because all of the rules set up + * by in-band control have the same action. The only reason to use more than + * one priority is to make the kind of flow easier to see during debugging. */ enum { - IBR_FROM_LOCAL_PORT, /* Sent by the local port. */ - IBR_OFP_TO_LOCAL, /* Sent to secure channel on local port. */ - IBR_ARP_FROM_LOCAL, /* ARP from the local port. */ - IBR_ARP_FROM_CTL, /* ARP from the controller. */ - IBR_TO_CTL_OFP_SRC, /* To controller, OpenFlow source port. */ - IBR_TO_CTL_OFP_DST, /* To controller, OpenFlow dest port. */ - IBR_FROM_CTL_OFP_SRC, /* From controller, OpenFlow source port. */ - IBR_FROM_CTL_OFP_DST, /* From controller, OpenFlow dest port. */ -#if OFP_TCP_PORT != OFP_SSL_PORT -#error Need to support separate TCP and SSL flows. -#endif - N_IB_RULES + /* One set per bridge. */ + IBR_FROM_LOCAL_DHCP = 180000, /* (a) From local port, DHCP. */ + IBR_TO_LOCAL_ARP, /* (b) To local port, ARP. */ + IBR_FROM_LOCAL_ARP, /* (c) From local port, ARP. */ + + /* One set per unique next-hop MAC. */ + IBR_TO_NEXT_HOP_ARP, /* (d) To remote MAC, ARP. */ + IBR_FROM_NEXT_HOP_ARP, /* (e) From remote MAC, ARP. */ + + /* One set per unique remote IP address. */ + IBR_TO_REMOTE_ARP, /* (f) To remote IP, ARP. */ + IBR_FROM_REMOTE_ARP, /* (g) From remote IP, ARP. */ + + /* One set per unique remote (IP,port) pair. */ + IBR_TO_REMOTE_TCP, /* (h) To remote IP, TCP port. */ + IBR_FROM_REMOTE_TCP /* (i) From remote IP, TCP port. */ +}; + +/* Track one remote IP and next hop information. */ +struct in_band_remote { + struct sockaddr_in remote_addr; /* IP address, in network byte order. */ + uint8_t remote_mac[ETH_ADDR_LEN]; /* Next-hop MAC, all-zeros if unknown. */ + uint8_t last_remote_mac[ETH_ADDR_LEN]; /* Previous nonzero next-hop MAC. */ + struct netdev *remote_netdev; /* Device to send to next-hop MAC. */ +}; + +/* What to do to an in_band_rule. */ +enum in_band_op { + ADD, /* Add the rule to ofproto's flow table. */ + DEL /* Delete the rule from ofproto's flow table. */ }; -struct ib_rule { - bool installed; - flow_t flow; - uint32_t wildcards; +/* A rule to add to or delete from ofproto's flow table. */ +struct in_band_rule { + struct hmap_node hmap_node; /* In struct in_band's "rules" hmap. */ + struct match match; unsigned int priority; + enum in_band_op op; }; struct in_band { struct ofproto *ofproto; - struct rconn *controller; - struct status_category *ss_cat; - - /* Keeping track of controller's MAC address. */ - uint32_t ip; /* Current IP, 0 if unknown. */ - uint32_t last_ip; /* Last known IP, 0 if never known. */ - uint8_t mac[ETH_ADDR_LEN]; /* Current MAC, 0 if unknown. */ - uint8_t last_mac[ETH_ADDR_LEN]; /* Last known MAC, 0 if never known */ - char *dev_name; - time_t next_refresh; /* Next time to refresh MAC address. */ - - /* Keeping track of the local port's MAC address. */ + int queue_id; + + /* Remote information. */ + time_t next_remote_refresh; /* Refresh timer. */ + struct in_band_remote *remotes; + size_t n_remotes; + + /* Local information. */ + time_t next_local_refresh; /* Refresh timer. */ uint8_t local_mac[ETH_ADDR_LEN]; /* Current MAC. */ - time_t next_local_refresh; /* Next time to refresh MAC address. */ + struct netdev *local_netdev; /* Local port's network device. */ - /* Rules that we set up. */ - struct ib_rule rules[N_IB_RULES]; + /* Flow tracking. */ + struct hmap rules; /* Contains "struct in_band_rule"s. */ }; static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(60, 60); -static const uint8_t * -get_controller_mac(struct in_band *ib) +static int +refresh_remote(struct in_band *ib, struct in_band_remote *r) { - time_t now = time_now(); - uint32_t controller_ip; - - controller_ip = rconn_get_remote_ip(ib->controller); - if (controller_ip != ib->ip || now >= ib->next_refresh) { - bool have_mac; - - ib->ip = controller_ip; - - /* Look up MAC address. */ - memset(ib->mac, 0, sizeof ib->mac); - if (ib->ip) { - uint32_t local_ip = rconn_get_local_ip(ib->controller); - struct in_addr in4; - int retval; - - in4.s_addr = local_ip; - if (netdev_find_dev_by_in4(&in4, &ib->dev_name)) { - retval = netdev_nodev_arp_lookup(ib->dev_name, ib->ip, - ib->mac); - if (retval) { - VLOG_DBG_RL(&rl, "cannot look up controller MAC address " - "("IP_FMT"): %s", - IP_ARGS(&ib->ip), strerror(retval)); - } - } else { - VLOG_DBG_RL(&rl, "cannot find device with IP address "IP_FMT, - IP_ARGS(&local_ip)); - } - } - have_mac = !eth_addr_is_zero(ib->mac); + struct in_addr next_hop_inaddr; + char *next_hop_dev; + int retval; + + /* Find the next-hop IP address. */ + memset(r->remote_mac, 0, sizeof r->remote_mac); + retval = netdev_get_next_hop(ib->local_netdev, &r->remote_addr.sin_addr, + &next_hop_inaddr, &next_hop_dev); + if (retval) { + VLOG_WARN("cannot find route for controller ("IP_FMT"): %s", + IP_ARGS(r->remote_addr.sin_addr.s_addr), + ovs_strerror(retval)); + return 1; + } + if (!next_hop_inaddr.s_addr) { + next_hop_inaddr = r->remote_addr.sin_addr; + } - /* Log changes in IP, MAC addresses. */ - if (ib->ip && ib->ip != ib->last_ip) { - VLOG_DBG("controller IP address changed from "IP_FMT - " to "IP_FMT, IP_ARGS(&ib->last_ip), IP_ARGS(&ib->ip)); - ib->last_ip = ib->ip; - } - if (have_mac && memcmp(ib->last_mac, ib->mac, ETH_ADDR_LEN)) { - VLOG_DBG("controller MAC address changed from "ETH_ADDR_FMT" to " - ETH_ADDR_FMT, - ETH_ADDR_ARGS(ib->last_mac), ETH_ADDR_ARGS(ib->mac)); - memcpy(ib->last_mac, ib->mac, ETH_ADDR_LEN); + /* Open the next-hop network device. */ + if (!r->remote_netdev + || strcmp(netdev_get_name(r->remote_netdev), next_hop_dev)) + { + netdev_close(r->remote_netdev); + + retval = netdev_open(next_hop_dev, "system", &r->remote_netdev); + if (retval) { + VLOG_WARN_RL(&rl, "cannot open netdev %s (next hop " + "to controller "IP_FMT"): %s", + next_hop_dev, IP_ARGS(r->remote_addr.sin_addr.s_addr), + ovs_strerror(retval)); + free(next_hop_dev); + return 1; } - - /* Schedule next refresh. - * - * If we have an IP address but not a MAC address, then refresh - * quickly, since we probably will get a MAC address soon (via ARP). - * Otherwise, we can afford to wait a little while. */ - ib->next_refresh = now + (!ib->ip || have_mac ? 10 : 1); } - return !eth_addr_is_zero(ib->mac) ? ib->mac : NULL; + free(next_hop_dev); + + /* Look up the MAC address of the next-hop IP address. */ + retval = netdev_arp_lookup(r->remote_netdev, next_hop_inaddr.s_addr, + r->remote_mac); + if (retval) { + VLOG_DBG_RL(&rl, "cannot look up remote MAC address ("IP_FMT"): %s", + IP_ARGS(next_hop_inaddr.s_addr), ovs_strerror(retval)); + } + + /* If we don't have a MAC address, then refresh quickly, since we probably + * will get a MAC address soon (via ARP). Otherwise, we can afford to wait + * a little while. */ + return eth_addr_is_zero(r->remote_mac) ? 1 : 10; } -static const uint8_t * -get_local_mac(struct in_band *ib) +static bool +refresh_remotes(struct in_band *ib) { - time_t now = time_now(); - if (now >= ib->next_local_refresh) { - uint8_t ea[ETH_ADDR_LEN]; - if (ib->dev_name && (!netdev_nodev_get_etheraddr(ib->dev_name, ea))) { - memcpy(ib->local_mac, ea, ETH_ADDR_LEN); + struct in_band_remote *r; + bool any_changes; + + if (time_now() < ib->next_remote_refresh) { + return false; + } + + any_changes = false; + ib->next_remote_refresh = TIME_MAX; + for (r = ib->remotes; r < &ib->remotes[ib->n_remotes]; r++) { + uint8_t old_remote_mac[ETH_ADDR_LEN]; + time_t next_refresh; + + /* Save old MAC. */ + memcpy(old_remote_mac, r->remote_mac, ETH_ADDR_LEN); + + /* Refresh remote information. */ + next_refresh = refresh_remote(ib, r) + time_now(); + ib->next_remote_refresh = MIN(ib->next_remote_refresh, next_refresh); + + /* If the MAC changed, log the changes. */ + if (!eth_addr_equals(r->remote_mac, old_remote_mac)) { + any_changes = true; + if (!eth_addr_is_zero(r->remote_mac) + && !eth_addr_equals(r->last_remote_mac, r->remote_mac)) { + VLOG_DBG("remote MAC address changed from "ETH_ADDR_FMT + " to "ETH_ADDR_FMT, + ETH_ADDR_ARGS(r->last_remote_mac), + ETH_ADDR_ARGS(r->remote_mac)); + memcpy(r->last_remote_mac, r->remote_mac, ETH_ADDR_LEN); + } } - ib->next_local_refresh = now + 1; } - return !eth_addr_is_zero(ib->local_mac) ? ib->local_mac : NULL; + + return any_changes; } -static void -in_band_status_cb(struct status_reply *sr, void *in_band_) +/* Refreshes the MAC address of the local port into ib->local_mac, if it is due + * for a refresh. Returns true if anything changed, otherwise false. */ +static bool +refresh_local(struct in_band *ib) { - struct in_band *in_band = in_band_; - const uint8_t *local_mac; - const uint8_t *controller_mac; - - local_mac = get_local_mac(in_band); - if (local_mac) { - status_reply_put(sr, "local-mac="ETH_ADDR_FMT, - ETH_ADDR_ARGS(local_mac)); + uint8_t ea[ETH_ADDR_LEN]; + time_t now; + + now = time_now(); + if (now < ib->next_local_refresh) { + return false; } + ib->next_local_refresh = now + 1; - controller_mac = get_controller_mac(in_band); - if (controller_mac) { - status_reply_put(sr, "controller-mac="ETH_ADDR_FMT, - ETH_ADDR_ARGS(controller_mac)); + if (netdev_get_etheraddr(ib->local_netdev, ea) + || eth_addr_equals(ea, ib->local_mac)) { + return false; } + + memcpy(ib->local_mac, ea, ETH_ADDR_LEN); + return true; +} + +/* Returns true if packets in 'flow' should be directed to the local port. + * (This keeps the flow table from preventing DHCP replies from being seen by + * the local port.) */ +bool +in_band_must_output_to_local_port(const struct flow *flow) +{ + return (flow->dl_type == htons(ETH_TYPE_IP) + && flow->nw_proto == IPPROTO_UDP + && flow->tp_src == htons(DHCP_SERVER_PORT) + && flow->tp_dst == htons(DHCP_CLIENT_PORT)); } static void -drop_flow(struct in_band *in_band, int rule_idx) +add_rule(struct in_band *ib, const struct match *match, unsigned int priority) { - struct ib_rule *rule = &in_band->rules[rule_idx]; + uint32_t hash = match_hash(match, 0); + struct in_band_rule *rule; - if (rule->installed) { - rule->installed = false; - ofproto_delete_flow(in_band->ofproto, &rule->flow, rule->wildcards, - rule->priority); + HMAP_FOR_EACH_WITH_HASH (rule, hmap_node, hash, &ib->rules) { + if (match_equal(&rule->match, match)) { + rule->op = ADD; + return; + } } + + rule = xmalloc(sizeof *rule); + rule->match = *match; + rule->priority = priority; + rule->op = ADD; + hmap_insert(&ib->rules, &rule->hmap_node, hash); } -/* out_port and fixed_fields are assumed never to change. */ static void -setup_flow(struct in_band *in_band, int rule_idx, const flow_t *flow, - uint32_t fixed_fields, uint16_t out_port) +update_rules(struct in_band *ib) { - struct ib_rule *rule = &in_band->rules[rule_idx]; + struct in_band_rule *ib_rule; + struct in_band_remote *r; + struct match match; + + /* Mark all the existing rules for deletion. (Afterward we will re-add any + * rules that are still valid.) */ + HMAP_FOR_EACH (ib_rule, hmap_node, &ib->rules) { + ib_rule->op = DEL; + } - if (!rule->installed || memcmp(flow, &rule->flow, sizeof *flow)) { - union ofp_action action; + if (ib->n_remotes && !eth_addr_is_zero(ib->local_mac)) { + /* (a) Allow DHCP requests sent from the local port. */ + match_init_catchall(&match); + match_set_in_port(&match, OFPP_LOCAL); + match_set_dl_type(&match, htons(ETH_TYPE_IP)); + match_set_dl_src(&match, ib->local_mac); + match_set_nw_proto(&match, IPPROTO_UDP); + match_set_tp_src(&match, htons(DHCP_CLIENT_PORT)); + match_set_tp_dst(&match, htons(DHCP_SERVER_PORT)); + add_rule(ib, &match, IBR_FROM_LOCAL_DHCP); + + /* (b) Allow ARP replies to the local port's MAC address. */ + match_init_catchall(&match); + match_set_dl_type(&match, htons(ETH_TYPE_ARP)); + match_set_dl_dst(&match, ib->local_mac); + match_set_nw_proto(&match, ARP_OP_REPLY); + add_rule(ib, &match, IBR_TO_LOCAL_ARP); + + /* (c) Allow ARP requests from the local port's MAC address. */ + match_init_catchall(&match); + match_set_dl_type(&match, htons(ETH_TYPE_ARP)); + match_set_dl_src(&match, ib->local_mac); + match_set_nw_proto(&match, ARP_OP_REQUEST); + add_rule(ib, &match, IBR_FROM_LOCAL_ARP); + } - drop_flow(in_band, rule_idx); + for (r = ib->remotes; r < &ib->remotes[ib->n_remotes]; r++) { + const uint8_t *remote_mac = r->remote_mac; - rule->installed = true; - rule->flow = *flow; - rule->wildcards = OFPFW_ALL & ~fixed_fields; - rule->priority = IB_BASE_PRIORITY + (N_IB_RULES - rule_idx); + if (eth_addr_is_zero(remote_mac)) { + continue; + } + + /* (d) Allow ARP replies to the next hop's MAC address. */ + match_init_catchall(&match); + match_set_dl_type(&match, htons(ETH_TYPE_ARP)); + match_set_dl_dst(&match, remote_mac); + match_set_nw_proto(&match, ARP_OP_REPLY); + add_rule(ib, &match, IBR_TO_NEXT_HOP_ARP); + + /* (e) Allow ARP requests from the next hop's MAC address. */ + match_init_catchall(&match); + match_set_dl_type(&match, htons(ETH_TYPE_ARP)); + match_set_dl_src(&match, remote_mac); + match_set_nw_proto(&match, ARP_OP_REQUEST); + add_rule(ib, &match, IBR_FROM_NEXT_HOP_ARP); + } - action.type = htons(OFPAT_OUTPUT); - action.output.len = htons(sizeof action); - action.output.port = htons(out_port); - action.output.max_len = htons(0); - ofproto_add_flow(in_band->ofproto, &rule->flow, rule->wildcards, - rule->priority, &action, 1, 0); + for (r = ib->remotes; r < &ib->remotes[ib->n_remotes]; r++) { + const struct sockaddr_in *a = &r->remote_addr; + + /* (f) Allow ARP replies containing the remote's IP address as a + * target. */ + match_init_catchall(&match); + match_set_dl_type(&match, htons(ETH_TYPE_ARP)); + match_set_nw_proto(&match, ARP_OP_REPLY); + match_set_nw_dst(&match, a->sin_addr.s_addr); + add_rule(ib, &match, IBR_TO_REMOTE_ARP); + + /* (g) Allow ARP requests containing the remote's IP address as a + * source. */ + match_init_catchall(&match); + match_set_dl_type(&match, htons(ETH_TYPE_ARP)); + match_set_nw_proto(&match, ARP_OP_REQUEST); + match_set_nw_src(&match, a->sin_addr.s_addr); + add_rule(ib, &match, IBR_FROM_REMOTE_ARP); + + /* (h) Allow TCP traffic to the remote's IP and port. */ + match_init_catchall(&match); + match_set_dl_type(&match, htons(ETH_TYPE_IP)); + match_set_nw_proto(&match, IPPROTO_TCP); + match_set_nw_dst(&match, a->sin_addr.s_addr); + match_set_tp_dst(&match, a->sin_port); + add_rule(ib, &match, IBR_TO_REMOTE_TCP); + + /* (i) Allow TCP traffic from the remote's IP and port. */ + match_init_catchall(&match); + match_set_dl_type(&match, htons(ETH_TYPE_IP)); + match_set_nw_proto(&match, IPPROTO_TCP); + match_set_nw_src(&match, a->sin_addr.s_addr); + match_set_tp_src(&match, a->sin_port); + add_rule(ib, &match, IBR_FROM_REMOTE_TCP); } } -void -in_band_run(struct in_band *in_band) +/* Updates the OpenFlow flow table for the current state of in-band control. + * Returns true ordinarily. Returns false if no remotes are configured on 'ib' + * and 'ib' doesn't have any rules left to remove from the OpenFlow flow + * table. Thus, a false return value means that the caller can destroy 'ib' + * without leaving extra flows hanging around in the flow table. */ +bool +in_band_run(struct in_band *ib) { - const uint8_t *controller_mac; - const uint8_t *local_mac; - flow_t flow; + uint64_t ofpacts_stub[128 / 8]; + struct ofpbuf ofpacts; - if (time_now() < MIN(in_band->next_refresh, in_band->next_local_refresh)) { - return; + struct in_band_rule *rule, *next; + + ofpbuf_use_stub(&ofpacts, ofpacts_stub, sizeof ofpacts_stub); + + if (ib->queue_id >= 0) { + ofpact_put_SET_QUEUE(&ofpacts)->queue_id = ib->queue_id; } - controller_mac = get_controller_mac(in_band); - local_mac = get_local_mac(in_band); - - /* Switch traffic sent by the local port. */ - memset(&flow, 0, sizeof flow); - flow.in_port = ODPP_LOCAL; - setup_flow(in_band, IBR_FROM_LOCAL_PORT, &flow, OFPFW_IN_PORT, - OFPP_NORMAL); - - if (local_mac) { - /* Deliver traffic sent to the connection's interface. */ - memset(&flow, 0, sizeof flow); - memcpy(flow.dl_dst, local_mac, ETH_ADDR_LEN); - setup_flow(in_band, IBR_OFP_TO_LOCAL, &flow, OFPFW_DL_DST, - OFPP_NORMAL); - - /* Allow the connection's interface to be the source of ARP traffic. */ - memset(&flow, 0, sizeof flow); - flow.dl_type = htons(ETH_TYPE_ARP); - memcpy(flow.dl_src, local_mac, ETH_ADDR_LEN); - setup_flow(in_band, IBR_ARP_FROM_LOCAL, &flow, - OFPFW_DL_TYPE | OFPFW_DL_SRC, OFPP_NORMAL); - } else { - drop_flow(in_band, IBR_OFP_TO_LOCAL); - drop_flow(in_band, IBR_ARP_FROM_LOCAL); + ofpact_put_OUTPUT(&ofpacts)->port = OFPP_NORMAL; + + refresh_local(ib); + refresh_remotes(ib); + + update_rules(ib); + + HMAP_FOR_EACH_SAFE (rule, next, hmap_node, &ib->rules) { + switch (rule->op) { + case ADD: + ofproto_add_flow(ib->ofproto, &rule->match, rule->priority, + ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts)); + break; + + case DEL: + if (ofproto_delete_flow(ib->ofproto, + &rule->match, rule->priority)) { + /* ofproto doesn't have the rule anymore so there's no reason + * for us to track it any longer. */ + hmap_remove(&ib->rules, &rule->hmap_node); + free(rule); + } + break; + } } - if (controller_mac) { - /* Switch ARP requests sent by the controller. (OFPP_NORMAL will "do - * the right thing" regarding VLANs here.) */ - memset(&flow, 0, sizeof flow); - flow.dl_type = htons(ETH_TYPE_ARP); - memcpy(flow.dl_dst, eth_addr_broadcast, ETH_ADDR_LEN); - memcpy(flow.dl_src, controller_mac, ETH_ADDR_LEN); - setup_flow(in_band, IBR_ARP_FROM_CTL, &flow, - OFPFW_DL_TYPE | OFPFW_DL_DST | OFPFW_DL_SRC, - OFPP_NORMAL); - - /* OpenFlow traffic to or from the controller. - * - * (A given field's value is completely ignored if it is wildcarded, - * which is why we can get away with using a single 'flow' in each - * case here.) */ - memset(&flow, 0, sizeof flow); - flow.dl_type = htons(ETH_TYPE_IP); - memcpy(flow.dl_src, controller_mac, ETH_ADDR_LEN); - memcpy(flow.dl_dst, controller_mac, ETH_ADDR_LEN); - flow.nw_proto = IP_TYPE_TCP; - flow.tp_src = htons(OFP_TCP_PORT); - flow.tp_dst = htons(OFP_TCP_PORT); - setup_flow(in_band, IBR_TO_CTL_OFP_SRC, &flow, - (OFPFW_DL_TYPE | OFPFW_DL_DST | OFPFW_NW_PROTO - | OFPFW_TP_SRC), OFPP_NORMAL); - setup_flow(in_band, IBR_TO_CTL_OFP_DST, &flow, - (OFPFW_DL_TYPE | OFPFW_DL_DST | OFPFW_NW_PROTO - | OFPFW_TP_DST), OFPP_NORMAL); - setup_flow(in_band, IBR_FROM_CTL_OFP_SRC, &flow, - (OFPFW_DL_TYPE | OFPFW_DL_SRC | OFPFW_NW_PROTO - | OFPFW_TP_SRC), OFPP_NORMAL); - setup_flow(in_band, IBR_FROM_CTL_OFP_DST, &flow, - (OFPFW_DL_TYPE | OFPFW_DL_SRC | OFPFW_NW_PROTO - | OFPFW_TP_DST), OFPP_NORMAL); - } else { - drop_flow(in_band, IBR_ARP_FROM_CTL); - drop_flow(in_band, IBR_TO_CTL_OFP_DST); - drop_flow(in_band, IBR_TO_CTL_OFP_SRC); - drop_flow(in_band, IBR_FROM_CTL_OFP_DST); - drop_flow(in_band, IBR_FROM_CTL_OFP_SRC); - } + ofpbuf_uninit(&ofpacts); + + return ib->n_remotes || !hmap_is_empty(&ib->rules); } void in_band_wait(struct in_band *in_band) { - time_t now = time_now(); - time_t wakeup = MIN(in_band->next_refresh, in_band->next_local_refresh); - if (wakeup > now) { - poll_timer_wait((wakeup - now) * 1000); - } else { - poll_immediate_wake(); + long long int wakeup + = MIN(in_band->next_remote_refresh, in_band->next_local_refresh); + poll_timer_wait_until(wakeup * 1000); +} + +int +in_band_create(struct ofproto *ofproto, const char *local_name, + struct in_band **in_bandp) +{ + struct in_band *in_band; + struct netdev *local_netdev; + int error; + + *in_bandp = NULL; + error = netdev_open(local_name, "internal", &local_netdev); + if (error) { + VLOG_ERR("failed to initialize in-band control: cannot open " + "datapath local port %s (%s)", + local_name, ovs_strerror(error)); + return error; } + + in_band = xzalloc(sizeof *in_band); + in_band->ofproto = ofproto; + in_band->queue_id = -1; + in_band->next_remote_refresh = TIME_MIN; + in_band->next_local_refresh = TIME_MIN; + in_band->local_netdev = local_netdev; + hmap_init(&in_band->rules); + + *in_bandp = in_band; + + return 0; } void -in_band_flushed(struct in_band *in_band) +in_band_destroy(struct in_band *ib) { - int i; + if (ib) { + struct in_band_rule *rule, *next; - for (i = 0; i < N_IB_RULES; i++) { - in_band->rules[i].installed = false; + HMAP_FOR_EACH_SAFE (rule, next, hmap_node, &ib->rules) { + hmap_remove(&ib->rules, &rule->hmap_node); + free(rule); + } + hmap_destroy(&ib->rules); + in_band_set_remotes(ib, NULL, 0); + netdev_close(ib->local_netdev); + free(ib); } } -void -in_band_create(struct ofproto *ofproto, struct switch_status *ss, - struct rconn *controller, struct in_band **in_bandp) +static bool +any_addresses_changed(struct in_band *ib, + const struct sockaddr_in *addresses, size_t n) { - struct in_band *in_band; + size_t i; - in_band = xcalloc(1, sizeof *in_band); - in_band->ofproto = ofproto; - in_band->controller = controller; - in_band->ss_cat = switch_status_register(ss, "in-band", - in_band_status_cb, in_band); - in_band->next_refresh = TIME_MIN; - in_band->next_local_refresh = TIME_MIN; - in_band->dev_name = NULL; + if (n != ib->n_remotes) { + return true; + } - *in_bandp = in_band; + for (i = 0; i < n; i++) { + const struct sockaddr_in *old = &ib->remotes[i].remote_addr; + const struct sockaddr_in *new = &addresses[i]; + + if (old->sin_addr.s_addr != new->sin_addr.s_addr || + old->sin_port != new->sin_port) { + return true; + } + } + + return false; } void -in_band_destroy(struct in_band *in_band) +in_band_set_remotes(struct in_band *ib, + const struct sockaddr_in *addresses, size_t n) { - if (in_band) { - switch_status_unregister(in_band->ss_cat); - /* We don't own the rconn. */ + size_t i; + + if (!any_addresses_changed(ib, addresses, n)) { + return; } + + /* Clear old remotes. */ + for (i = 0; i < ib->n_remotes; i++) { + netdev_close(ib->remotes[i].remote_netdev); + } + free(ib->remotes); + + /* Set up new remotes. */ + ib->remotes = n ? xzalloc(n * sizeof *ib->remotes) : NULL; + ib->n_remotes = n; + for (i = 0; i < n; i++) { + ib->remotes[i].remote_addr = addresses[i]; + } + + /* Force refresh in next call to in_band_run(). */ + ib->next_remote_refresh = TIME_MIN; +} + +/* Sets the OpenFlow queue used by flows set up by 'ib' to 'queue_id'. If + * 'queue_id' is negative, 'ib' will not set any queue (which is also the + * default). */ +void +in_band_set_queue(struct in_band *ib, int queue_id) +{ + ib->queue_id = queue_id; }