From af4b7cccd7a456a429df2a6fd01f989009659673 Mon Sep 17 00:00:00 2001 From: Jarno Rajahalme Date: Tue, 25 Mar 2014 16:16:28 -0700 Subject: [PATCH] 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 Signed-off-by: Ben Pfaff --- lib/pcap-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.20.1