Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0159f24e authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

lib/vsprintf.c: Add IPV4 options %pI4[hnbl] for host, network, big and little endian 



This should allow the removal of the #defines and uses
of NIPQUAD and NIPQUAD_FMT

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ccd4c61

lib/vsprintf.c

+31 −5
Original line number Diff line number Diff line
@@ -699,13 +699,37 @@ static char *mac_address_string(char *buf, char *end, u8 *addr, 
	return string(buf, end, mac_addr, spec);

}



static char *ip4_string(char *p, const u8 *addr, bool leading_zeros)

static char *ip4_string(char *p, const u8 *addr, const char *fmt)

{

	int i;

	bool leading_zeros = (fmt[0] == 'i');

	int index;

	int step;



	switch (fmt[2]) {

	case 'h':

#ifdef __BIG_ENDIAN

		index = 0;

		step = 1;

#else

		index = 3;

		step = -1;

#endif

		break;

	case 'l':

		index = 3;

		step = -1;

		break;

	case 'n':

	case 'b':

	default:

		index = 0;

		step = 1;

		break;

	}

	for (i = 0; i < 4; i++) {

		char temp[3];	/* hold each IP quad in reverse order */

		int digits = put_dec_trunc(temp, addr[i]) - temp;

		int digits = put_dec_trunc(temp, addr[index]) - temp;

		if (leading_zeros) {

			if (digits < 3)

				*p++ = '0';
@@ -717,6 +741,7 @@ static char *ip4_string(char *p, const u8 *addr, bool leading_zeros) 
			*p++ = temp[digits];

		if (i < 3)

			*p++ = '.';

		index += step;

	}

	*p = '\0';
@@ -796,7 +821,7 @@ static char *ip6_compressed_string(char *p, const char *addr) 
	if (useIPv4) {

		if (needcolon)

			*p++ = ':';

		p = ip4_string(p, &in6.s6_addr[12], false);

		p = ip4_string(p, &in6.s6_addr[12], "I4");

	}

	*p = '\0';
@@ -836,7 +861,7 @@ static char *ip4_addr_string(char *buf, char *end, const u8 *addr, 
{

	char ip4_addr[sizeof("255.255.255.255")];



	ip4_string(ip4_addr, addr, fmt[0] == 'i');

	ip4_string(ip4_addr, addr, fmt);



	return string(buf, end, ip4_addr, spec);

}
@@ -911,6 +936,7 @@ static char *uuid_string(char *buf, char *end, const u8 *addr, 
 * - 'i' [46] for 'raw' IPv4/IPv6 addresses

 *       IPv6 omits the colons (01020304...0f)

 *       IPv4 uses dot-separated decimal with leading 0's (010.123.045.006)

 * - '[Ii]4[hnbl]' IPv4 addresses in host, network, big or little endian order

 * - 'I6c' for IPv6 addresses printed as specified by

 *       http://www.ietf.org/id/draft-kawamura-ipv6-text-representation-03.txt

 * - 'U' For a 16 byte UUID/GUID, it prints the UUID/GUID in the form