X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fconnmgr.c;h=887080acbbad9fc592af5c228d96c86f276116af;hb=6d4605fd85630eb3a9ec743763114f286373a544;hp=2d0b8c5d5a56ff963951389bfb90a32aee6dced1;hpb=747b434cd8adc3f4ef26f456ffd45873dd748c0d;p=openvswitch diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c index 2d0b8c5d..887080ac 100644 --- a/ofproto/connmgr.c +++ b/ofproto/connmgr.c @@ -33,6 +33,7 @@ #include "pktbuf.h" #include "rconn.h" #include "shash.h" +#include "stream.h" #include "timeval.h" #include "vconn.h" #include "vlog.h" @@ -47,6 +48,7 @@ struct ofconn { struct rconn *rconn; /* OpenFlow connection. */ enum ofconn_type type; /* Type. */ enum nx_flow_format flow_format; /* Currently selected flow format. */ + enum nx_packet_in_format packet_in_format; /* OFPT_PACKET_IN format. */ bool flow_mod_table_id; /* NXT_FLOW_MOD_TABLE_ID enabled? */ /* Asynchronous flow table operation support. */ @@ -69,6 +71,8 @@ struct ofconn { /* type == OFCONN_PRIMARY only. */ enum nx_role role; /* Role. */ + bool invalid_ttl_to_controller; /* Send packets with invalid TTL + to the controller. */ struct hmap_node hmap_node; /* In struct connmgr's "controllers" map. */ enum ofproto_band band; /* In-band or out-of-band? */ }; @@ -587,14 +591,16 @@ update_in_band_remotes(struct connmgr *mgr) /* Add all the remotes. */ HMAP_FOR_EACH (ofconn, hmap_node, &mgr->controllers) { struct sockaddr_in *sin = &addrs[n_addrs]; + const char *target = rconn_get_target(ofconn->rconn); if (ofconn->band == OFPROTO_OUT_OF_BAND) { continue; } - sin->sin_addr.s_addr = rconn_get_remote_ip(ofconn->rconn); - if (sin->sin_addr.s_addr) { - sin->sin_port = rconn_get_remote_port(ofconn->rconn); + if (stream_parse_target_with_default_ports(target, + OFP_TCP_PORT, + OFP_SSL_PORT, + sin)) { n_addrs++; } } @@ -750,6 +756,18 @@ ofconn_set_role(struct ofconn *ofconn, enum nx_role role) ofconn->role = role; } +void +ofconn_set_invalid_ttl_to_controller(struct ofconn *ofconn, bool val) +{ + ofconn->invalid_ttl_to_controller = val; +} + +bool +ofconn_get_invalid_ttl_to_controller(struct ofconn *ofconn) +{ + return ofconn->invalid_ttl_to_controller; +} + /* Returns the currently configured flow format for 'ofconn', one of NXFF_*. * * The default, if no other format has been set, is NXFF_OPENFLOW10. */ @@ -766,6 +784,25 @@ ofconn_set_flow_format(struct ofconn *ofconn, enum nx_flow_format flow_format) ofconn->flow_format = flow_format; } +/* Returns the currently configured packet in format for 'ofconn', one of + * NXPIF_*. + * + * The default, if no other format has been set, is NXPIF_OPENFLOW10. */ +enum nx_packet_in_format +ofconn_get_packet_in_format(struct ofconn *ofconn) +{ + return ofconn->packet_in_format; +} + +/* Sets the packet in format for 'ofconn' to 'packet_in_format' (one of + * NXPIF_*). */ +void +ofconn_set_packet_in_format(struct ofconn *ofconn, + enum nx_packet_in_format packet_in_format) +{ + ofconn->packet_in_format = packet_in_format; +} + /* Returns true if the NXT_FLOW_MOD_TABLE_ID extension is enabled, false * otherwise. * @@ -821,21 +858,40 @@ ofconn_send_replies(const struct ofconn *ofconn, struct list *replies) } } -/* Sends 'error', which should be an OpenFlow error created with - * e.g. ofp_mkerr(), on 'ofconn', as a reply to 'request'. Only at most the +/* Sends 'error' on 'ofconn', as a reply to 'request'. Only at most the * first 64 bytes of 'request' are used. */ void ofconn_send_error(const struct ofconn *ofconn, - const struct ofp_header *request, int error) + const struct ofp_header *request, enum ofperr error) { - struct ofpbuf *msg = ofputil_encode_error_msg(error, request); - if (msg) { - ofconn_send_reply(ofconn, msg); + struct ofpbuf *reply; + + reply = ofperr_encode_reply(error, request); + if (reply) { + static struct vlog_rate_limit err_rl = VLOG_RATE_LIMIT_INIT(10, 10); + + if (!VLOG_DROP_INFO(&err_rl)) { + const struct ofputil_msg_type *type; + const char *type_name; + size_t request_len; + + request_len = ntohs(request->length); + type_name = (!ofputil_decode_msg_type_partial(request, + MIN(64, request_len), + &type) + ? ofputil_msg_type_name(type) + : "invalid"); + + VLOG_INFO("%s: sending %s error reply to %s message", + rconn_get_name(ofconn->rconn), ofperr_to_string(error), + type_name); + } + ofconn_send_reply(ofconn, reply); } } /* Same as pktbuf_retrieve(), using the pktbuf owned by 'ofconn'. */ -int +enum ofperr ofconn_pktbuf_retrieve(struct ofconn *ofconn, uint32_t id, struct ofpbuf **bufferp, uint16_t *in_port) { @@ -881,6 +937,7 @@ ofconn_create(struct connmgr *mgr, struct rconn *rconn, enum ofconn_type type) ofconn->rconn = rconn; ofconn->type = type; ofconn->flow_format = NXFF_OPENFLOW10; + ofconn->packet_in_format = NXPIF_OPENFLOW10; ofconn->flow_mod_table_id = false; list_init(&ofconn->opgroups); ofconn->role = NX_ROLE_OTHER; @@ -888,6 +945,7 @@ ofconn_create(struct connmgr *mgr, struct rconn *rconn, enum ofconn_type type) ofconn->pktbuf = NULL; ofconn->miss_send_len = 0; ofconn->reply_counter = rconn_packet_counter_create (); + ofconn->invalid_ttl_to_controller = false; return ofconn; } @@ -1011,11 +1069,9 @@ ofconn_wait(struct ofconn *ofconn, bool handling_openflow) /* Returns true if 'ofconn' should receive asynchronous messages. */ static bool -ofconn_receives_async_msgs(const struct ofconn *ofconn) +ofconn_receives_async_msgs__(const struct ofconn *ofconn) { - if (!rconn_is_connected(ofconn->rconn)) { - return false; - } else if (ofconn->type == OFCONN_PRIMARY) { + if (ofconn->type == OFCONN_PRIMARY) { /* Primary controllers always get asynchronous messages unless they * have configured themselves as "slaves". */ return ofconn->role != NX_ROLE_SLAVE; @@ -1026,6 +1082,29 @@ ofconn_receives_async_msgs(const struct ofconn *ofconn) } } +static bool +ofconn_receives_async_msgs(const struct ofconn *ofconn) +{ + if (!rconn_is_connected(ofconn->rconn)) { + return false; + } else { + return ofconn_receives_async_msgs__(ofconn); + } +} + +static bool +ofconn_interested_in_packet(const struct ofconn *ofconn, + const struct ofputil_packet_in *pin) +{ + if (!rconn_is_connected(ofconn->rconn)) { + return false; + } else if (pin->reason == OFPR_INVALID_TTL) { + return ofconn->invalid_ttl_to_controller; + } else { + return ofconn_receives_async_msgs__(ofconn); + } +} + /* Returns a human-readable name for an OpenFlow connection between 'mgr' and * 'target', suitable for use in log messages for identifying the connection. * @@ -1071,7 +1150,7 @@ ofconn_send(const struct ofconn *ofconn, struct ofpbuf *msg, /* Sending asynchronous messages. */ static void schedule_packet_in(struct ofconn *, struct ofputil_packet_in, - const struct flow *, struct ofpbuf *rw_packet); + const struct flow *); /* Sends an OFPT_PORT_STATUS message with 'opp' and 'reason' to appropriate * controllers managed by 'mgr'. */ @@ -1126,32 +1205,19 @@ connmgr_send_flow_removed(struct connmgr *mgr, } /* Given 'pin', sends an OFPT_PACKET_IN message to each OpenFlow controller as - * necessary according to their individual configurations. - * - * 'rw_packet' may be NULL. Otherwise, 'rw_packet' must contain the same data - * as pin->packet. (rw_packet == pin->packet is also valid.) Ownership of - * 'rw_packet' is transferred to this function. */ + * necessary according to their individual configurations. */ void connmgr_send_packet_in(struct connmgr *mgr, const struct ofputil_packet_in *pin, - const struct flow *flow, struct ofpbuf *rw_packet) + const struct flow *flow) { - struct ofconn *ofconn, *prev; + struct ofconn *ofconn; - prev = NULL; LIST_FOR_EACH (ofconn, node, &mgr->all_conns) { - if (ofconn_receives_async_msgs(ofconn)) { - if (prev) { - schedule_packet_in(prev, *pin, flow, NULL); - } - prev = ofconn; + if (ofconn_interested_in_packet(ofconn, pin)) { + schedule_packet_in(ofconn, *pin, flow); } } - if (prev) { - schedule_packet_in(prev, *pin, flow, rw_packet); - } else { - ofpbuf_delete(rw_packet); - } } /* pinsched callback for sending 'ofp_packet_in' on 'ofconn'. */ @@ -1166,14 +1232,10 @@ do_send_packet_in(struct ofpbuf *ofp_packet_in, void *ofconn_) /* Takes 'pin', whose packet has the flow specified by 'flow', composes an * OpenFlow packet-in message from it, and passes it to 'ofconn''s packet - * scheduler for sending. - * - * 'rw_packet' may be NULL. Otherwise, 'rw_packet' must contain the same data - * as pin->packet. (rw_packet == pin->packet is also valid.) Ownership of - * 'rw_packet' is transferred to this function. */ + * scheduler for sending. */ static void schedule_packet_in(struct ofconn *ofconn, struct ofputil_packet_in pin, - const struct flow *flow, struct ofpbuf *rw_packet) + const struct flow *flow) { struct connmgr *mgr = ofconn->connmgr; @@ -1185,12 +1247,13 @@ schedule_packet_in(struct ofconn *ofconn, struct ofputil_packet_in pin, } else if (!ofconn->pktbuf) { pin.buffer_id = UINT32_MAX; } else { - pin.buffer_id = pktbuf_save(ofconn->pktbuf, pin.packet, flow->in_port); + pin.buffer_id = pktbuf_save(ofconn->pktbuf, pin.packet, pin.packet_len, + flow->in_port); } /* Figure out how much of the packet to send. */ if (pin.reason == OFPR_NO_MATCH) { - pin.send_len = pin.packet->size; + pin.send_len = pin.packet_len; } else { /* Caller should have initialized 'send_len' to 'max_len' specified in * struct ofp_action_output. */ @@ -1203,7 +1266,8 @@ schedule_packet_in(struct ofconn *ofconn, struct ofputil_packet_in pin, * immediately call into do_send_packet_in() or it might buffer it for a * while (until a later call to pinsched_run()). */ pinsched_send(ofconn->schedulers[pin.reason == OFPR_NO_MATCH ? 0 : 1], - flow->in_port, ofputil_encode_packet_in(&pin, rw_packet), + flow->in_port, + ofputil_encode_packet_in(&pin, ofconn->packet_in_format), do_send_packet_in, ofconn); }