/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
if (active) {
printf("Active OpenFlow connection methods:\n");
printf(" tcp:IP[:PORT] "
- "PORT (default: %d) at remote IP\n", OFP_OLD_PORT);
+ "PORT (default: %d) at remote IP\n", OFP_PORT);
#ifdef HAVE_OPENSSL
printf(" ssl:IP[:PORT] "
- "SSL PORT (default: %d) at remote IP\n", OFP_OLD_PORT);
+ "SSL PORT (default: %d) at remote IP\n", OFP_PORT);
#endif
printf(" unix:FILE Unix domain socket named FILE\n");
}
printf("Passive OpenFlow connection methods:\n");
printf(" ptcp:[PORT][:IP] "
"listen to TCP PORT (default: %d) on IP\n",
- OFP_OLD_PORT);
+ OFP_PORT);
#ifdef HAVE_OPENSSL
printf(" pssl:[PORT][:IP] "
"listen for SSL on PORT (default: %d) on IP\n",
- OFP_OLD_PORT);
+ OFP_PORT);
#endif
printf(" punix:FILE "
"listen on Unix domain socket FILE\n");
enum ofptype type;
enum ofperr error;
- error = ofptype_decode(&type, ofpbuf_data(b));
+ error = ofptype_decode(&type, b->data);
if (!error && type == OFPTYPE_HELLO) {
char *peer_s, *local_s;
uint32_t common_versions;
- if (!ofputil_decode_hello(ofpbuf_data(b), &vconn->peer_versions)) {
+ if (!ofputil_decode_hello(b->data, &vconn->peer_versions)) {
struct ds msg = DS_EMPTY_INITIALIZER;
ds_put_format(&msg, "%s: unknown data in hello:\n",
vconn->name);
- ds_put_hex_dump(&msg, ofpbuf_data(b), ofpbuf_size(b), 0, true);
+ ds_put_hex_dump(&msg, b->data, b->size, 0, true);
VLOG_WARN_RL(&bad_ofmsg_rl, "%s", ds_cstr(&msg));
ds_destroy(&msg);
}
ofpbuf_delete(b);
return;
} else {
- char *s = ofp_to_string(ofpbuf_data(b), ofpbuf_size(b), 1);
+ char *s = ofp_to_string(b->data, b->size, 1);
VLOG_WARN_RL(&bad_ofmsg_rl,
"%s: received message while expecting hello: %s",
vconn->name, s);
retval = do_recv(vconn, &msg);
}
if (!retval && !vconn->recv_any_version) {
- const struct ofp_header *oh = ofpbuf_data(msg);
+ const struct ofp_header *oh = msg->data;
if (oh->version != vconn->version) {
enum ofptype type;
- if (ofptype_decode(&type, ofpbuf_data(msg))
+ if (ofptype_decode(&type, msg->data)
|| (type != OFPTYPE_HELLO &&
type != OFPTYPE_ERROR &&
type != OFPTYPE_ECHO_REQUEST &&
if (!retval) {
COVERAGE_INC(vconn_received);
if (VLOG_IS_DBG_ENABLED()) {
- char *s = ofp_to_string(ofpbuf_data(*msgp), ofpbuf_size(*msgp), 1);
+ char *s = ofp_to_string((*msgp)->data, (*msgp)->size, 1);
VLOG_DBG_RL(&ofmsg_rl, "%s: received: %s", vconn->name, s);
free(s);
}
{
int retval;
- ovs_assert(ofpbuf_size(msg) >= sizeof(struct ofp_header));
+ ovs_assert(msg->size >= sizeof(struct ofp_header));
ofpmsg_update_length(msg);
if (!VLOG_IS_DBG_ENABLED()) {
COVERAGE_INC(vconn_sent);
retval = (vconn->vclass->send)(vconn, msg);
} else {
- char *s = ofp_to_string(ofpbuf_data(msg), ofpbuf_size(msg), 1);
+ char *s = ofp_to_string(msg->data, msg->size, 1);
retval = (vconn->vclass->send)(vconn, msg);
if (retval != EAGAIN) {
VLOG_DBG_RL(&ofmsg_rl, "%s: sent (%s): %s",
return retval;
}
-/* Waits until a message with a transaction ID matching 'xid' is received on
- * 'vconn'. Returns 0 if successful, in which case the reply is stored in
- * '*replyp' for the caller to examine and free. Otherwise returns a positive
- * errno value, or EOF, and sets '*replyp' to null.
- *
- * 'request' is always destroyed, regardless of the return value. */
-int
-vconn_recv_xid(struct vconn *vconn, ovs_be32 xid, struct ofpbuf **replyp)
+static int
+vconn_recv_xid__(struct vconn *vconn, ovs_be32 xid, struct ofpbuf **replyp,
+ void (*error_reporter)(const struct ofp_header *))
{
for (;;) {
ovs_be32 recv_xid;
struct ofpbuf *reply;
+ const struct ofp_header *oh;
+ enum ofptype type;
int error;
error = vconn_recv_block(vconn, &reply);
*replyp = NULL;
return error;
}
- recv_xid = ((struct ofp_header *) ofpbuf_data(reply))->xid;
+ oh = reply->data;
+ recv_xid = oh->xid;
if (xid == recv_xid) {
*replyp = reply;
return 0;
}
- VLOG_DBG_RL(&bad_ofmsg_rl, "%s: received reply with xid %08"PRIx32
- " != expected %08"PRIx32,
- vconn->name, ntohl(recv_xid), ntohl(xid));
+ error = ofptype_decode(&type, oh);
+ if (!error && type == OFPTYPE_ERROR && error_reporter) {
+ error_reporter(oh);
+ } else {
+ VLOG_DBG_RL(&bad_ofmsg_rl, "%s: received reply with xid %08"PRIx32
+ " != expected %08"PRIx32,
+ vconn->name, ntohl(recv_xid), ntohl(xid));
+ }
ofpbuf_delete(reply);
}
}
+/* Waits until a message with a transaction ID matching 'xid' is received on
+ * 'vconn'. Returns 0 if successful, in which case the reply is stored in
+ * '*replyp' for the caller to examine and free. Otherwise returns a positive
+ * errno value, or EOF, and sets '*replyp' to null.
+ *
+ * 'request' is always destroyed, regardless of the return value. */
+int
+vconn_recv_xid(struct vconn *vconn, ovs_be32 xid, struct ofpbuf **replyp)
+{
+ return vconn_recv_xid__(vconn, xid, replyp, NULL);
+}
+
+static int
+vconn_transact__(struct vconn *vconn, struct ofpbuf *request,
+ struct ofpbuf **replyp,
+ void (*error_reporter)(const struct ofp_header *))
+{
+ ovs_be32 send_xid = ((struct ofp_header *) request->data)->xid;
+ int error;
+
+ *replyp = NULL;
+ error = vconn_send_block(vconn, request);
+ if (error) {
+ ofpbuf_delete(request);
+ }
+ return error ? error : vconn_recv_xid__(vconn, send_xid, replyp,
+ error_reporter);
+}
+
/* Sends 'request' to 'vconn' and blocks until it receives a reply with a
* matching transaction ID. Returns 0 if successful, in which case the reply
* is stored in '*replyp' for the caller to examine and free. Otherwise
vconn_transact(struct vconn *vconn, struct ofpbuf *request,
struct ofpbuf **replyp)
{
- ovs_be32 send_xid = ((struct ofp_header *) ofpbuf_data(request))->xid;
- int error;
-
- *replyp = NULL;
- error = vconn_send_block(vconn, request);
- if (error) {
- ofpbuf_delete(request);
- }
- return error ? error : vconn_recv_xid(vconn, send_xid, replyp);
+ return vconn_transact__(vconn, request, replyp, NULL);
}
/* Sends 'request' followed by a barrier request to 'vconn', then blocks until
*replyp = NULL;
/* Send request. */
- request_xid = ((struct ofp_header *) ofpbuf_data(request))->xid;
+ request_xid = ((struct ofp_header *) request->data)->xid;
error = vconn_send_block(vconn, request);
if (error) {
ofpbuf_delete(request);
/* Send barrier. */
barrier = ofputil_encode_barrier_request(vconn_get_version(vconn));
- barrier_xid = ((struct ofp_header *) ofpbuf_data(barrier))->xid;
+ barrier_xid = ((struct ofp_header *) barrier->data)->xid;
error = vconn_send_block(vconn, barrier);
if (error) {
ofpbuf_delete(barrier);
return error;
}
- msg_xid = ((struct ofp_header *) ofpbuf_data(msg))->xid;
+ msg_xid = ((struct ofp_header *) msg->data)->xid;
if (msg_xid == request_xid) {
if (*replyp) {
VLOG_WARN_RL(&bad_ofmsg_rl, "%s: duplicate replies with "
vconn_transact_multiple_noreply(struct vconn *vconn, struct ovs_list *requests,
struct ofpbuf **replyp)
{
- struct ofpbuf *request, *next;
+ struct ofpbuf *request;
- LIST_FOR_EACH_SAFE (request, next, list_node, requests) {
+ LIST_FOR_EACH_POP (request, list_node, requests) {
int error;
- list_remove(&request->list_node);
-
error = vconn_transact_noreply(vconn, request, replyp);
if (error || *replyp) {
ofpbuf_list_delete(requests);
return 0;
}
+static enum ofperr
+vconn_bundle_reply_validate(struct ofpbuf *reply,
+ struct ofputil_bundle_ctrl_msg *request,
+ void (*error_reporter)(const struct ofp_header *))
+{
+ const struct ofp_header *oh;
+ enum ofptype type;
+ enum ofperr error;
+ struct ofputil_bundle_ctrl_msg rbc;
+
+ oh = reply->data;
+ error = ofptype_decode(&type, oh);
+ if (error) {
+ return error;
+ }
+
+ if (type == OFPTYPE_ERROR) {
+ error_reporter(oh);
+ return ofperr_decode_msg(oh, NULL);
+ }
+ if (type != OFPTYPE_BUNDLE_CONTROL) {
+ return OFPERR_OFPBRC_BAD_TYPE;
+ }
+
+ error = ofputil_decode_bundle_ctrl(oh, &rbc);
+ if (error) {
+ return error;
+ }
+
+ if (rbc.bundle_id != request->bundle_id) {
+ return OFPERR_OFPBFC_BAD_ID;
+ }
+
+ if (rbc.type != request->type + 1) {
+ return OFPERR_OFPBFC_BAD_TYPE;
+ }
+
+ return 0;
+}
+
+/* Send bundle control message 'bc' of 'type' via 'vconn', and wait for either
+ * an error or the corresponding bundle control message response.
+ *
+ * 'error_reporter' is called for any error responses received, which may be
+ * also regarding earlier OpenFlow messages than this bundle control message.
+ *
+ * Returns errno value, or 0 when successful. */
+static int
+vconn_bundle_control_transact(struct vconn *vconn,
+ struct ofputil_bundle_ctrl_msg *bc,
+ uint16_t type,
+ void (*error_reporter)(const struct ofp_header *))
+{
+ struct ofpbuf *request, *reply;
+ int error;
+ enum ofperr ofperr;
+
+ bc->type = type;
+ request = ofputil_encode_bundle_ctrl_request(vconn->version, bc);
+ ofpmsg_update_length(request);
+ error = vconn_transact__(vconn, request, &reply, error_reporter);
+ if (error) {
+ return error;
+ }
+
+ ofperr = vconn_bundle_reply_validate(reply, bc, error_reporter);
+ if (ofperr) {
+ VLOG_WARN_RL(&bad_ofmsg_rl, "Bundle %s failed (%s).",
+ type == OFPBCT_OPEN_REQUEST ? "open"
+ : type == OFPBCT_CLOSE_REQUEST ? "close"
+ : type == OFPBCT_COMMIT_REQUEST ? "commit"
+ : type == OFPBCT_DISCARD_REQUEST ? "discard"
+ : "control message",
+ ofperr_to_string(ofperr));
+ }
+ ofpbuf_delete(reply);
+
+ return ofperr ? EPROTO : 0;
+}
+
+/* Checks if error responses can be received on 'vconn'. */
+static void
+vconn_recv_error(struct vconn *vconn,
+ void (*error_reporter)(const struct ofp_header *))
+{
+ int error;
+
+ do {
+ struct ofpbuf *reply;
+
+ error = vconn_recv(vconn, &reply);
+ if (!error) {
+ const struct ofp_header *oh;
+ enum ofptype type;
+ enum ofperr ofperr;
+
+ oh = reply->data;
+ ofperr = ofptype_decode(&type, oh);
+ if (!ofperr && type == OFPTYPE_ERROR) {
+ error_reporter(oh);
+ } else {
+ VLOG_DBG_RL(&bad_ofmsg_rl,
+ "%s: received unexpected reply with xid %08"PRIx32,
+ vconn->name, ntohl(oh->xid));
+ }
+ ofpbuf_delete(reply);
+ }
+ } while (!error);
+}
+
+static int
+vconn_bundle_add_msg(struct vconn *vconn, struct ofputil_bundle_ctrl_msg *bc,
+ struct ofpbuf *msg,
+ void (*error_reporter)(const struct ofp_header *))
+{
+ struct ofputil_bundle_add_msg bam;
+ struct ofpbuf *request;
+ int error;
+
+ bam.bundle_id = bc->bundle_id;
+ bam.flags = bc->flags;
+ bam.msg = msg->data;
+
+ request = ofputil_encode_bundle_add(vconn->version, &bam);
+ ofpmsg_update_length(request);
+
+ error = vconn_send_block(vconn, request);
+ if (!error) {
+ /* Check for an error return, so that the socket buffer does not become
+ * full of errors. */
+ vconn_recv_error(vconn, error_reporter);
+ }
+ return error;
+}
+
+int
+vconn_bundle_transact(struct vconn *vconn, struct ovs_list *requests,
+ uint16_t flags,
+ void (*error_reporter)(const struct ofp_header *))
+{
+ struct ofputil_bundle_ctrl_msg bc;
+ struct ofpbuf *request;
+ int error;
+
+ memset(&bc, 0, sizeof bc);
+ bc.flags = flags;
+ error = vconn_bundle_control_transact(vconn, &bc, OFPBCT_OPEN_REQUEST,
+ error_reporter);
+ if (error) {
+ return error;
+ }
+
+ LIST_FOR_EACH (request, list_node, requests) {
+ error = vconn_bundle_add_msg(vconn, &bc, request, error_reporter);
+ if (error) {
+ break;
+ }
+ }
+
+ if (!error) {
+ error = vconn_bundle_control_transact(vconn, &bc,
+ OFPBCT_COMMIT_REQUEST,
+ error_reporter);
+ } else {
+ /* Do not overwrite the error code from vconn_bundle_add_msg().
+ * Any error in discard should be either reported or logged, so it
+ * should not get lost. */
+ vconn_bundle_control_transact(vconn, &bc, OFPBCT_DISCARD_REQUEST,
+ error_reporter);
+ }
+ return error;
+}
+
void
vconn_wait(struct vconn *vconn, enum vconn_wait_type wait)
{
projects / cascardo / ovs.git / blobdiff