From 491cec20be7cd79355f970154341f1e2bb07be9b Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 2 Oct 2018 18:37:27 +0200 Subject: [PATCH] CLEANUP: http: remove some leftovers from recent cleanups The prototypes of functions find_hdr_value_end(), extract_cookie_value() and http_header_match2() were still in proto_http.h while some of them don't exist anymore and the others were just moved. Let's remove them. In addition, da.c was updated to use http_extract_cookie_value() which is the correct one. --- include/proto/proto_http.h | 4 ---- src/da.c | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/proto/proto_http.h b/include/proto/proto_http.h index daa72bb63..1829c6830 100644 --- a/include/proto/proto_http.h +++ b/include/proto/proto_http.h @@ -82,10 +82,6 @@ int http_find_header2(const char *name, int len, struct hdr_ctx *ctx); int http_find_next_header(char *sol, struct hdr_idx *idx, struct hdr_ctx *ctx); -char *find_hdr_value_end(char *s, const char *e); -char *extract_cookie_value(char *hdr, const char *hdr_end, char *cookie_name, - size_t cookie_name_l, int list, char **value, size_t *value_l); -int http_header_match2(const char *hdr, const char *end, const char *name, int len); int http_remove_header2(struct http_msg *msg, struct hdr_idx *idx, struct hdr_ctx *ctx); int http_header_add_tail2(struct http_msg *msg, struct hdr_idx *hdr_idx, const char *text, int len); int http_replace_req_line(int action, const char *replace, int len, struct proxy *px, struct stream *s); diff --git a/src/da.c b/src/da.c index c65384812..990267a3c 100644 --- a/src/da.c +++ b/src/da.c @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -335,7 +336,7 @@ static int da_haproxy_fetch(const struct arg *args, struct sample *smp, const ch * The cookie value, if it exists, is located between the current header's * value position and the next one */ - if (extract_cookie_value(pval, eval, global_deviceatlas.cookiename, + if (http_extract_cookie_value(pval, eval, global_deviceatlas.cookiename, global_deviceatlas.cookienamelen, 1, &p, &pl) == NULL) { continue; }