X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fpktbuf.c;h=aa90295427b91808bfbdbe29a22dfc09aa1784f0;hb=f1670a487adf5d5352eaf32f15bcf2958cdb1771;hp=49e5c4d63f307b5ef1814b6f2e6bd7e7b82ec6c8;hpb=5136ce492c414f377f7be9ae32b259abb9f76580;p=openvswitch diff --git a/ofproto/pktbuf.c b/ofproto/pktbuf.c index 49e5c4d6..aa902954 100644 --- a/ofproto/pktbuf.c +++ b/ofproto/pktbuf.c @@ -112,7 +112,9 @@ pktbuf_save(struct pktbuf *pb, struct ofpbuf *buffer, uint16_t in_port) if (++p->cookie >= COOKIE_MAX) { p->cookie = 0; } - p->buffer = ofpbuf_clone(buffer); + p->buffer = ofpbuf_new_with_headroom(buffer->size, + sizeof(struct ofp_packet_in)); + ofpbuf_put(p->buffer, buffer->data, buffer->size); p->timeout = time_msec() + OVERWRITE_MSECS; p->in_port = in_port; return make_id(p - pb->packets, p->cookie); @@ -154,6 +156,9 @@ pktbuf_get_null(void) * identifies a "null" packet buffer (created with pktbuf_get_null()), stores * NULL in '*bufferp' and UINT16_max in '*in_port'. * + * A returned packet will have at least sizeof(struct ofp_packet_in) bytes of + * headroom. + * * On failure, stores NULL in in '*bufferp' and UINT16_MAX in '*in_port'. */ int pktbuf_retrieve(struct pktbuf *pb, uint32_t id, struct ofpbuf **bufferp,