REORG: include: move common/net_helper.h to haproxy/net_helper.h

No change was necessary.

diff --git a/include/common/net_helper.h b/include/haproxy/net_helper.h
similarity index 98%
rename from include/common/net_helper.h
rename to include/haproxy/net_helper.h
index 5911ca4da81c43adf9e7f603e9157a2ff69d1023..8b9f68b40704a18390f70241fad083c0e476499e 100644 (file)
--- a/include/common/net_helper.h
+++ b/include/haproxy/net_helper.h
@@ -1,9 +1,9 @@
 /*
- * include/common/net_helper.h
+ * include/haproxy/net_helper.h
  * This file contains miscellaneous network helper functions.
  *
  * Copyright (C) 2017 Olivier Houchard
- * Copyright (C) 2017 Willy Tarreau
+ * Copyright (C) 2017-2020 Willy Tarreau
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,12 +24,12 @@
  * SOFTWARE.
  */
 
-#ifndef _COMMON_NET_HELPER_H
-#define _COMMON_NET_HELPER_H
+#ifndef _HAPROXY_NET_HELPER_H
+#define _HAPROXY_NET_HELPER_H
 
+#include <arpa/inet.h>
 #include <haproxy/api.h>
 #include <haproxy/intops.h>
-#include <arpa/inet.h>
 
 /* Functions to read/write various integers that may be unaligned */
 
@@ -368,4 +368,4 @@ static inline void writev_n64(void *p1, size_t s1, void *p2, const uint64_t u64)
        writev_u64(p1, s1, p2, my_htonll(u64));
 }
 
-#endif /* COMMON_NET_HELPER_H */
+#endif /* HAPROXY_NET_HELPER_H */

diff --git a/src/cache.c b/src/cache.c
index c4177f74fe2c18858d376b04707281c6e9cccba1..51e0d866deece260d4d68d0403304581d433629a 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -36,7 +36,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/hash.h>
 #include <common/htx.h>
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 
 #define CACHE_FLT_F_IMPLICIT_DECL  0x00000001 /* The cache filtre was implicitly declared (ie without
                                               * the filter keyword) */

diff --git a/src/connection.c b/src/connection.c
index adca5c14e3fc27c28c1d3e9af2df3c36de0b0cdd..a74585a1578733eac216800659e1fb1e39e6fdea 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -16,7 +16,7 @@
 #include <common/cfgparse.h>
 #include <common/namespace.h>
 #include <haproxy/hash.h>
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 
 #include <proto/connection.h>
 #include <proto/fd.h>

diff --git a/src/debug.c b/src/debug.c
index 4017232cebffc1dcf95897d78afb4f4e1421b3d8..5b25ab757670f1702f2bf86cb3e1fa55ea8baf44 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -24,7 +24,7 @@
 #include <haproxy/debug.h>
 #include <haproxy/thread.h>
 #include <import/ist.h>
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 #include <common/standard.h>
 
 #include <types/global.h>

diff --git a/src/dns.c b/src/dns.c
index 73258c0eccd08a803622102604e43f7788fe4704..20ccc6dee2b700e712938072324beb0684615636 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -24,7 +24,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/time.h>
 #include <common/ticks.h>
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 
 #include <types/action.h>
 #include <types/applet.h>

diff --git a/src/haproxy.c b/src/haproxy.c
index f178e51f65ad0e98c538787c8662843f2c7331c2..8e5342043f7ec0b665e83a831dd9d912b87f2346 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -89,7 +89,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <common/namespace.h>
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 #include <haproxy/openssl-compat.h>
 #include <common/regex.h>
 #include <common/standard.h>

diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c
index da975c0752286b5414787c5f1cf114ec01db2bcc..3f833a0c0a8da6f404eecb2502c95b9fc0f1c50f 100644 (file)
--- a/src/hlua_fcn.c
+++ b/src/hlua_fcn.c
@@ -18,7 +18,7 @@
 #include <lua.h>
 #include <lualib.h>
 
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 #include <haproxy/time.h>
 #include <common/uri_auth.h>
 

diff --git a/src/http_ana.c b/src/http_ana.c
index 41f119de05a44d22f7cb7775ed6f711cc71ac965..2c44a481baf7dee407d4dc0b30ef84b22b5ad5ef 100644 (file)
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -13,7 +13,7 @@
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
 #include <common/htx.h>
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 #include <common/uri_auth.h>
 
 #include <types/capture.h>

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 87c84fb1adc554dc6f7c5f6ec379213affa3e4f3..d8b38215eb400dfac4f33ac8dd6333de8c9bc521 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -17,7 +17,7 @@
 #include <common/htx.h>
 #include <import/ist.h>
 #include <haproxy/list.h>
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 
 #include <types/proxy.h>
 #include <types/session.h>

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 7050469a7efdf3d64e8a298d7084e82822c4e795..fb4997c8b8a37d53d6e2a31497c5506857477db5 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -19,7 +19,7 @@
 #include <common/hpack-enc.h>
 #include <common/hpack-tbl.h>
 #include <common/htx.h>
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 #include <proto/connection.h>
 #include <proto/http_htx.h>
 #include <proto/trace.h>

diff --git a/src/pattern.c b/src/pattern.c
index 25c3d1050199bb285003621825425d2643a1523e..b948c6f3938c2869d8a22b9f43ea21ad587114f6 100644 (file)
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -15,7 +15,7 @@
 #include <errno.h>
 
 #include <haproxy/api.h>
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 #include <common/standard.h>
 
 #include <types/global.h>

diff --git a/src/payload.c b/src/payload.c
index 3b8eaeb5e9d4b4439110b88c311a2c6f8bd4840e..ca9c9d715bb5a03d191dbd8a62cecce2964ac7da 100644 (file)
--- a/src/payload.c
+++ b/src/payload.c
@@ -14,7 +14,7 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 #include <common/htx.h>
 #include <proto/acl.h>
 #include <proto/arg.h>

diff --git a/src/peers.c b/src/peers.c
index 5f4dce3cbd3b5322b852dcf3e79caf61bcb83afe..882f34ab9fd442593ef61344f75ad00656aabb68 100644 (file)
--- a/src/peers.c
+++ b/src/peers.c
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 
 #include <haproxy/api.h>
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 #include <haproxy/time.h>
 #include <common/standard.h>
 #include <haproxy/thread.h>

diff --git a/src/sample.c b/src/sample.c
index 23cd3ab8e74326320de6ebfd524f98b1d9d44108..9470a8bc6e5e0ebec558f9495b3661eb7431aa8e 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -22,7 +22,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/hash.h>
 #include <common/http.h>
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 #include <common/standard.h>
 #include <common/uri_auth.h>
 #include <haproxy/base64.h>

diff --git a/src/stick_table.c b/src/stick_table.c
index bd7f97f10d08fabcde9e50de16c516503df18333..fcbd5878106925eba1f9ef94828dcb9ce4e5d9fc 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -18,7 +18,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
-#include <common/net_helper.h>
+#include <haproxy/net_helper.h>
 #include <common/standard.h>
 #include <haproxy/time.h>