From 6131d6a73186161bd52e04bda64c82f3d9ac098d Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Tue, 2 Jun 2020 16:48:09 +0200
Subject: [PATCH] REORG: include: move common/net_helper.h to
 haproxy/net_helper.h

No change was necessary.
---
 include/{common => haproxy}/net_helper.h | 12 ++++++------
 src/cache.c                              |  2 +-
 src/connection.c                         |  2 +-
 src/debug.c                              |  2 +-
 src/dns.c                                |  2 +-
 src/haproxy.c                            |  2 +-
 src/hlua_fcn.c                           |  2 +-
 src/http_ana.c                           |  2 +-
 src/mux_fcgi.c                           |  2 +-
 src/mux_h2.c                             |  2 +-
 src/pattern.c                            |  2 +-
 src/payload.c                            |  2 +-
 src/peers.c                              |  2 +-
 src/sample.c                             |  2 +-
 src/stick_table.c                        |  2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)
 rename include/{common => haproxy}/net_helper.h (98%)

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 5911ca4da..8b9f68b40 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 c4177f74f..51e0d866d 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 adca5c14e..a74585a15 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 4017232ce..5b25ab757 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 73258c0ec..20ccc6dee 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 f178e51f6..8e5342043 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 da975c075..3f833a0c0 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 41f119de0..2c44a481b 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 87c84fb1a..d8b38215e 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 7050469a7..fb4997c8b 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 25c3d1050..b948c6f39 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 3b8eaeb5e..ca9c9d715 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 5f4dce3cb..882f34ab9 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 23cd3ab8e..9470a8bc6 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 bd7f97f10..fcbd58781 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>