From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 24 Aug 2020 15:42:17 +0000 (-0400)
Subject: rename function for clarity
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06bb589fa54346ef7a97094d8a4a99b226fd46fd;p=thirdparty%2Ffreeradius-server.git

rename function for clarity
---

diff --git a/src/lib/util/dns.c b/src/lib/util/dns.c
index c915f37644a..563bf4ab731 100644
--- a/src/lib/util/dns.c
+++ b/src/lib/util/dns.c
@@ -482,7 +482,6 @@ static bool dns_label_compress(uint8_t const *start, uint8_t const *end, uint8_t
 	return false;
 }
 
-
 /** Encode a single value box of type string, serializing its contents to a dns label
  *
  * This functions takes a large buffer and encodes the label in part
@@ -676,7 +675,7 @@ done:
  *	- <=0 on error, offset from buf where the invalid label is located.
  *	- > 0 decoded size of this particular DNS label
  */
-ssize_t fr_dns_label_length(uint8_t const *buf, size_t buf_len, uint8_t const **next)
+ssize_t fr_dns_label_uncompressed_length(uint8_t const *buf, size_t buf_len, uint8_t const **next)
 {
 	uint8_t const *p, *q, *end;
 	uint8_t const *current, *start;
@@ -861,7 +860,7 @@ ssize_t fr_dns_labels_network_verify(uint8_t const *buf, size_t buf_len)
 	uint8_t const *end = buf + buf_len;
 
 	for (label = buf; label < end; /* nothing */) {
-		slen = fr_dns_label_length(buf, buf_len, &label);
+		slen = fr_dns_label_uncompressed_length(buf, buf_len, &label);
 		if (slen <= 0) return slen; /* already is offset from 'buf' and not 'label' */
 	}
 
@@ -932,7 +931,7 @@ ssize_t fr_dns_label_to_value_box(TALLOC_CTX *ctx, fr_value_box_t *dst,
 	 *	Get the uncompressed length of the label, and the
 	 *	label after this one.
 	 */
-	slen = fr_dns_label_length(src, len, &after);
+	slen = fr_dns_label_uncompressed_length(src, len, &after);
 	if (slen <= 0) return slen;
 
 	fr_value_box_init(dst, FR_TYPE_STRING, NULL, tainted);
diff --git a/src/lib/util/dns.h b/src/lib/util/dns.h
index 075b184c0a9..3a67595f7d1 100644
--- a/src/lib/util/dns.h
+++ b/src/lib/util/dns.h
@@ -29,7 +29,7 @@ extern "C" {
 
 ssize_t		fr_dns_label_from_value_box(size_t *need, uint8_t *buf, size_t buflen, uint8_t *where, bool compression, fr_value_box_t const *value);
 
-ssize_t		fr_dns_label_length(uint8_t const *buf, size_t buf_len, uint8_t const **p_label);
+ssize_t		fr_dns_label_uncompressed_length(uint8_t const *buf, size_t buf_len, uint8_t const **p_label);
 
 ssize_t		fr_dns_label_network_network_length(uint8_t const *buf, size_t buf_len);
 
diff --git a/src/protocols/dhcpv6/decode.c b/src/protocols/dhcpv6/decode.c
index ef99fc82eb3..3237ef6276d 100644
--- a/src/protocols/dhcpv6/decode.c
+++ b/src/protocols/dhcpv6/decode.c
@@ -365,7 +365,7 @@ static ssize_t decode_dns_labels(TALLOC_CTX *ctx, fr_cursor_t *cursor, fr_dict_t
 	 *	types.  It's just easier that way.
 	 */
 	if (!parent->flags.array) {
-		rcode = fr_dns_label_length(data, data_len, &next);
+		rcode = fr_dns_label_uncompressed_length(data, data_len, &next);
 		if (rcode <= 0) goto raw;
 
 		/*