aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshwin Sekhar T K <asekhar@marvell.com>2021-05-10 09:48:54 +0530
committerMatias Elo <matias.elo@nokia.com>2021-05-17 15:31:02 +0300
commitc8b15d01b14d729e0efe3b059a58fe22163e27b7 (patch)
tree18eeec629c80530903bde3cf9c5d8d5f62d8aa36
parent8ee42ff84ce5987c7b8c5f4cccb171ef976b0827 (diff)
downloadodp-master.tar.gz
example: ipfragreass: fix packet length adjustment during reassemblyHEADmaster
At the time of fragmentation, packet length is increased using odp_packet_extend_head() to make room for header in the fragments. So during re-assembly, odp_packet_trunc_head() needs to be used instead of odp_packet_pull_head() to strip off the header to handle possible packet segmentation that may happen inside odp_packet_extend_head(). Signed-off-by: Ashwin Sekhar T K <asekhar@marvell.com> Reviewed-by: Matias Elo <matias.elo@nokia.com>
-rw-r--r--example/ipfragreass/odp_ipfragreass_reassemble.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/example/ipfragreass/odp_ipfragreass_reassemble.c b/example/ipfragreass/odp_ipfragreass_reassemble.c
index 35742d3a5..fba900f7a 100644
--- a/example/ipfragreass/odp_ipfragreass_reassemble.c
+++ b/example/ipfragreass/odp_ipfragreass_reassemble.c
@@ -303,11 +303,17 @@ static int send_packet(struct packet *tail, odp_queue_t out)
*/
while (current && equal_flow(current, &result)) {
struct packet new_result = *current;
- int concat_success;
+ int concat_success, trunc_success;
current = prev_packet(new_result);
header = odp_packet_data(result.handle);
- odp_packet_pull_head(result.handle, ipv4hdr_ihl(*header));
+ trunc_success = odp_packet_trunc_head(&result.handle, ipv4hdr_ihl(*header),
+ NULL, NULL);
+ if (trunc_success < 0) {
+ fprintf(stderr, "ERROR: odp_packet_trunc_head\n");
+ return -1;
+ }
+
concat_success = odp_packet_concat(&new_result.handle,
result.handle);
if (concat_success < 0) {