From: Willy Tarreau <w@1wt.eu>
Date: Tue, 2 Jun 2020 14:48:09 +0000 (+0200)
Subject: REORG: include: move common/net_helper.h to haproxy/net_helper.h
X-Git-Tag: v2.2-dev9~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6131d6a73186161bd52e04bda64c82f3d9ac098d;p=thirdparty%2Fhaproxy.git

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 5911ca4da8..8b9f68b407 100644
--- 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 c4177f74fe..51e0d866de 100644
--- 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 adca5c14e3..a74585a157 100644
--- 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 4017232ceb..5b25ab7576 100644
--- 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 73258c0ecc..20ccc6dee2 100644
--- 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 f178e51f65..8e5342043f 100644
--- 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 da975c0752..3f833a0c0a 100644
--- 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 41f119de05..2c44a481ba 100644
--- 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 87c84fb1ad..d8b38215eb 100644
--- 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 7050469a7e..fb4997c8b8 100644
--- 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 25c3d10501..b948c6f393 100644
--- 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 3b8eaeb5e9..ca9c9d715b 100644
--- 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 5f4dce3cbd..882f34ab9f 100644
--- 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 23cd3ab8e7..9470a8bc6e 100644
--- 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 bd7f97f10d..fcbd587810 100644
--- 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>