From e956c9cdac7d6c07e49233613973968d39b60569 Mon Sep 17 00:00:00 2001 From: Miroslav Zagorac Date: Sun, 12 Sep 2021 08:15:37 +0200 Subject: [PATCH] CLEANUP: opentracing: simplify the condition on the empty header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The second patch from the last series of patches has been redesigned here, the ist() function is used to set an empty string instead of working directly with the string pointer. I thank Tim Düsterhus for his advice. --- addons/ot/src/http.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/addons/ot/src/http.c b/addons/ot/src/http.c index 1517e71e4..0d824ddb5 100644 --- a/addons/ot/src/http.c +++ b/addons/ot/src/http.c @@ -133,20 +133,25 @@ struct otc_text_map *flt_ot_http_headers_get(struct channel *chn, const char *pr v = htx_get_blk_value(htx, blk); + /* + * In case the data of the HTTP header is not + * specified, v.ptr will have some non-null + * value and v.len will be equal to 0. The + * otc_text_map_add() function will not + * interpret this well. In this case v.ptr + * is set to an empty string. + */ + if (v.len == 0) + v = ist(""); + /* * Here, an HTTP header (which is actually part * of the span context is added to the text_map. * * Before adding, the prefix is removed from the * HTTP header name. - * - * In case the data of the HTTP header is not - * specified, v.len will be equal to 0, and - * the function otc_text_map_add() will not - * interpret this well. In this case, instead - * of v.ptr, "" is used. */ - if (otc_text_map_add(retptr, n.ptr + prefix_len, n.len - prefix_len, (v.len > 0) ? v.ptr : "", v.len, OTC_TEXT_MAP_DUP_KEY | OTC_TEXT_MAP_DUP_VALUE) == -1) { + if (otc_text_map_add(retptr, n.ptr + prefix_len, n.len - prefix_len, v.ptr, v.len, OTC_TEXT_MAP_DUP_KEY | OTC_TEXT_MAP_DUP_VALUE) == -1) { FLT_OT_ERR("failed to add HTTP header data"); otc_text_map_destroy(&retptr, OTC_TEXT_MAP_FREE_KEY | OTC_TEXT_MAP_FREE_VALUE);