From 6aa728e0efd1ed300c707af8fb54f9f3acacda10 Mon Sep 17 00:00:00 2001 From: Ethan Jackson Date: Tue, 27 Dec 2011 10:35:56 -0800 Subject: [PATCH] ofpbuf: Maintain header pointers in clone functions. Signed-off-by: Ethan Jackson --- lib/ofpbuf.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/lib/ofpbuf.c b/lib/ofpbuf.c index 38874816..29698dcd 100644 --- a/lib/ofpbuf.c +++ b/lib/ofpbuf.c @@ -129,7 +129,7 @@ ofpbuf_new_with_headroom(size_t size, size_t headroom) struct ofpbuf * ofpbuf_clone(const struct ofpbuf *buffer) { - return ofpbuf_clone_data(buffer->data, buffer->size); + return ofpbuf_clone_with_headroom(buffer, 0); } /* Creates and returns a new ofpbuf whose data are copied from 'buffer'. The @@ -137,8 +137,27 @@ ofpbuf_clone(const struct ofpbuf *buffer) struct ofpbuf * ofpbuf_clone_with_headroom(const struct ofpbuf *buffer, size_t headroom) { - return ofpbuf_clone_data_with_headroom(buffer->data, buffer->size, - headroom); + struct ofpbuf *new_buffer; + uintptr_t data_delta; + + new_buffer = ofpbuf_clone_data_with_headroom(buffer->data, buffer->size, + headroom); + data_delta = (char *) new_buffer->data - (char *) buffer->data; + + if (buffer->l2) { + new_buffer->l2 = (char *) buffer->l2 + data_delta; + } + if (buffer->l3) { + new_buffer->l3 = (char *) buffer->l3 + data_delta; + } + if (buffer->l4) { + new_buffer->l4 = (char *) buffer->l4 + data_delta; + } + if (buffer->l7) { + new_buffer->l7 = (char *) buffer->l7 + data_delta; + } + + return new_buffer; } /* Creates and returns a new ofpbuf that initially contains a copy of the -- 2.30.2