luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-14 11:38:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/support-for-systems-without-ipv6' into 'master'

Browse Source 
ginetaddress: Handle systems without IPv6 support

See merge request GNOME/glib!1853
This commit is contained in:
Philip Withnall 2021-01-20 12:18:01 +00:00
commit c5eec23ee2
2 changed files with 83 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
gio/ginetaddress.c
View File

@ -36,7 +36,9 @@ struct _GInetAddressPrivate
GSocketFamily family; GSocketFamily family;
union { union {
struct in_addr ipv4; struct in_addr ipv4;
#ifdef HAVE_IPV6
struct in6_addr ipv6; struct in6_addr ipv6;
#endif
} addr; } addr;
}; };
@ -99,10 +101,16 @@ g_inet_address_set_property (GObject *object,
break; break;
case PROP_BYTES: case PROP_BYTES:
#ifdef HAVE_IPV6
memcpy (&address->priv->addr, g_value_get_pointer (value), memcpy (&address->priv->addr, g_value_get_pointer (value),
address->priv->family == AF_INET ? address->priv->family == AF_INET ?
sizeof (address->priv->addr.ipv4) : sizeof (address->priv->addr.ipv4) :
sizeof (address->priv->addr.ipv6)); sizeof (address->priv->addr.ipv6));
#else
g_assert (address->priv->family == AF_INET);
memcpy (&address->priv->addr, g_value_get_pointer (value),
sizeof (address->priv->addr.ipv4));
#endif
break; break;
default: default:
@ -385,7 +393,9 @@ GInetAddress *
g_inet_address_new_from_string (const gchar *string) g_inet_address_new_from_string (const gchar *string)
{ {
struct in_addr in_addr; struct in_addr in_addr;
#ifdef HAVE_IPV6
struct in6_addr in6_addr; struct in6_addr in6_addr;
#endif
g_return_val_if_fail (string != NULL, NULL); g_return_val_if_fail (string != NULL, NULL);
@ -397,8 +407,10 @@ g_inet_address_new_from_string (const gchar *string)
if (inet_pton (AF_INET, string, &in_addr) > 0) if (inet_pton (AF_INET, string, &in_addr) > 0)
return g_inet_address_new_from_bytes ((guint8 *)&in_addr, AF_INET); return g_inet_address_new_from_bytes ((guint8 *)&in_addr, AF_INET);
#ifdef HAVE_IPV6
else if (inet_pton (AF_INET6, string, &in6_addr) > 0) else if (inet_pton (AF_INET6, string, &in6_addr) > 0)
return g_inet_address_new_from_bytes ((guint8 *)&in6_addr, AF_INET6); return g_inet_address_new_from_bytes ((guint8 *)&in6_addr, AF_INET6);
#endif
return NULL; return NULL;
} }
@ -455,7 +467,11 @@ g_inet_address_new_loopback (GSocketFamily family)
return g_inet_address_new_from_bytes (addr, family); return g_inet_address_new_from_bytes (addr, family);
} }
else else
#ifdef HAVE_IPV6
return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family); return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family);
#else
g_assert_not_reached ();
#endif
} }
/** /**
@ -483,7 +499,11 @@ g_inet_address_new_any (GSocketFamily family)
return g_inet_address_new_from_bytes (addr, family); return g_inet_address_new_from_bytes (addr, family);
} }
else else
#ifdef HAVE_IPV6
return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family); return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family);
#else
g_assert_not_reached ();
#endif
} }
@ -506,12 +526,20 @@ g_inet_address_to_string (GInetAddress *address)
g_return_val_if_fail (G_IS_INET_ADDRESS (address), NULL); g_return_val_if_fail (G_IS_INET_ADDRESS (address), NULL);
if (address->priv->family == AF_INET) if (address->priv->family == AF_INET)
{
inet_ntop (AF_INET, &address->priv->addr.ipv4, buffer, sizeof (buffer)); inet_ntop (AF_INET, &address->priv->addr.ipv4, buffer, sizeof (buffer));
else
inet_ntop (AF_INET6, &address->priv->addr.ipv6, buffer, sizeof (buffer));
return g_strdup (buffer); return g_strdup (buffer);
} }
else
{
#ifdef HAVE_IPV6
inet_ntop (AF_INET6, &address->priv->addr.ipv6, buffer, sizeof (buffer));
return g_strdup (buffer);
#else
g_assert_not_reached ();
#endif
}
}
/** /**
* g_inet_address_to_bytes: (skip) * g_inet_address_to_bytes: (skip)
@ -549,7 +577,11 @@ g_inet_address_get_native_size (GInetAddress *address)
{ {
if (address->priv->family == AF_INET) if (address->priv->family == AF_INET)
return sizeof (address->priv->addr.ipv4); return sizeof (address->priv->addr.ipv4);
#ifdef HAVE_IPV6
return sizeof (address->priv->addr.ipv6); return sizeof (address->priv->addr.ipv6);
#else
g_assert_not_reached ();
#endif
} }
/** /**
@ -592,7 +624,11 @@ g_inet_address_get_is_any (GInetAddress *address)
return addr4 == INADDR_ANY; return addr4 == INADDR_ANY;
} }
else else
#ifdef HAVE_IPV6
return IN6_IS_ADDR_UNSPECIFIED (&address->priv->addr.ipv6); return IN6_IS_ADDR_UNSPECIFIED (&address->priv->addr.ipv6);
#else
g_assert_not_reached ();
#endif
} }
/** /**
@ -618,7 +654,11 @@ g_inet_address_get_is_loopback (GInetAddress *address)
return ((addr4 & 0xff000000) == 0x7f000000); return ((addr4 & 0xff000000) == 0x7f000000);
} }
else else
#ifdef HAVE_IPV6
return IN6_IS_ADDR_LOOPBACK (&address->priv->addr.ipv6); return IN6_IS_ADDR_LOOPBACK (&address->priv->addr.ipv6);
#else
g_assert_not_reached ();
#endif
} }
/** /**
@ -646,7 +686,11 @@ g_inet_address_get_is_link_local (GInetAddress *address)
return ((addr4 & 0xffff0000) == 0xa9fe0000); return ((addr4 & 0xffff0000) == 0xa9fe0000);
} }
else else
#ifdef HAVE_IPV6
return IN6_IS_ADDR_LINKLOCAL (&address->priv->addr.ipv6); return IN6_IS_ADDR_LINKLOCAL (&address->priv->addr.ipv6);
#else
g_assert_not_reached ();
#endif
} }
/** /**
@ -677,7 +721,11 @@ g_inet_address_get_is_site_local (GInetAddress *address)
(addr4 & 0xffff0000) == 0xc0a80000); (addr4 & 0xffff0000) == 0xc0a80000);
} }
else else
#ifdef HAVE_IPV6
return IN6_IS_ADDR_SITELOCAL (&address->priv->addr.ipv6); return IN6_IS_ADDR_SITELOCAL (&address->priv->addr.ipv6);
#else
g_assert_not_reached ();
#endif
} }
/** /**
@ -702,7 +750,11 @@ g_inet_address_get_is_multicast (GInetAddress *address)
return IN_MULTICAST (addr4); return IN_MULTICAST (addr4);
} }
else else
#ifdef HAVE_IPV6
return IN6_IS_ADDR_MULTICAST (&address->priv->addr.ipv6); return IN6_IS_ADDR_MULTICAST (&address->priv->addr.ipv6);
#else
g_assert_not_reached ();
#endif
} }
/** /**
@ -723,7 +775,11 @@ g_inet_address_get_is_mc_global (GInetAddress *address)
if (address->priv->family == AF_INET) if (address->priv->family == AF_INET)
return FALSE; return FALSE;
else else
#ifdef HAVE_IPV6
return IN6_IS_ADDR_MC_GLOBAL (&address->priv->addr.ipv6); return IN6_IS_ADDR_MC_GLOBAL (&address->priv->addr.ipv6);
#else
g_assert_not_reached ();
#endif
} }
/** /**
@ -744,7 +800,11 @@ g_inet_address_get_is_mc_link_local (GInetAddress *address)
if (address->priv->family == AF_INET) if (address->priv->family == AF_INET)
return FALSE; return FALSE;
else else
#ifdef HAVE_IPV6
return IN6_IS_ADDR_MC_LINKLOCAL (&address->priv->addr.ipv6); return IN6_IS_ADDR_MC_LINKLOCAL (&address->priv->addr.ipv6);
#else
g_assert_not_reached ();
#endif
} }
/** /**
@ -765,7 +825,11 @@ g_inet_address_get_is_mc_node_local (GInetAddress *address)
if (address->priv->family == AF_INET) if (address->priv->family == AF_INET)
return FALSE; return FALSE;
else else
#ifdef HAVE_IPV6
return IN6_IS_ADDR_MC_NODELOCAL (&address->priv->addr.ipv6); return IN6_IS_ADDR_MC_NODELOCAL (&address->priv->addr.ipv6);
#else
g_assert_not_reached ();
#endif
} }
/** /**
@ -786,7 +850,11 @@ g_inet_address_get_is_mc_org_local (GInetAddress *address)
if (address->priv->family == AF_INET) if (address->priv->family == AF_INET)
return FALSE; return FALSE;
else else
#ifdef HAVE_IPV6
return IN6_IS_ADDR_MC_ORGLOCAL (&address->priv->addr.ipv6); return IN6_IS_ADDR_MC_ORGLOCAL (&address->priv->addr.ipv6);
#else
g_assert_not_reached ();
#endif
} }
/** /**
@ -807,7 +875,11 @@ g_inet_address_get_is_mc_site_local (GInetAddress *address)
if (address->priv->family == AF_INET) if (address->priv->family == AF_INET)
return FALSE; return FALSE;
else else
#ifdef HAVE_IPV6
return IN6_IS_ADDR_MC_SITELOCAL (&address->priv->addr.ipv6); return IN6_IS_ADDR_MC_SITELOCAL (&address->priv->addr.ipv6);
#else
g_assert_not_reached ();
#endif
} }
/** /**

7
meson.build
View File

@ -1757,6 +1757,13 @@ foreach d : inet_defines
glibconfig_conf.set(d[1], val) glibconfig_conf.set(d[1], val)
endforeach endforeach
if host_system == 'windows'
have_ipv6 = true
else
have_ipv6 = cc.has_type('struct in6_addr', prefix: '#include <netinet/in.h>')
endif
glib_conf.set('HAVE_IPV6', have_ipv6)
# We need to decide at configure time if GLib will use real atomic # We need to decide at configure time if GLib will use real atomic
# operations ("lock free") or emulated ones with a mutex. This is # operations ("lock free") or emulated ones with a mutex. This is
# because we must put this information in glibconfig.h so we know if # because we must put this information in glibconfig.h so we know if