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

No change was necessary.

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 */

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) */

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>

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>

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>

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>

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>
 

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>

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>

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>

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>

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>

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>

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>

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>