REORG: include: move common/namespace.h to haproxy/namespace{,-t}.h
The type was moved out as it's used by standard.h for netns_entry.
Instead of just being a forward declaration when not used, it's an
empty struct, which makes gdb happier (the resulting stripped executable
is the same).
diff --git a/include/common/namespace.h b/include/common/namespace.h
deleted file mode 100644
index 596aac3..0000000
--- a/include/common/namespace.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _NAMESPACE_H
-#define _NAMESPACE_H
-
-#include <stdlib.h>
-#include <import/ebistree.h>
-
-#ifdef USE_NS
-
-struct netns_entry
-{
- struct ebpt_node node;
- size_t name_len;
- int fd;
-};
-
-int my_socketat(const struct netns_entry *ns, int domain, int type, int protocol);
-struct netns_entry* netns_store_insert(const char *ns_name);
-const struct netns_entry* netns_store_lookup(const char *ns_name, size_t ns_name_len);
-
-int netns_init(void);
-
-#else /* no namespace support */
-
-struct netns_entry;
-
-static inline int my_socketat(const struct netns_entry *ns, int domain, int type, int protocol)
-{
- return socket(domain, type, protocol);
-}
-
-#endif /* USE_NS */
-
-#endif /* _NAMESPACE_H */
diff --git a/include/common/standard.h b/include/common/standard.h
index d2231d8..fdaa2a8 100644
--- a/include/common/standard.h
+++ b/include/common/standard.h
@@ -40,7 +40,7 @@
#include <haproxy/api.h>
#include <haproxy/intops.h>
#include <haproxy/chunk.h>
-#include <common/namespace.h>
+#include <haproxy/namespace-t.h>
#include <import/eb32tree.h>
#include <import/eb32sctree.h>
#include <types/protocol.h>
diff --git a/include/haproxy/namespace-t.h b/include/haproxy/namespace-t.h
new file mode 100644
index 0000000..3a97336
--- /dev/null
+++ b/include/haproxy/namespace-t.h
@@ -0,0 +1,39 @@
+/*
+ * include/haproxy/namespace-t.h
+ * Linux network namespaces types definitions
+ *
+ * Copyright (C) 2014 Tamas Kovacs, Sarkozi Laszlo, Krisztian Kovacs
+ * Copyright (C) 2015-2020 Willy Tarreau
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, version 2.1
+ * exclusively.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef _HAPROXY_NAMESPACE_T_H
+#define _HAPROXY_NAMESPACE_T_H
+
+#include <stddef.h>
+#include <import/ebpttree.h>
+
+/* the struct is just empty if namespaces are not supported */
+struct netns_entry
+{
+#ifdef USE_NS
+ struct ebpt_node node;
+ size_t name_len;
+ int fd;
+#endif
+};
+
+#endif /* _HAPROXY_NAMESPACE_T_H */
diff --git a/include/haproxy/namespace.h b/include/haproxy/namespace.h
new file mode 100644
index 0000000..ad52cb1
--- /dev/null
+++ b/include/haproxy/namespace.h
@@ -0,0 +1,47 @@
+/*
+ * include/haproxy/namespace.h
+ * Linux network namespaces management
+ *
+ * Copyright (C) 2014 Tamas Kovacs, Sarkozi Laszlo, Krisztian Kovacs
+ * Copyright (C) 2015-2020 Willy Tarreau
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, version 2.1
+ * exclusively.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef _HAPROXY_NAMESPACE_H
+#define _HAPROXY_NAMESPACE_H
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <haproxy/namespace-t.h>
+#include <import/ebistree.h>
+
+#ifdef USE_NS
+
+int my_socketat(const struct netns_entry *ns, int domain, int type, int protocol);
+struct netns_entry* netns_store_insert(const char *ns_name);
+const struct netns_entry* netns_store_lookup(const char *ns_name, size_t ns_name_len);
+int netns_init(void);
+
+#else /* no namespace support */
+
+static inline int my_socketat(const struct netns_entry *ns, int domain, int type, int protocol)
+{
+ return socket(domain, type, protocol);
+}
+
+#endif /* USE_NS */
+
+#endif /* _HAPROXY_NAMESPACE_H */
diff --git a/src/backend.c b/src/backend.c
index c9abbc7..9f87a3c 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -24,7 +24,7 @@
#include <common/htx.h>
#include <common/ticks.h>
#include <haproxy/time.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
#include <types/global.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 205f4fb..8cdfb15 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -41,7 +41,7 @@
#include <common/standard.h>
#include <haproxy/time.h>
#include <common/uri_auth.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
#include <haproxy/thread.h>
#include <types/capture.h>
diff --git a/src/connection.c b/src/connection.c
index a74585a..688be9a 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -14,7 +14,7 @@
#include <haproxy/api.h>
#include <common/cfgparse.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
#include <haproxy/hash.h>
#include <haproxy/net_helper.h>
diff --git a/src/filters.c b/src/filters.c
index 1b71573..50d1c8a 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -15,7 +15,7 @@
#include <common/cfgparse.h>
#include <haproxy/errors.h>
#include <common/htx.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
#include <common/standard.h>
#include <types/filters.h>
diff --git a/src/haproxy.c b/src/haproxy.c
index 8e53420..36f6694 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -88,7 +88,7 @@
#include <haproxy/errors.h>
#include <haproxy/pool.h>
#include <haproxy/list.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
#include <haproxy/net_helper.h>
#include <haproxy/openssl-compat.h>
#include <common/regex.h>
diff --git a/src/namespace.c b/src/namespace.c
index 6165994..4f82c62 100644
--- a/src/namespace.c
+++ b/src/namespace.c
@@ -11,7 +11,7 @@
#include <string.h>
#include <haproxy/api.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
#include <haproxy/hash.h>
#include <haproxy/errors.h>
#include <proto/log.h>
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 9d87515..973a4d3 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -34,7 +34,7 @@
#include <haproxy/errors.h>
#include <haproxy/list.h>
#include <common/standard.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
#include <types/action.h>
#include <types/connection.h>
diff --git a/src/server.c b/src/server.c
index d06c465..29919ee 100644
--- a/src/server.c
+++ b/src/server.c
@@ -19,7 +19,7 @@
#include <common/cfgparse.h>
#include <haproxy/errors.h>
-#include <common/namespace.h>
+#include <haproxy/namespace.h>
#include <haproxy/time.h>
#include <types/applet.h>
diff --git a/src/standard.c b/src/standard.c
index 2b32429..8e9722e 100644
--- a/src/standard.c
+++ b/src/standard.c
@@ -38,6 +38,7 @@
#include <haproxy/api.h>
#include <haproxy/chunk.h>
+#include <haproxy/namespace.h>
#include <common/standard.h>
#include <types/global.h>
#include <proto/applet.h>