-/* Copyright (C) 2008 Board of Trustees, Leland Stanford Jr. University.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
+/* Copyright (c) 2008 The Board of Trustees of The Leland Stanford
+ * Junior University
+ *
+ * We are making the OpenFlow specification and associated documentation
+ * (Software) available for public use and benefit with the expectation
+ * that others will use, modify and enhance the Software and contribute
+ * those enhancements back to the community. However, since we would
+ * like to make the Software available for broadest use, with as few
+ * restrictions as possible permission is hereby granted, free of
+ * charge, to any person obtaining a copy of this Software to deal in
+ * the Software under the copyrights without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * The name and trademarks of copyright holder(s) may NOT be used in
+ * advertising or publicity pertaining to the Software or any
+ * derivatives without specific, written prior permission.
*/
#include "controller.h"
#include <errno.h>
#include <string.h>
#include "buffer.h"
-#include "forward.h"
#include "poll-loop.h"
#include "ofp-print.h"
#include "util.h"
#define THIS_MODULE VLM_controller_connection
#include "vlog.h"
-void
-controller_init(struct controller_connection *cc,
- const char *name, bool reliable)
+struct controller_connection {
+ bool reliable;
+ const char *name;
+ struct vconn *vconn;
+ bool connected;
+ struct queue txq;
+ time_t backoff_deadline;
+ int backoff;
+};
+
+struct controller_connection *
+controller_new(const char *name, bool reliable)
{
+ struct controller_connection *cc = xmalloc(sizeof *cc);
cc->reliable = reliable;
cc->name = name;
cc->vconn = NULL;
queue_init(&cc->txq);
cc->backoff_deadline = 0;
cc->backoff = 0;
+ return cc;
}
static int
}
void
-controller_run(struct controller_connection *cc, struct datapath *dp)
+controller_run(struct controller_connection *cc)
{
if (!cc->vconn) {
if (time(0) >= cc->backoff_deadline) {
controller_disconnect(cc, 0);
}
} else {
- int iterations;
-
- for (iterations = 0; iterations < 50; iterations++) {
- struct buffer *buffer;
- int error = vconn_recv(cc->vconn, &buffer);
- if (!error) {
- fwd_control_input(dp, buffer->data, buffer->size);
- buffer_delete(buffer);
- } else if (error == EAGAIN) {
- break;
- } else {
- controller_disconnect(cc, error);
- return;
- }
- }
-
while (cc->txq.n > 0) {
int error = try_send(cc);
if (error == EAGAIN) {
controller_disconnect(cc, error);
return;
}
- }
+ }
+ }
+}
+
+void
+controller_run_wait(struct controller_connection *cc)
+{
+ if (cc->vconn) {
+ if (cc->txq.n) {
+ vconn_wait(cc->vconn, WAIT_SEND);
+ }
+ } else {
+ poll_timer_wait((cc->backoff_deadline - time(0)) * 1000);
}
}
cc->backoff_deadline = now + cc->backoff;
}
+struct buffer *
+controller_recv(struct controller_connection *cc)
+{
+ if (cc->vconn && cc->connected) {
+ struct buffer *buffer;
+ int error = vconn_recv(cc->vconn, &buffer);
+ if (!error) {
+ return buffer;
+ } else if (error != EAGAIN) {
+ controller_disconnect(cc, error);
+ }
+ }
+ return NULL;
+}
+
void
-controller_wait(struct controller_connection *cc)
+controller_recv_wait(struct controller_connection *cc)
{
if (cc->vconn) {
vconn_wait(cc->vconn, WAIT_RECV);
- if (cc->txq.n) {
- vconn_wait(cc->vconn, WAIT_SEND);
- }
- } else {
- poll_timer_wait((cc->backoff_deadline - time(0)) * 1000);
}
}
projects / openvswitch / blobdiff