Revert "Add function to guess AF_UNSPEC address"

This reverts commit a4063efa7d.

Reason for revert: It is not possible to guess the IP address
family from uninitialized memory. This function simply glorifies
random noise into an IPv6 address. It makes no sense to have it.

Change-Id: Ifadd614604cf9d0c2ed1a405493c1c3fcb37ae23
This commit is contained in:
Neels Hofmeyr 2022-08-17 00:57:00 +00:00
parent 9e4c2ebf18
commit 709da278ca
2 changed files with 2 additions and 35 deletions

View File

@ -41,7 +41,6 @@ struct sockaddr_in6;
*/
int osmo_ip_str_type(const char *ip);
unsigned osmo_sockaddr_guess_unspec(const struct sockaddr *src);
struct osmo_sockaddr_str {
/*! AF_INET for IPv4 address, or AF_INET6 for IPv6 address. */

View File

@ -184,38 +184,6 @@ int osmo_ip_str_type(const char *ip)
return AF_UNSPEC;
}
/*! Guess whether struct sockaddr with AF_UNSPEC family has valid IPv4 or IPv6 address.
* The IPv6 is tried first to take into account "IPv4 mapped addresses".
* \param[in] src Generic struct sockaddr pointer.
* \return AF_INET or AF_INET6, AF_UNSPEC or original sa_family which are unsigned type according to <sys/socket.h>.
*/
unsigned osmo_sockaddr_guess_unspec(const struct sockaddr *src)
{
int rc;
struct osmo_sockaddr_str sa;
struct osmo_sockaddr_str *tmp = &sa;
const struct sockaddr_in6 *src6 = (const struct sockaddr_in6 *)src;
const struct sockaddr_in *src4 = (const struct sockaddr_in *)src;
if (!src)
return AF_UNSPEC;
if (src->sa_family != AF_UNSPEC)
return src->sa_family;
/* IPv6? */
rc = osmo_sockaddr_str_from_in6_addr(tmp, &src6->sin6_addr, osmo_ntohs(src6->sin6_port));
if (rc == 0 && osmo_ip_str_type(tmp->ip) == AF_INET6)
return AF_INET6;
/* IPv4? */
rc = osmo_sockaddr_str_from_in_addr(tmp, &src4->sin_addr, osmo_ntohs(src4->sin_port));
if (rc == 0 && osmo_ip_str_type(tmp->ip) == AF_INET)
return AF_INET;
return AF_UNSPEC;
}
/*! Safely copy the given ip string to sockaddr_str, classify to AF_INET or AF_INET6.
* Data will be written to sockaddr_str even if an error is returned.
* \param[out] sockaddr_str The instance to copy to.
@ -349,7 +317,7 @@ int osmo_sockaddr_str_from_sockaddr_in(struct osmo_sockaddr_str *sockaddr_str, c
return -ENOSPC;
if (!src)
return -EINVAL;
if (src->sin_family != AF_INET && osmo_sockaddr_guess_unspec((const struct sockaddr *)src) != AF_INET)
if (src->sin_family != AF_INET)
return -EINVAL;
return osmo_sockaddr_str_from_in_addr(sockaddr_str, &src->sin_addr, osmo_ntohs(src->sin_port));
}
@ -365,7 +333,7 @@ int osmo_sockaddr_str_from_sockaddr_in6(struct osmo_sockaddr_str *sockaddr_str,
return -ENOSPC;
if (!src)
return -EINVAL;
if (src->sin6_family != AF_INET6 && osmo_sockaddr_guess_unspec((const struct sockaddr *)src) != AF_INET6)
if (src->sin6_family != AF_INET6)
return -EINVAL;
return osmo_sockaddr_str_from_in6_addr(sockaddr_str, &src->sin6_addr, osmo_ntohs(src->sin6_port));
}