proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 20:32:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[lib] re-enable conversion of v6mapped INET6 sockunions to regular INET

Browse Source 
* lib/sockunion.c: Re-enable conversion of v6mapped INET6 sockunions to
  regular INET sockunions, which was disabled in 0df7c9, as it leads to
  failures in sockunion_cmp.
  (sockunion_normalise_mapped) consolidate here
  (sockunion_accept) remove conversion code altogether here - no sockunion
  is created
  (sockunion_get{sockname,peername}) normalise newly created sockunion.
This commit is contained in:
Paul Jakma 2008-09-09 21:17:04 +01:00 committed by Paul Jakma
parent 2b2fc5606f
commit 1a7dcf42a2
1 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/sockunion.c
View File

@ -227,6 +227,24 @@ sockunion_su2str (union sockunion *su)
return XSTRDUP (MTYPE_TMP, str);
}
/* Convert IPv4 compatible IPv6 address to IPv4 address. */
static void
sockunion_normalise_mapped (union sockunion *su)
{
struct sockaddr_in sin;
#ifdef HAVE_IPV6
if (su->sa.sa_family == AF_INET6
&& IN6_IS_ADDR_V4MAPPED (&su->sin6.sin6_addr))
{
memset (&sin, 0, sizeof (struct sockaddr_in));
sin.sin_family = AF_INET;
memcpy (&sin.sin_addr, ((char *)&su->sin6.sin6_addr) + 12, 4);
memcpy (su, &sin, sizeof (struct sockaddr_in));
}
#endif /* HAVE_IPV6 */
}
/* Return socket of sockunion. */
int
sockunion_socket (union sockunion *su)
@ -253,23 +271,6 @@ sockunion_accept (int sock, union sockunion *su)
len = sizeof (union sockunion);
client_sock = accept (sock, (struct sockaddr *) su, &len);
/* Convert IPv4 compatible IPv6 address to IPv4 address. */
#if 0
#ifdef HAVE_IPV6
if (su->sa.sa_family == AF_INET6)
{
if (IN6_IS_ADDR_V4MAPPED (&su->sin6.sin6_addr))
{
struct sockaddr_in sin;
memset (&sin, 0, sizeof (struct sockaddr_in));
sin.sin_family = AF_INET;
memcpy (&sin.sin_addr, ((char *)&su->sin6.sin6_addr) + 12, 4);
memcpy (su, &sin, sizeof (struct sockaddr_in));
}
}
#endif /* HAVE_IPV6 */
#endif
return client_sock;
}
@ -592,18 +593,7 @@ sockunion_getsockname (int fd)
{
su = XCALLOC (MTYPE_SOCKUNION, sizeof (union sockunion));
memcpy (su, &name, sizeof (struct sockaddr_in6));
#if 0
if (IN6_IS_ADDR_V4MAPPED (&su->sin6.sin6_addr))
{
struct sockaddr_in sin;
sin.sin_family = AF_INET;
memcpy (&sin.sin_addr, ((char *)&su->sin6.sin6_addr) + 12, 4);
sin.sin_port = su->sin6.sin6_port;
memcpy (su, &sin, sizeof (struct sockaddr_in));
}
#endif
sockunion_normalise_mapped (su);
return su;
}
#endif /* HAVE_IPV6 */
@ -648,17 +638,7 @@ sockunion_getpeername (int fd)
{
su = XCALLOC (MTYPE_SOCKUNION, sizeof (union sockunion));
memcpy (su, &name, sizeof (struct sockaddr_in6));
#if 0
if (IN6_IS_ADDR_V4MAPPED (&su->sin6.sin6_addr))
{
struct sockaddr_in sin;
sin.sin_family = AF_INET;
memcpy (&sin.sin_addr, ((char *)&su->sin6.sin6_addr) + 12, 4);
sin.sin_port = su->sin6.sin6_port;
memcpy (su, &sin, sizeof (struct sockaddr_in));
}
#endif
sockunion_normalise_mapped (su);
return su;
}
#endif /* HAVE_IPV6 */