aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/libpq/auth.c21
-rw-r--r--src/backend/libpq/hba.c5
-rw-r--r--src/backend/libpq/ifaddr.c18
-rw-r--r--src/backend/libpq/pqcomm.c2
-rw-r--r--src/backend/utils/adt/network.c10
-rw-r--r--src/backend/utils/adt/pgstatfuncs.c11
-rw-r--r--src/bin/initdb/initdb.c10
-rw-r--r--src/include/pg_config.h.in3
-rw-r--r--src/include/utils/inet.h4
-rw-r--r--src/interfaces/libpq/fe-connect.c2
-rw-r--r--src/port/inet_net_ntop.c5
-rw-r--r--src/tools/ifaddrs/test_ifaddrs.c2
-rw-r--r--src/tools/msvc/Solution.pm1
13 files changed, 7 insertions, 87 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 10cd19e6cd9..b2b0b83a97b 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -3015,13 +3015,8 @@ PerformRadiusTransaction(const char *server, const char *secret, const char *por
int packetlength;
pgsocket sock;
-#ifdef HAVE_IPV6
struct sockaddr_in6 localaddr;
struct sockaddr_in6 remoteaddr;
-#else
- struct sockaddr_in localaddr;
- struct sockaddr_in remoteaddr;
-#endif
struct addrinfo hint;
struct addrinfo *serveraddrs;
int port;
@@ -3131,18 +3126,12 @@ PerformRadiusTransaction(const char *server, const char *secret, const char *por
}
memset(&localaddr, 0, sizeof(localaddr));
-#ifdef HAVE_IPV6
localaddr.sin6_family = serveraddrs[0].ai_family;
localaddr.sin6_addr = in6addr_any;
if (localaddr.sin6_family == AF_INET6)
addrsize = sizeof(struct sockaddr_in6);
else
addrsize = sizeof(struct sockaddr_in);
-#else
- localaddr.sin_family = serveraddrs[0].ai_family;
- localaddr.sin_addr.s_addr = INADDR_ANY;
- addrsize = sizeof(struct sockaddr_in);
-#endif
if (bind(sock, (struct sockaddr *) &localaddr, addrsize))
{
@@ -3245,21 +3234,11 @@ PerformRadiusTransaction(const char *server, const char *secret, const char *por
return STATUS_ERROR;
}
-#ifdef HAVE_IPV6
if (remoteaddr.sin6_port != pg_hton16(port))
-#else
- if (remoteaddr.sin_port != pg_hton16(port))
-#endif
{
-#ifdef HAVE_IPV6
ereport(LOG,
(errmsg("RADIUS response from %s was sent from incorrect port: %d",
server, pg_ntoh16(remoteaddr.sin6_port))));
-#else
- ereport(LOG,
- (errmsg("RADIUS response from %s was sent from incorrect port: %d",
- server, pg_ntoh16(remoteaddr.sin_port))));
-#endif
continue;
}
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 1447588c4ae..8f2b8c6b03a 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -645,8 +645,6 @@ ipv4eq(struct sockaddr_in *a, struct sockaddr_in *b)
return (a->sin_addr.s_addr == b->sin_addr.s_addr);
}
-#ifdef HAVE_IPV6
-
static bool
ipv6eq(struct sockaddr_in6 *a, struct sockaddr_in6 *b)
{
@@ -658,7 +656,6 @@ ipv6eq(struct sockaddr_in6 *a, struct sockaddr_in6 *b)
return true;
}
-#endif /* HAVE_IPV6 */
/*
* Check whether host name matches pattern.
@@ -747,7 +744,6 @@ check_hostname(hbaPort *port, const char *hostname)
break;
}
}
-#ifdef HAVE_IPV6
else if (gai->ai_addr->sa_family == AF_INET6)
{
if (ipv6eq((struct sockaddr_in6 *) gai->ai_addr,
@@ -757,7 +753,6 @@ check_hostname(hbaPort *port, const char *hostname)
break;
}
}
-#endif
}
}
diff --git a/src/backend/libpq/ifaddr.c b/src/backend/libpq/ifaddr.c
index de35fbba455..ff9dadfb379 100644
--- a/src/backend/libpq/ifaddr.c
+++ b/src/backend/libpq/ifaddr.c
@@ -34,11 +34,9 @@ static int range_sockaddr_AF_INET(const struct sockaddr_in *addr,
const struct sockaddr_in *netaddr,
const struct sockaddr_in *netmask);
-#ifdef HAVE_IPV6
static int range_sockaddr_AF_INET6(const struct sockaddr_in6 *addr,
const struct sockaddr_in6 *netaddr,
const struct sockaddr_in6 *netmask);
-#endif
/*
@@ -56,12 +54,10 @@ pg_range_sockaddr(const struct sockaddr_storage *addr,
return range_sockaddr_AF_INET((const struct sockaddr_in *) addr,
(const struct sockaddr_in *) netaddr,
(const struct sockaddr_in *) netmask);
-#ifdef HAVE_IPV6
else if (addr->ss_family == AF_INET6)
return range_sockaddr_AF_INET6((const struct sockaddr_in6 *) addr,
(const struct sockaddr_in6 *) netaddr,
(const struct sockaddr_in6 *) netmask);
-#endif
else
return 0;
}
@@ -78,9 +74,6 @@ range_sockaddr_AF_INET(const struct sockaddr_in *addr,
return 0;
}
-
-#ifdef HAVE_IPV6
-
static int
range_sockaddr_AF_INET6(const struct sockaddr_in6 *addr,
const struct sockaddr_in6 *netaddr,
@@ -97,7 +90,6 @@ range_sockaddr_AF_INET6(const struct sockaddr_in6 *addr,
return 1;
}
-#endif /* HAVE_IPV6 */
/*
* pg_sockaddr_cidr_mask - make a network mask of the appropriate family
@@ -147,7 +139,6 @@ pg_sockaddr_cidr_mask(struct sockaddr_storage *mask, char *numbits, int family)
break;
}
-#ifdef HAVE_IPV6
case AF_INET6:
{
struct sockaddr_in6 mask6;
@@ -172,7 +163,7 @@ pg_sockaddr_cidr_mask(struct sockaddr_storage *mask, char *numbits, int family)
memcpy(mask, &mask6, sizeof(mask6));
break;
}
-#endif
+
default:
return -1;
}
@@ -207,13 +198,11 @@ run_ifaddr_callback(PgIfAddrCallback callback, void *cb_data,
if (((struct sockaddr_in *) mask)->sin_addr.s_addr == INADDR_ANY)
mask = NULL;
}
-#ifdef HAVE_IPV6
else if (mask->sa_family == AF_INET6)
{
if (IN6_IS_ADDR_UNSPECIFIED(&((struct sockaddr_in6 *) mask)->sin6_addr))
mask = NULL;
}
-#endif
}
/* If mask is invalid, generate our own fully-set mask */
@@ -437,10 +426,7 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data)
{
struct sockaddr_in addr;
struct sockaddr_storage mask;
-
-#ifdef HAVE_IPV6
struct sockaddr_in6 addr6;
-#endif
/* addr 127.0.0.1/8 */
memset(&addr, 0, sizeof(addr));
@@ -452,7 +438,6 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data)
(struct sockaddr *) &addr,
(struct sockaddr *) &mask);
-#ifdef HAVE_IPV6
/* addr ::1/128 */
memset(&addr6, 0, sizeof(addr6));
addr6.sin6_family = AF_INET6;
@@ -462,7 +447,6 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data)
run_ifaddr_callback(callback, cb_data,
(struct sockaddr *) &addr6,
(struct sockaddr *) &mask);
-#endif
return 0;
}
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 7112e9751b1..cba0caced73 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -413,11 +413,9 @@ StreamServerPort(int family, const char *hostName, unsigned short portNumber,
case AF_INET:
familyDesc = _("IPv4");
break;
-#ifdef HAVE_IPV6
case AF_INET6:
familyDesc = _("IPv6");
break;
-#endif
case AF_UNIX:
familyDesc = _("Unix");
break;
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index ea1c7390d0d..6d580ea78f6 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -1725,9 +1725,7 @@ inet_client_addr(PG_FUNCTION_ARGS)
switch (port->raddr.addr.ss_family)
{
case AF_INET:
-#ifdef HAVE_IPV6
case AF_INET6:
-#endif
break;
default:
PG_RETURN_NULL();
@@ -1764,9 +1762,7 @@ inet_client_port(PG_FUNCTION_ARGS)
switch (port->raddr.addr.ss_family)
{
case AF_INET:
-#ifdef HAVE_IPV6
case AF_INET6:
-#endif
break;
default:
PG_RETURN_NULL();
@@ -1801,9 +1797,7 @@ inet_server_addr(PG_FUNCTION_ARGS)
switch (port->laddr.addr.ss_family)
{
case AF_INET:
-#ifdef HAVE_IPV6
case AF_INET6:
-#endif
break;
default:
PG_RETURN_NULL();
@@ -1840,9 +1834,7 @@ inet_server_port(PG_FUNCTION_ARGS)
switch (port->laddr.addr.ss_family)
{
case AF_INET:
-#ifdef HAVE_IPV6
case AF_INET6:
-#endif
break;
default:
PG_RETURN_NULL();
@@ -2102,7 +2094,6 @@ inetmi(PG_FUNCTION_ARGS)
void
clean_ipv6_addr(int addr_family, char *addr)
{
-#ifdef HAVE_IPV6
if (addr_family == AF_INET6)
{
char *pct = strchr(addr, '%');
@@ -2110,5 +2101,4 @@ clean_ipv6_addr(int addr_family, char *addr)
if (pct)
*pct = '\0';
}
-#endif
}
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index d9e2a793829..4cca30aae7c 100644
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@ -735,11 +735,8 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)
}
else
{
- if (beentry->st_clientaddr.addr.ss_family == AF_INET
-#ifdef HAVE_IPV6
- || beentry->st_clientaddr.addr.ss_family == AF_INET6
-#endif
- )
+ if (beentry->st_clientaddr.addr.ss_family == AF_INET ||
+ beentry->st_clientaddr.addr.ss_family == AF_INET6)
{
char remote_host[NI_MAXHOST];
char remote_port[NI_MAXSERV];
@@ -1105,9 +1102,7 @@ pg_stat_get_backend_client_addr(PG_FUNCTION_ARGS)
switch (beentry->st_clientaddr.addr.ss_family)
{
case AF_INET:
-#ifdef HAVE_IPV6
case AF_INET6:
-#endif
break;
default:
PG_RETURN_NULL();
@@ -1152,9 +1147,7 @@ pg_stat_get_backend_client_port(PG_FUNCTION_ARGS)
switch (beentry->st_clientaddr.addr.ss_family)
{
case AF_INET:
-#ifdef HAVE_IPV6
case AF_INET6:
-#endif
break;
case AF_UNIX:
PG_RETURN_INT32(-1);
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index a779153c74e..29c28b73153 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1176,7 +1176,6 @@ setup_config(void)
conflines = replace_token(conflines, "@remove-line-for-nolocal@", "");
-#ifdef HAVE_IPV6
/*
* Probe to see if there is really any platform support for IPv6, and
@@ -1218,15 +1217,6 @@ setup_config(void)
"#host replication all ::1");
}
}
-#else /* !HAVE_IPV6 */
- /* If we didn't compile IPV6 support at all, always comment it out */
- conflines = replace_token(conflines,
- "host all all ::1",
- "#host all all ::1");
- conflines = replace_token(conflines,
- "host replication all ::1",
- "#host replication all ::1");
-#endif /* HAVE_IPV6 */
/* Replace default authentication methods */
conflines = replace_token(conflines,
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 109776e465b..c5a80b829e7 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -241,9 +241,6 @@
/* Define to 1 if you have the global variable 'int timezone'. */
#undef HAVE_INT_TIMEZONE
-/* Define to 1 if you have support for IPv6. */
-#undef HAVE_IPV6
-
/* Define to 1 if __builtin_constant_p(x) implies "i"(x) acceptance. */
#undef HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P
diff --git a/src/include/utils/inet.h b/src/include/utils/inet.h
index 3073c0307eb..b1ec9723dfb 100644
--- a/src/include/utils/inet.h
+++ b/src/include/utils/inet.h
@@ -31,8 +31,8 @@ typedef struct
* We use these values for the "family" field.
*
* Referencing all of the non-AF_INET types to AF_INET lets us work on
- * machines which may not have the appropriate address family (like
- * inet6 addresses when AF_INET6 isn't present) but doesn't cause a
+ * machines which did not have the appropriate address family (like
+ * inet6 addresses when AF_INET6 wasn't present) but didn't cause a
* dump/reload requirement. Pre-7.4 databases used AF_INET for the family
* type on disk.
*/
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 8cefef20d1e..917b19e0e9d 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -1652,7 +1652,6 @@ getHostaddr(PGconn *conn, char *host_addr, int host_addr_len)
host_addr, host_addr_len) == NULL)
host_addr[0] = '\0';
}
-#ifdef HAVE_IPV6
else if (addr->ss_family == AF_INET6)
{
if (pg_inet_net_ntop(AF_INET6,
@@ -1661,7 +1660,6 @@ getHostaddr(PGconn *conn, char *host_addr, int host_addr_len)
host_addr, host_addr_len) == NULL)
host_addr[0] = '\0';
}
-#endif
else
host_addr[0] = '\0';
}
diff --git a/src/port/inet_net_ntop.c b/src/port/inet_net_ntop.c
index b8ad69c3909..500c66dbf18 100644
--- a/src/port/inet_net_ntop.c
+++ b/src/port/inet_net_ntop.c
@@ -80,15 +80,14 @@ pg_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.
+ * == AF_INET, but the INET6 constants are very likely to be different.
*/
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
+#if AF_INET6 != PGSQL_AF_INET6
case AF_INET6:
#endif
return (inet_net_ntop_ipv6(src, bits, dst, size));
diff --git a/src/tools/ifaddrs/test_ifaddrs.c b/src/tools/ifaddrs/test_ifaddrs.c
index b8dbb849455..b9a1b7b5e84 100644
--- a/src/tools/ifaddrs/test_ifaddrs.c
+++ b/src/tools/ifaddrs/test_ifaddrs.c
@@ -26,11 +26,9 @@ print_addr(struct sockaddr *addr)
case AF_INET:
len = sizeof(struct sockaddr_in);
break;
-#ifdef HAVE_IPV6
case AF_INET6:
len = sizeof(struct sockaddr_in6);
break;
-#endif
default:
len = sizeof(struct sockaddr_storage);
break;
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index a3da3f748a1..c2acb58df0e 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -277,7 +277,6 @@ sub GenerateFiles
HAVE_INTTYPES_H => undef,
HAVE_INT_OPTERR => undef,
HAVE_INT_OPTRESET => undef,
- HAVE_IPV6 => 1,
HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P => undef,
HAVE_KQUEUE => undef,
HAVE_LANGINFO_H => undef,
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 18:11:01 +0000