For SNAT, don't store the pre-fragment L2 header before actions are applied.

[sliver-openvswitch.git] / lib / queue.c

diff --git a/lib/queue.c b/lib/queue.c
index 49b9d80..04610cf 100644 (file)
--- a/lib/queue.c
+++ b/lib/queue.c
@@ -31,39 +31,49 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "queue.h"
 #include <assert.h>
-#include "buffer.h"
+#include "ofpbuf.h"
 
-static void check_queue(struct queue *q);
+static void check_queue(struct ofp_queue *q);
 
+/* Initializes 'q' as an empty packet queue. */
 void
-queue_init(struct queue *q)
+queue_init(struct ofp_queue *q)
 {
     q->n = 0;
     q->head = NULL;
     q->tail = NULL;
 }
 
+/* Destroys 'q' and all of the packets that it contains. */
 void
-queue_destroy(struct queue *q)
+queue_destroy(struct ofp_queue *q)
 {
-    struct buffer *cur, *next;
+    struct ofpbuf *cur, *next;
     for (cur = q->head; cur != NULL; cur = next) {
         next = cur->next;
-        buffer_delete(cur);
+        ofpbuf_delete(cur);
     }
 }
 
+/* Removes and destroys all of the packets in 'q', rendering it empty. */
 void
-queue_clear(struct queue *q)
+queue_clear(struct ofp_queue *q)
 {
     queue_destroy(q);
     queue_init(q);
 }
 
+/* Advances the first packet in 'q' from 'q->head' to 'next', which should be
+ * the second packet in the queue.
+ *
+ * The odd, unsafe interface here allows the first packet in the queue to be
+ * passed to a function for possible consumption (and destruction) and only
+ * dropped from the queue if that function actually accepts it. */
 void
-queue_advance_head(struct queue *q, struct buffer *next)
+queue_advance_head(struct ofp_queue *q, struct ofpbuf *next)
 {
     assert(q->n);
     assert(q->head);
@@ -74,8 +84,9 @@ queue_advance_head(struct queue *q, struct buffer *next)
     q->n--;
 }
 
+/* Appends 'b' to the tail of 'q'. */
 void
-queue_push_tail(struct queue *q, struct buffer *b)
+queue_push_tail(struct ofp_queue *q, struct ofpbuf *b)
 {
     check_queue(q);
 
@@ -90,11 +101,23 @@ queue_push_tail(struct queue *q, struct buffer *b)
     check_queue(q);
 }
 
+/* Removes the first buffer from 'q', which must not be empty, and returns
+ * it.  The caller must free the buffer (with ofpbuf_delete()) when it is no
+ * longer needed. */
+struct ofpbuf *
+queue_pop_head(struct ofp_queue *q)
+{
+    struct ofpbuf *head = q->head;
+    queue_advance_head(q, head->next);
+    return head;
+}
+
+/* Checks the internal integrity of 'q'.  For use in debugging. */
 static void
-check_queue(struct queue *q)
+check_queue(struct ofp_queue *q)
 {
 #if 0
-    struct buffer *iter;
+    struct ofpbuf *iter;
     size_t n;
 
     assert(q->n == 0