From: Jarno Rajahalme <jrajahalme@nicira.com>
Date: Tue, 25 Mar 2014 23:16:28 +0000 (-0700)
Subject: lib/pcap: Use ofpbuf_tail() instead of ofpbuf_end().
X-Git-Tag: v2.1.1~21
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=af4b7cccd7a456a429df2a6fd01f989009659673

lib/pcap: Use ofpbuf_tail() instead of ofpbuf_end().

Using ofpbuf_end() to compute payload length would fail if the ofpbuf
had any tailroom.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/pcap-file.c b/lib/pcap-file.c
index 4e3e7db92..2fa008236 100644
--- a/lib/pcap-file.c
+++ b/lib/pcap-file.c
@@ -329,7 +329,7 @@ tcp_reader_run(struct tcp_reader *r, const struct flow *flow,
          * continually expanding it. */
         ofpbuf_shift(payload, (char *) payload->base - (char *) payload->data);
 
-        length = (char *) ofpbuf_end(packet) - (char *) packet->l7;
+        length = (char *) ofpbuf_tail(packet) - (char *) packet->l7;
         ofpbuf_put(payload, packet->l7, length);
         stream->seq_no += length;
         return payload;