REORG: include: split common/http-hdr.h into haproxy/http-hdr{,-t}.h

There's only one struct and 2 inline functions. It could have been
merged into http.h but that would have added a massive dependency on
the hpack parts for nothing, so better keep it this way since hpack
is already freestanding and portable.

diff --git a/include/common/h1.h b/include/common/h1.h
index 7c341fe931373eeba0ebf95da98d7fafeb533b05..879e041d07c546b63c98728a772a0b0bcc6d9614 100644 (file)
--- a/include/common/h1.h
+++ b/include/common/h1.h
@@ -26,7 +26,7 @@
 #include <haproxy/dynbuf.h>
 #include <haproxy/intops.h>
 #include <haproxy/http.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr-t.h>
 #include <import/ist.h>
 
 

diff --git a/include/common/h2.h b/include/common/h2.h
index 32f02060aefd239de292f662616848899eb35492..42c3c5a01d323f9b018c51e79c465294b0e04ff7 100644 (file)
--- a/include/common/h2.h
+++ b/include/common/h2.h
@@ -30,7 +30,7 @@
 #define _COMMON_H2_H
 
 #include <haproxy/api.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr-t.h>
 #include <common/htx.h>
 #include <import/ist.h>
 

diff --git a/include/common/hpack-tbl.h b/include/common/hpack-tbl.h
index 07e0a9fa30354d551681794e7a97225967b6983e..b0ab4ff4feb10807361dedee073e372673d5cd2c 100644 (file)
--- a/include/common/hpack-tbl.h
+++ b/include/common/hpack-tbl.h
@@ -29,7 +29,7 @@
 
 #include <stdlib.h>
 #include <haproxy/api.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr-t.h>
 #include <import/ist.h>
 #include <haproxy/pool.h>
 

diff --git a/include/common/htx.h b/include/common/htx.h
index 3c3ac0bf3b26ea6bd9e3148ce0eb7e0d1f9db1f4..1b111a40e7040044514758b06acd208f447a316d 100644 (file)
--- a/include/common/htx.h
+++ b/include/common/htx.h
@@ -28,7 +28,7 @@
 #include <import/ist.h>
 #include <haproxy/chunk.h>
 #include <haproxy/http-t.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr-t.h>
 
 /*
  * The internal representation of an HTTP message, called HTX, is a structure

diff --git a/include/haproxy/http-hdr-t.h b/include/haproxy/http-hdr-t.h
new file mode 100644 (file)
index 0000000..3534f43
--- /dev/null
+++ b/include/haproxy/http-hdr-t.h
@@ -0,0 +1,41 @@
+/*
+ * include/haproxy/http-hdr-t.h
+ * HTTP header management (new model) - type definitions
+ *
+ * Copyright (C) 2014-2020 Willy Tarreau <willy@haproxy.org>
+ * Copyright (C) 2017 HAProxy Technologies
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef _HAPROXY_HTTP_HDR_T_H
+#define _HAPROXY_HTTP_HDR_T_H
+
+#include <import/ist.h>
+
+/* a header field made of a name and a value. Such structure stores 4 longs so
+ * it takes 16 bytes on 32-bit systems and 32 bytes on 64-bit systems.
+ */
+struct http_hdr {
+       struct ist n; /* name */
+       struct ist v; /* value */
+};
+
+#endif /* _HAPROXY_HTTP_HDR_T_H */

diff --git a/include/common/http-hdr.h b/include/haproxy/http-hdr.h
similarity index 82%
rename from include/common/http-hdr.h
rename to include/haproxy/http-hdr.h
index 77997e33e15e623e1fff42f1f0ca550e0582f940..e9e253b5286781a5af34763bee0b1059ea92bf0c 100644 (file)
--- a/include/common/http-hdr.h
+++ b/include/haproxy/http-hdr.h
@@ -1,5 +1,6 @@
 /*
- * HTTP header management (new model) - type definitions
+ * include/haproxy/http-hdr.h
+ * HTTP header management (new model) - functions
  *
  * Copyright (C) 2014-2017 Willy Tarreau <willy@haproxy.org>
  * Copyright (C) 2017 HAProxy Technologies
@@ -24,19 +25,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef _COMMON_HTTP_HDR_H
-#define _COMMON_HTTP_HDR_H
+#ifndef _HAPROXY_HTTP_HDR_H
+#define _HAPROXY_HTTP_HDR_H
 
-#include <inttypes.h>
 #include <import/ist.h>
-
-/* a header field made of a name and a value. Such structure stores 4 longs so
- * it takes 16 bytes on 32-bit systems and 32 bytes on 64-bit systems.
- */
-struct http_hdr {
-       struct ist n; /* name */
-       struct ist v; /* value */
-};
+#include <haproxy/http-hdr-t.h>
 
 /* sets an http_hdr <hdr> to name <n> and value <v>. Useful to avoid casts in
  * immediate assignments.
@@ -64,4 +57,4 @@ static inline int http_del_hdr(struct http_hdr *hdr, const struct ist n)
 
        return dst;
 }
-#endif /* _COMMON_HTTP_HDR_H */
+#endif /* _HAPROXY_HTTP_HDR_H */

diff --git a/src/h1.c b/src/h1.c
index f30e4891f03734d87b91d8539741696454ad3c0a..f143db9c3b8bef118dd61f25abdb461829963219 100644 (file)
--- a/src/h1.c
+++ b/src/h1.c
@@ -13,7 +13,7 @@
 #include <ctype.h>
 #include <haproxy/api.h>
 #include <common/h1.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr.h>
 
 #include <proto/channel.h>
 

diff --git a/src/h2.c b/src/h2.c
index fa72e1c902bee272d4eeb6928d08f1654856f2a1..c59c3f2a50b5ed8f6a79ab676071bafc9b2390bd 100644 (file)
--- a/src/h2.c
+++ b/src/h2.c
@@ -29,7 +29,7 @@
 #include <haproxy/api.h>
 #include <haproxy/http.h>
 #include <common/h2.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr-t.h>
 #include <import/ist.h>
 #include <types/global.h>
 

diff --git a/src/hpack-enc.c b/src/hpack-enc.c
index bf7336b08f5201c2cb0b9878a35adb889d34e447..21e28f65444122e4f7c0124baa3e287e188a38fa 100644 (file)
--- a/src/hpack-enc.c
+++ b/src/hpack-enc.c
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include <common/hpack-enc.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr-t.h>
 #include <import/ist.h>
 
 #include <types/global.h>