[MAJOR] last bunch of capture changes for mempool v2
The header captures had lots of pools. They have all been transformed.
diff --git a/include/common/memory.h b/include/common/memory.h
index c50ab9a..45ac7f9 100644
--- a/include/common/memory.h
+++ b/include/common/memory.h
@@ -27,7 +27,6 @@
#include <common/config.h>
#include <common/mini-clist.h>
-#define sizeof_capture CAPTURE_LEN
/*
* Returns a pointer to an area of <__len> bytes taken from the pool <pool> or
* dynamically allocated. In the first case, <__pool> is updated to point to
diff --git a/include/types/capture.h b/include/types/capture.h
index 49f4d53..e37cc48 100644
--- a/include/types/capture.h
+++ b/include/types/capture.h
@@ -31,7 +31,7 @@
int namelen; /* length of the header name, to speed-up lookups */
int len; /* capture length, not including terminal zero */
int index; /* index in the output array */
- void *pool; /* pool of pre-allocated memory area of (len+1) bytes */
+ struct pool_head *pool; /* pool of pre-allocated memory area of (len+1) bytes */
};
extern struct pool_head *pool2_capture;
diff --git a/include/types/proxy.h b/include/types/proxy.h
index 532348e..9be81d5 100644
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -140,7 +140,8 @@
int nb_req_cap, nb_rsp_cap; /* # of headers to be captured */
struct cap_hdr *req_cap; /* chained list of request headers to be captured */
struct cap_hdr *rsp_cap; /* chained list of response headers to be captured */
- void *req_cap_pool, *rsp_cap_pool; /* pools of pre-allocated char ** used to build the sessions */
+ struct pool_head *req_cap_pool, /* pools of pre-allocated char ** used to build the sessions */
+ *rsp_cap_pool;
void *hdr_idx_pool; /* pools of pre-allocated int* used for headers indexing */
char *req_add[MAX_NEWHDR], *rsp_add[MAX_NEWHDR]; /* headers to be added */
int grace; /* grace time after stop request */