Deleted unsed functions and structures

const-t · const-t · commit 646863440a49 · 2023-02-23T17:09:04.000+02:00
diff --git a/fw/hpack.c b/fw/hpack.c
@@ -3470,25 +3470,6 @@ tfw_huffman_encode_string(TfwStr *str, TfwPool *pool)
 	return r ? ERR_PTR(r) : encoded;
 }
 
-static int
-tfw_hpack_str_add_raw(TfwHttpTransIter *mit, TfwStr *str, bool in_huffman)
-{
-	int r = 0;
-	TfwHPackInt len;
-	TfwStr len_str = { 0 };
-	unsigned short mask = in_huffman ? 0x80 : 0x0;
-
-	write_int(str->len, 0x7F, mask, &len);
-	len_str.data = len.buf;
-	len_str.len = len.sz;
-
-	r = tfw_h2_msg_rewrite_data(mit, &len_str, mit->bnd);
-	if (unlikely(r))
-		return r;
-
-	return tfw_h2_msg_rewrite_data(mit, str, mit->bnd);
-}
-
 static int
 tfw_hpack_str_expand_raw(TfwHttpTransIter *mit, TfwMsgIter *it,
 			 struct sk_buff **skb_head, TfwStr *str,
@@ -3537,22 +3518,6 @@ tfw_hpack_str_expand_raw(TfwHttpTransIter *mit, TfwMsgIter *it,
  * headers (e.g. in cases of HTTP/1.1=>HTTP/2 or HTTP/2=>HTTP/2 response proxy),
  * thus avoiding Huffman encodings is completely RFC-compliant behaviour.
  */
-static inline int
-tfw_hpack_str_add(TfwHttpTransIter *mit, TfwStr *str, TfwPool *pool)
-{
-	bool in_huffman = false;
-
-	if (0) {
-		str = tfw_huffman_encode_string(str, pool);
-
-		if (IS_ERR(str))
-			return PTR_ERR(str);
-		in_huffman = true;
-	}
-
-	return tfw_hpack_str_add_raw(mit, str, in_huffman);
-}
-
 static inline int
 tfw_hpack_str_expand(TfwHttpTransIter *mit, TfwMsgIter *it,
 		     struct sk_buff **skb_head, TfwStr *str,
diff --git a/fw/hpack.h b/fw/hpack.h
@@ -107,12 +107,6 @@ typedef struct {
 	TFW_HPACK_ETBL_COMMON;
 } TfwHPackETblIter;
 
-typedef enum {
-	TFW_H2_TRANS_INPLACE	= 0,
-	TFW_H2_TRANS_ADD,
-	TFW_H2_TRANS_EXPAND,
-} TfwH2TransOp;
-
 typedef enum {
 	TFW_TAG_HDR_H2_STATUS,
 	TFW_TAG_HDR_H2_METHOD,
diff --git a/fw/http.c b/fw/http.c
@@ -4699,162 +4699,6 @@ tfw_h2_hpack_encode_headers(TfwHttpResp *resp, const TfwHdrMods *h_mods)
 	return 0;
 }
 
-/*
- * Get next header from the @mit->map. Procedure designed to be called from the
- * outer cycle with changing of @mit iterator (including @mit->curr index of
- * current header in the indirection map). Note, for optimization purposes, on
- * each iteration function produces the boundary pointer @mit->bnd for current
- * iteration and the operation instance @mit->next - for the next iteration
- * (including source header @mit->next.s_hdr).
- *
- * TODO #1103: This function should be treated as a foundation for #1103 issue.
- */
-static int
-tfw_h2_resp_next_hdr(TfwHttpResp *resp, const TfwHdrMods *h_mods)
-{
-	int r;
-	unsigned int i;
-	TfwHttpTransIter *mit = &resp->mit;
-	TfwHttpHdrMap *map = mit->map;
-	TfwNextHdrOp *next = &mit->next;
-	TfwHttpHdrTbl *ht = resp->h_tbl;
-
-	mit->bnd = NULL;
-
-	for (i = mit->curr; i < map->count; ++i) {
-		int k;
-		TfwStr *first;
-		unsigned short hid = map->index[i].idx;
-		unsigned short d_num = map->index[i].d_idx;
-		TfwStr *tgt = &ht->tbl[hid];
-		TfwHdrModsDesc *f_desc = NULL;
-		const TfwStr *val;
-
-		if (TFW_STR_DUP(tgt))
-			tgt = TFW_STR_CHUNK(tgt, d_num);
-
-		first = TFW_STR_CHUNK(tgt, 0);
-
-		if (WARN_ON_ONCE(!tgt
-				 || TFW_STR_EMPTY(tgt)
-				 || TFW_STR_DUP(tgt)))
-			return -EINVAL;
-
-		T_DBG3("%s: hid=%hu, d_num=%hu, nchunks=%u, h_mods->sz=%lu\n",
-		       __func__, hid, d_num, ht->tbl[hid].nchunks,
-		       h_mods ? h_mods->sz : 0);
-
-		if (!h_mods)
-			goto def;
-
-		for (k = 0; k < h_mods->sz; ++k) {
-			TfwHdrModsDesc *desc = &h_mods->hdrs[k];
-
-			if ((hid < TFW_HTTP_HDR_RAW && hid == desc->hid)
-			    || (hid >= TFW_HTTP_HDR_RAW
-				&& !__hdr_name_cmp(tgt, desc->hdr)))
-			{
-				f_desc = desc;
-				break;
-			}
-		}
-		if (!f_desc)
-			goto def;
-
-		val = TFW_STR_CHUNK(f_desc->hdr, 2);
-		/*
-		 * If this is a duplicate of already processed header,
-		 * leave this duplicate as is (for transformation
-		 * in-place) in case of appending operation, and remove
-		 * it (by skipping) in case of substitution or deletion
-		 * operations.
-		 */
-		if (test_bit(k, mit->found)) {
-			if (!val || !f_desc->append)
-				continue;
-
-			mit->bnd = first->data;
-			next->s_hdr = *tgt;
-			next->op = TFW_H2_TRANS_INPLACE;
-
-			break;
-		}
-
-		__set_bit(k, mit->found);
-
-		/*
-		 * If header configured with empty value, it should be
-		 * removed from the response; so, just skip such header.
-		 */
-		if (!val)
-			continue;
-
-		mit->bnd = first->data;
-
-		/*
-		 * If the header configured for value appending,
-		 * concatenate it with the target header in skb for
-		 * subsequent in-place rewriting.
-		 */
-		if (f_desc->append) {
-			TfwStr h_app = {
-				.chunks = (TfwStr []){
-					{ .data = ", ", .len = 2 },
-					{ .data = val->data,
-					  .len = val->len }
-				},
-				.len = val->len + 2,
-				.nchunks = 2
-			};
-
-			r = tfw_strcat(resp->pool, tgt, &h_app);
-			if (unlikely(r))
-				return r;
-
-			next->s_hdr = *tgt;
-			next->op = TFW_H2_TRANS_INPLACE;
-			break;
-		}
-
-		next->s_hdr = *f_desc->hdr;
-		//next->op = TFW_H2_TRANS_SUB;
-		break;
-
-def:
-		/*
-		 * Remove 'Connection', 'Keep-Alive' headers and all hop-by-hop
-		 * headers from the HTTP/2 response.
-		 */
-		if (hid == TFW_HTTP_HDR_KEEP_ALIVE
-		    || hid == TFW_HTTP_HDR_CONNECTION
-		    || tgt->flags & TFW_STR_HBH_HDR)
-			continue;
-
-		/*
-		 * 'Server' header must be replaced; thus, remove the original
-		 * header (and all its duplicates) skipping it here; the new
-		 * header will be written later, during new headers' addition
-		 * stage.
-		 */
-		if (hid == TFW_HTTP_HDR_SERVER)
-			continue;
-
-		/*
-		 * In general case the header should be transformed in-place
-		 * from its original HTTP/1.1-representation in skb.
-		 */
-		mit->bnd = first->data;
-		next->s_hdr = *tgt;
-		next->op = TFW_H2_TRANS_INPLACE;
-
-		break;
-	}
-
-	mit->curr = i + 1;
-
-	return 0;
-}
-
 static int
 __tfw_h2_make_frames(unsigned long len, char *data, u8 buf_sz,
 		     TfwMsgIter *iter, unsigned long skew,
@@ -5496,7 +5340,7 @@ tfw_h2_resp_adjust_fwd(TfwHttpResp *resp)
 	 * Transform HTTP/1.1 headers into HTTP/2 form, in parallel with
 	 * adjusting of particular headers.
 	 */
-	WARN_ON_ONCE(mit->acc_len || mit->curr);
+	WARN_ON_ONCE(mit->acc_len);
 	tfw_h2_msg_transform_setup(mit, resp->msg.skb_head, true);
 
 	tfw_h2_msg_cutoff_headers(resp, &cleanup);
@@ -5513,9 +5357,6 @@ tfw_h2_resp_adjust_fwd(TfwHttpResp *resp)
 	 if (unlikely(r))
 		 goto clean;
 
-	if (0)
-		r = tfw_h2_resp_next_hdr(resp, h_mods);
-
 	r = tfw_h2_hpack_encode_headers(resp, h_mods);
 	if (unlikely(r))
 		goto clean;
diff --git a/fw/http.h b/fw/http.h
@@ -487,22 +487,6 @@ struct tfw_http_req_t {
 #define TFW_IDX_BITS		12
 #define TFW_D_IDX_BITS		4
 
-/**
- * Representation of operation with the next header (in order of headers in the
- * message) during HTTP/1.1=>HTTP/2 transformation process.
- *
- * @s_hdr	- source header for transformation;
- * @off		- offset of not copied data from last processed @chunk;
- * @chunk	- last chunk to be processed from @s_hdr;
- * @op		- transformation operation which should be executed.
- */
-typedef struct {
-	TfwStr		s_hdr;
-	unsigned long	off;
-	unsigned int	chunk;
-	TfwH2TransOp	op;
-} TfwNextHdrOp;
-
 /**
  * The indirection map entry.
  *
@@ -552,11 +536,8 @@ typedef struct {
 typedef struct {
 	TfwHttpHdrMap	*map;
 	unsigned int	start_off;
-	unsigned int	curr;
-	TfwNextHdrOp	next;
 	DECLARE_BITMAP	(found, TFW_USRHDRS_ARRAY_SZ);
 	char		*curr_ptr;
-	char		*bnd;
 	char		*frame_head;
 	TfwMsgIter	iter;
 	unsigned long	acc_len;
diff --git a/fw/http_msg.c b/fw/http_msg.c
@@ -1573,118 +1573,6 @@ tfw_h2_msg_cutoff_headers(TfwHttpResp *resp, TfwHttpRespCleanup* cleanup)
 	it->frag = -1;
 }
 
-static int
-tfw_h2_msg_rewrite_data_common(TfwHttpTransIter *mit, const TfwStr *str,
-			       const char *stop,
-			       void cpy(void *dest, const void *src, size_t n))
-{
-	const TfwStr *c, *end;
-	TfwMsgIter *it = &mit->iter;
-	TfwNextHdrOp *next = &mit->next;
-
-	BUG_ON(!stop);
-	BUG_ON(TFW_STR_DUP(str));
-
-	TFW_STR_FOR_EACH_CHUNK(c, str, end) {
-		const char *addr, *next_ptr;
-		long offset, stop_offset;
-		unsigned int c_off = 0, f_size, c_size, f_room, n_copy;
-this_chunk:
-		c_size = c->len - c_off;
-		if (it->frag >= 0) {
-			skb_frag_t *frag = &skb_shinfo(it->skb)->frags[it->frag];
-
-			f_size = skb_frag_size(frag);
-			addr = skb_frag_address(frag);
-		} else {
-			f_size = skb_headlen(it->skb);
-			addr = it->skb->data;
-		}
-
-		offset = mit->curr_ptr - addr;
-		if (WARN_ON_ONCE(offset < 0 || offset >= f_size))
-			return -EINVAL;
-
-		f_room = f_size - offset;
-		n_copy = min(c_size, f_room);
-		next_ptr = mit->curr_ptr + n_copy;
-
-		/*
-		 * If the stop mark is met, we should verify that all the data
-		 * will be copied from @str; if not, save offsets for not copied
-		 * data from current @str (for subsequent copying after more
-		 * space allocation) and exit with corresponding error code.
-		 */
-		stop_offset = stop - addr;
-		if (stop_offset >= 0 && stop_offset < f_size
-		    && (next_ptr > stop
-			|| (next_ptr == stop
-			    && (c_size > f_room || c + 1 < end))))
-		{
-			WARN_ON_ONCE(next->chunk || next->off);
-			next->chunk = TFW_STR_PLAIN(str) ? 0 : c - str->chunks;
-			next->off = c_off;
-
-			T_WARN("Unable to transform HTTP/1.1 data into HTTP/2"
-			       " format: free space exhausted (accumulated"
-			       " length: %lu\n", mit->acc_len);
-
-			return -ENOSPC;
-		}
-		cpy(mit->curr_ptr, c->data + c_off, n_copy);
-
-		T_DBG3("%s: acc_len=%lu, n_copy=%u, mit->curr_ptr='%.*s',"
-		       " ptr_diff=%ld\n", __func__, mit->acc_len, n_copy,
-		       n_copy, mit->curr_ptr, stop - mit->curr_ptr);
-
-		mit->curr_ptr += n_copy;
-		mit->acc_len += n_copy;
-
-		/*
-		 * The fragment is exhausted. Move to the next fragment (or skb)
-		 * and reset the @mit->curr_ptr pointer.
-		 */
-		if (c_size >= f_room) {
-			if (skb_shinfo(it->skb)->nr_frags > it->frag + 1) {
-				skb_frag_t *frag;
-
-				++it->frag;
-				frag = &skb_shinfo(it->skb)->frags[it->frag];
-				mit->curr_ptr = skb_frag_address(frag);
-			}
-			else {
-				if (it->skb_head == it->skb->next
-				    && (c_size != f_room || c + 1 < end))
-					return -ENOSPC;
-
-				tfw_h2_msg_transform_setup(mit, it->skb->next,
-							   false);
-			}
-
-			if (c_size != f_room) {
-				c_off += n_copy;
-				goto this_chunk;
-			}
-		}
-	}
-
-	return 0;
-}
-
-int
-tfw_h2_msg_rewrite_data(TfwHttpTransIter *mit, const TfwStr *str,
-			const char *stop)
-{
-	return tfw_h2_msg_rewrite_data_common(mit, str, stop, memcpy_fast);
-}
-
-int
-tfw_h2_msg_rewrite_data_lc(TfwHttpTransIter *mit, const TfwStr *str,
-			   const char *stop)
-{
-	return tfw_h2_msg_rewrite_data_common(mit, str, stop, tfw_cstrtolower);
-}
-
 /**
  * Insert data from string @data to message at offset defined by message
  * iterator @it and @off. This function doesn't maintain message structure.
diff --git a/fw/ss_skb.c b/fw/ss_skb.c
