From 983f406310eeff7facfc9e62b5e8b2df7fb4ac9e Mon Sep 17 00:00:00 2001 From: Felician Nemeth Date: Mon, 5 Mar 2012 03:33:22 -0800 Subject: [PATCH 1/2] packet_handle_std_clone: fix cloning metadata --- udatapath/packet_handle_std.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/udatapath/packet_handle_std.c b/udatapath/packet_handle_std.c index 3a934d2..0d9c95c 100644 --- a/udatapath/packet_handle_std.c +++ b/udatapath/packet_handle_std.c @@ -296,7 +296,7 @@ packet_handle_std_create(struct packet *pkt) { return handle; } struct packet_handle_std * -packet_handle_std_clone(struct packet *pkt, struct packet_handle_std *handle UNUSED) { +packet_handle_std_clone(struct packet *pkt, struct packet_handle_std *handle) { struct packet_handle_std *clone = xmalloc(sizeof(struct packet_handle_std)); clone->pkt = pkt; @@ -307,6 +307,7 @@ packet_handle_std_clone(struct packet *pkt, struct packet_handle_std *handle UNU // TODO Zoltan: if handle->valid, then match could be memcpy'd, and protocol // could be offset packet_handle_std_validate(clone); + clone->match->metadata = handle->match->metadata; return clone; } From 5b6c8b1ef48955aea538df76fbe1482100242d1a Mon Sep 17 00:00:00 2001 From: Felician Nemeth Date: Mon, 5 Mar 2012 03:35:48 -0800 Subject: [PATCH 2/2] add copyright info --- udatapath/packet_handle_std.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/udatapath/packet_handle_std.c b/udatapath/packet_handle_std.c index 0d9c95c..e0688a8 100644 --- a/udatapath/packet_handle_std.c +++ b/udatapath/packet_handle_std.c @@ -1,4 +1,5 @@ /* Copyright (c) 2011, TrafficLab, Ericsson Research, Hungary + * Copyright (c) 2012, Budapest University of Technology and Economics * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,6 +28,7 @@ * * * Author: Zoltán Lajos Kis + * Author: Felicián Németh */ #include