X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fconnmgr.c;h=887080acbbad9fc592af5c228d96c86f276116af;hb=6d4605fd85630eb3a9ec743763114f286373a544;hp=46d6d7962ff72561ea113746543b784ba946c39a;hpb=548349603423bea41ec2989583231c1a117f6a9e;p=openvswitch diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c index 46d6d796..887080ac 100644 --- a/ofproto/connmgr.c +++ b/ofproto/connmgr.c @@ -71,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? */ }; @@ -754,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. */ @@ -844,24 +858,22 @@ 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; + struct ofpbuf *reply; - msg = ofputil_encode_error_msg(error, request); - if (msg) { + 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; - char *error_s; request_len = ntohs(request->length); type_name = (!ofputil_decode_msg_type_partial(request, @@ -870,17 +882,16 @@ ofconn_send_error(const struct ofconn *ofconn, ? ofputil_msg_type_name(type) : "invalid"); - error_s = ofputil_error_to_string(error); VLOG_INFO("%s: sending %s error reply to %s message", - rconn_get_name(ofconn->rconn), error_s, type_name); - free(error_s); + rconn_get_name(ofconn->rconn), ofperr_to_string(error), + type_name); } - ofconn_send_reply(ofconn, msg); + 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) { @@ -934,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; } @@ -1057,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; @@ -1072,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. * @@ -1181,7 +1214,7 @@ connmgr_send_packet_in(struct connmgr *mgr, struct ofconn *ofconn; LIST_FOR_EACH (ofconn, node, &mgr->all_conns) { - if (ofconn_receives_async_msgs(ofconn)) { + if (ofconn_interested_in_packet(ofconn, pin)) { schedule_packet_in(ofconn, *pin, flow); } }