proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 10:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sockunion: add accessors for sockunion address

Browse Source 
Upcoming nhrp code will use this, and it can be used to remove
the sockunion2ip(X) macro.

Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
(cherry picked from commit 483abc037b0ac4b3ed168c4810bb14ea338fa80c)
This commit is contained in:
Timo Teräs 2015-05-22 13:40:59 +03:00 committed by Daniel Walton
parent cf279b3abc
commit 95e0999cc5
2 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/sockunion.c
View File

@ -623,6 +623,62 @@ sockunion_hash (const union sockunion *su)
return 0;
}
size_t
family2addrsize(int family)
{
switch (family)
{
case AF_INET:
return sizeof(struct in_addr);
#ifdef HAVE_IPV6
case AF_INET6:
return sizeof(struct in6_addr);
#endif /* HAVE_IPV6 */
}
return 0;
}
size_t
sockunion_get_addrlen(const union sockunion *su)
{
return family2addrsize(sockunion_family(su));
}
const u_char *
sockunion_get_addr(const union sockunion *su)
{
switch (sockunion_family(su))
{
case AF_INET:
return (const u_char *) &su->sin.sin_addr.s_addr;
#ifdef HAVE_IPV6
case AF_INET6:
return (const u_char *) &su->sin6.sin6_addr;
#endif /* HAVE_IPV6 */
}
return NULL;
}
void
sockunion_set(union sockunion *su, int family, const u_char *addr, size_t bytes)
{
if (family2addrsize(family) != bytes)
return;
sockunion_family(su) = family;
switch (family)
{
case AF_INET:
memcpy(&su->sin.sin_addr.s_addr, addr, bytes);
break;
#ifdef HAVE_IPV6
case AF_INET6:
memcpy(&su->sin6.sin6_addr, addr, bytes);
break;
#endif /* HAVE_IPV6 */
}
}
/* After TCP connection is established. Get local address and port. */
union sockunion *
sockunion_getsockname (int fd)

5
lib/sockunion.h
View File

@ -74,6 +74,11 @@ extern int sockunion_cmp (union sockunion *, union sockunion *);
extern int sockunion_same (const union sockunion *, const union sockunion *);
extern unsigned int sockunion_hash (const union sockunion *);
extern size_t family2addrsize(int family);
extern size_t sockunion_get_addrlen(const union sockunion *);
extern const u_char *sockunion_get_addr(const union sockunion *);
extern void sockunion_set(union sockunion *, int family, const u_char *addr, size_t bytes);
extern union sockunion *sockunion_str2su (const char *str);
extern int sockunion_accept (int sock, union sockunion *);
extern int sockunion_stream_socket (union sockunion *);