Fix portability issues in new src/port/inet_net_ntop.c file.

1. Don't #include postgres.h in a frontend build.

2. Don't assume that the backend's symbol PGSQL_AF_INET6 has anything to do
with the constant that will be used by system library functions (because,
in point of fact, it usually doesn't).  Fortunately, PGSQL_AF_INET is equal
to AF_INET, so we can just cater for both sets of values in one case
construct without fear of conflict.

diff --git a/src/port/inet_net_ntop.c b/src/port/inet_net_ntop.c
index 02d3a7cea5506e0fdc59b4d23c96868bd86f462e..7ed3867c051db2fd1b13252a5b1fe52f94182b71 100644 (file)
--- a/src/port/inet_net_ntop.c
+++ b/src/port/inet_net_ntop.c
@@ -21,14 +21,28 @@
 static const char rcsid[] = "Id: inet_net_ntop.c,v 1.1.2.2 2004/03/09 09:17:27 marka Exp $";
 #endif
 
+#ifndef FRONTEND
 #include "postgres.h"
+#else
+#include "postgres_fe.h"
+#endif
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#ifndef FRONTEND
 #include "utils/inet.h"
+#else
+/*
+ * In a frontend build, we can't include inet.h, but we still need to have
+ * sensible definitions of these two constants.  Note that inet_net_ntop()
+ * assumes that PGSQL_AF_INET is equal to AF_INET.
+ */
+#define PGSQL_AF_INET  (AF_INET + 0)
+#define PGSQL_AF_INET6 (AF_INET + 1)
+#endif
 
 
 #define NS_IN6ADDRSZ 16
@@ -63,11 +77,21 @@ static char *inet_net_ntop_ipv6(const u_char *src, int bits,
 char *
 inet_net_ntop(int af, const void *src, int bits, char *dst, size_t size)
 {
+       /*
+        * We need to cover both the address family constants used by the PG
+        * inet type (PGSQL_AF_INET and PGSQL_AF_INET6) and those used by the
+        * system libraries (AF_INET and AF_INET6).  We can safely assume
+        * PGSQL_AF_INET == AF_INET, but the INET6 constants are very likely
+        * to be different.  If AF_INET6 isn't defined, silently ignore it.
+        */
        switch (af)
        {
                case PGSQL_AF_INET:
                        return (inet_net_ntop_ipv4(src, bits, dst, size));
                case PGSQL_AF_INET6:
+#if defined(AF_INET6) && AF_INET6 != PGSQL_AF_INET6
+               case AF_INET6:
+#endif
                        return (inet_net_ntop_ipv6(src, bits, dst, size));
                default:
                        errno = EAFNOSUPPORT;
@@ -272,4 +296,3 @@ inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
        strcpy(dst, tmp);
        return (dst);
 }
-