-/* Copyright (C) 2007 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 <assert.h>
#include "ofp-print.h"
#include "openflow.h"
#include "poll-loop.h"
+#include "queue.h"
#include "time.h"
#include "util.h"
#include "vconn-ssl.h"
uint64_t datapath_id;
time_t last_control_hello;
- int n_txq;
- struct buffer *txq, *tx_tail;
+ struct queue txq;
};
/* -H, --hub: Use dumb hub instead of learning switch? */
}
} else {
vconn_recv_wait(this->vconn);
- if (this->n_txq) {
+ if (this->txq.n) {
vconn_send_wait(this->vconn);
}
}
do_switch_send(struct switch_ *this)
{
int retval = 0;
- if (this->n_txq) {
- struct buffer *next = this->txq->next;
-
- retval = vconn_send(this->vconn, this->txq);
+ if (this->txq.n) {
+ struct buffer *next = this->txq.head->next;
+ retval = vconn_send(this->vconn, this->txq.head);
if (retval) {
return retval;
}
-
- this->txq = next;
- if (this->txq == NULL) {
- this->tx_tail = NULL;
- }
- this->n_txq--;
+ queue_advance_head(&this->txq, next);
return 0;
}
return EAGAIN;
memset(this, 0, sizeof *this);
this->name = xstrdup(name);
this->vconn = vconn;
- this->n_txq = 0;
- this->txq = NULL;
- this->tx_tail = NULL;
+ queue_init(&this->txq);
this->last_control_hello = 0;
if (!vconn_is_passive(vconn)) {
send_control_hello(this);
close_switch(struct switch_ *this)
{
if (this) {
- struct buffer *cur, *next;
-
free(this->name);
vconn_close(this->vconn);
- for (cur = this->txq; cur != NULL; cur = next) {
- next = cur->next;
- buffer_delete(cur);
- }
+ queue_destroy(&this->txq);
free(this);
}
}
}
}
-static void
-check_txq(struct switch_ *this UNUSED)
-{
-#if 0
- struct buffer *iter;
- size_t n;
-
- assert(this->n_txq == 0
- ? this->txq == NULL && this->tx_tail == NULL
- : this->txq != NULL && this->tx_tail != NULL);
-
- n = 0;
- for (iter = this->txq; iter != NULL; iter = iter->next) {
- n++;
- assert((iter->next != NULL) == (iter != this->tx_tail));
- }
- assert(n == this->n_txq);
-#endif
-}
-
static void
queue_tx(struct switch_ *this, struct buffer *b)
{
- check_txq(this);
-
- b->next = NULL;
- if (this->n_txq++) {
- this->tx_tail->next = b;
- } else {
- this->txq = b;
- }
- this->tx_tail = b;
-
- check_txq(this);
+ queue_push_tail(&this->txq, b);
}
static void
}
if (oh->type == OFPT_PACKET_IN) {
- if (sw->n_txq >= MAX_TXQ) {
+ if (sw->txq.n >= MAX_TXQ) {
+ /* FIXME: ratelimit. */
VLOG_WARN("%s: tx queue overflow", sw->name);
} else if (noflow) {
process_noflow(sw, msg->data);