embedaddon/quagga/lib/sockunion.c - diff

Return to sockunion.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / quagga / lib

Diff for /embedaddon/quagga/lib/sockunion.c between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2013/07/21 23:54:39	version 1.1.1.4, 2016/11/02 10:09:11
Line 27	Line 27
#include "memory.h"	#include "memory.h"
#include "str.h"	#include "str.h"
#include "log.h"	#include "log.h"
	#include "jhash.h"

#ifndef HAVE_INET_ATON	#ifndef HAVE_INET_ATON
int	int
Line 116 inet_ntop (int family, const void addrptr, char strp	Line 117 inet_ntop (int family, const void addrptr, char strp
#endif /* ! HAVE_INET_NTOP */	#endif /* ! HAVE_INET_NTOP */

const char *	const char *
inet_sutop (union sockunion su, char str)	inet_sutop (const union sockunion su, char str)
{	{
switch (su->sa.sa_family)	switch (su->sa.sa_family)
{	{
Line 163 str2sockunion (const char str, union sockunion su)	Line 164 str2sockunion (const char str, union sockunion su)
}	}

const char *	const char *
sockunion2str (union sockunion su, char buf, size_t len)	sockunion2str (const union sockunion su, char buf, size_t len)
{	{
if (su->sa.sa_family == AF_INET)	switch (sockunion_family(su))
return inet_ntop (AF_INET, &su->sin.sin_addr, buf, len);	{
	case AF_UNSPEC:
	snprintf (buf, len, "(unspec)");
	return buf;
	case AF_INET:
	return inet_ntop (AF_INET, &su->sin.sin_addr, buf, len);
#ifdef HAVE_IPV6	#ifdef HAVE_IPV6
else if (su->sa.sa_family == AF_INET6)	case AF_INET6:
return inet_ntop (AF_INET6, &su->sin6.sin6_addr, buf, len);	return inet_ntop (AF_INET6, &su->sin6.sin6_addr, buf, len);
#endif /* HAVE_IPV6 */	#endif /* HAVE_IPV6 */
return NULL;	}
	snprintf (buf, len, "(af %d)", sockunion_family(su));
	return buf;
}	}

union sockunion *	union sockunion *
Line 207 sockunion_normalise_mapped (union sockunion *su)	Line 215 sockunion_normalise_mapped (union sockunion *su)

/* Return socket of sockunion. */	/* Return socket of sockunion. */
int	int
sockunion_socket (union sockunion *su)	sockunion_socket (const union sockunion *su)
{	{
int sock;	int sock;

Line 237 sockunion_accept (int sock, union sockunion *su)	Line 245 sockunion_accept (int sock, union sockunion *su)

/* Return sizeof union sockunion. */	/* Return sizeof union sockunion. */
static int	static int
sockunion_sizeof (union sockunion *su)	sockunion_sizeof (const union sockunion *su)
{	{
int ret;	int ret;

Line 258 sockunion_sizeof (union sockunion *su)	Line 266 sockunion_sizeof (union sockunion *su)

/* return sockunion structure : this function should be revised. */	/* return sockunion structure : this function should be revised. */
static const char *	static const char *
sockunion_log (union sockunion su, char buf, size_t len)	sockunion_log (const union sockunion su, char buf, size_t len)
{	{
switch (su->sa.sa_family)	switch (su->sa.sa_family)
{	{
Line 282 sockunion_log (union sockunion su, char buf, size_t	Line 290 sockunion_log (union sockunion su, char buf, size_t
0 : connect success	0 : connect success
1 : connect is in progress */	1 : connect is in progress */
enum connect_result	enum connect_result
sockunion_connect (int fd, union sockunion *peersu, unsigned short port,	sockunion_connect (int fd, const union sockunion *peersu, unsigned short port,
unsigned int ifindex)	ifindex_t ifindex)
{	{
int ret;	int ret;
int val;	int val;
Line 304 sockunion_connect (int fd, union sockunion *peersu, un	Line 312 sockunion_connect (int fd, union sockunion *peersu, un
{	{
#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID	#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
/* su.sin6.sin6_scope_id = ifindex; */	/* su.sin6.sin6_scope_id = ifindex; */
#ifdef MUSICA
su.sin6.sin6_scope_id = ifindex;
#endif
#endif /* HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID */	#endif /* HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID */
#ifndef MUSICA
SET_IN6_LINKLOCAL_IFINDEX (su.sin6.sin6_addr, ifindex);	SET_IN6_LINKLOCAL_IFINDEX (su.sin6.sin6_addr, ifindex);
#endif
}	}
#endif /* KAME */	#endif /* KAME */
break;	break;
Line 394 sockunion_bind (int sock, union sockunion *su, unsigne	Line 397 sockunion_bind (int sock, union sockunion *su, unsigne
#endif /* SIN6_LEN */	#endif /* SIN6_LEN */
if (su_addr == NULL)	if (su_addr == NULL)
{	{
#if defined(LINUX_IPV6) \|\| defined(NRL)	#ifdef LINUX_IPV6
memset (&su->sin6.sin6_addr, 0, sizeof (struct in6_addr));	memset (&su->sin6.sin6_addr, 0, sizeof (struct in6_addr));
#else	#else
su->sin6.sin6_addr = in6addr_any;	su->sin6.sin6_addr = in6addr_any;
Line 552 sockopt_v6only (int family, int sock)	Line 555 sockopt_v6only (int family, int sock)

/* If same family and same prefix return 1. */	/* If same family and same prefix return 1. */
int	int
sockunion_same (union sockunion su1, union sockunion su2)	sockunion_same (const union sockunion su1, const union sockunion su2)
{	{
int ret = 0;	int ret = 0;

Line 578 sockunion_same (union sockunion *su1, union sockunion	Line 581 sockunion_same (union sockunion *su1, union sockunion
return 0;	return 0;
}	}

	unsigned int
	sockunion_hash (const union sockunion *su)
	{
	switch (sockunion_family(su))
	{
	case AF_INET:
	return jhash_1word(su->sin.sin_addr.s_addr, 0);
	#ifdef HAVE_IPV6
	case AF_INET6:
	return jhash2(su->sin6.sin6_addr.s6_addr32, ZEBRA_NUM_OF(su->sin6.sin6_addr.s6_addr32), 0);
	#endif /* HAVE_IPV6 */
	}
	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. */	/* After TCP connection is established. Get local address and port. */
union sockunion *	union sockunion *
sockunion_getsockname (int fd)	sockunion_getsockname (int fd)
Line 671 sockunion_getpeername (int fd)	Line 745 sockunion_getpeername (int fd)

/* Print sockunion structure */	/* Print sockunion structure */
static void __attribute__ ((unused))	static void __attribute__ ((unused))
sockunion_print (union sockunion *su)	sockunion_print (const union sockunion *su)
{	{
if (su == NULL)	if (su == NULL)
return;	return;
Line 710 sockunion_print (union sockunion *su)	Line 784 sockunion_print (union sockunion *su)

#ifdef HAVE_IPV6	#ifdef HAVE_IPV6
static int	static int
in6addr_cmp (struct in6_addr addr1, struct in6_addr addr2)	in6addr_cmp (const struct in6_addr addr1, const struct in6_addr addr2)
{	{
unsigned int i;	unsigned int i;
u_char p1, p2;	u_char p1, p2;
Line 730 in6addr_cmp (struct in6_addr addr1, struct in6_addr	Line 804 in6addr_cmp (struct in6_addr addr1, struct in6_addr
#endif /* HAVE_IPV6 */	#endif /* HAVE_IPV6 */

int	int
sockunion_cmp (union sockunion su1, union sockunion su2)	sockunion_cmp (const union sockunion su1, const union sockunion su2)
{	{
if (su1->sa.sa_family > su2->sa.sa_family)	if (su1->sa.sa_family > su2->sa.sa_family)
return 1;	return 1;
Line 755 sockunion_cmp (union sockunion su1, union sockunion	Line 829 sockunion_cmp (union sockunion su1, union sockunion

/* Duplicate sockunion. */	/* Duplicate sockunion. */
union sockunion *	union sockunion *
sockunion_dup (union sockunion *su)	sockunion_dup (const union sockunion *su)
{	{
union sockunion *dup = XCALLOC (MTYPE_SOCKUNION, sizeof (union sockunion));	union sockunion *dup = XCALLOC (MTYPE_SOCKUNION, sizeof (union sockunion));
memcpy (dup, su, sizeof (union sockunion));	memcpy (dup, su, sizeof (union sockunion));

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.3
changed lines
	Added in v.1.1.1.4