From c6541a2def30fc3b854e589017c875a7e0eb5576 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Thu, 6 Nov 2008 11:12:25 +0000 Subject: [PATCH] iana portlist updated. doxygen comments better. git-svn-id: file:///svn/unbound/trunk@1335 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 1 + iterator/iter_priv.c | 7 ++++--- util/iana_ports.inc | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 20bd1684a..43fcefe9a 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,5 +1,6 @@ 6 November 2008: Wouter - dname_priv must decompress the name before comparison. + - iana portlist updated. 5 November 2008: Wouter - fixed possible memory leak in key_entry_key deletion. diff --git a/iterator/iter_priv.c b/iterator/iter_priv.c index 6d8aad955..123c081ab 100644 --- a/iterator/iter_priv.c +++ b/iterator/iter_priv.c @@ -182,21 +182,22 @@ priv_lookup_addr(struct iter_priv* priv, struct sockaddr_storage* addr, * @param priv: structure for address storage. * @param pkt: the packet (for compression ptrs). * @param name: name to check. + * @param name_len: uncompressed length of the name to check. * @param dclass: class to check. * @return: true if the name is OK. false if unlisted. */ static int priv_lookup_name(struct iter_priv* priv, ldns_buffer* pkt, - uint8_t* name, size_t dname_len, uint16_t dclass) + uint8_t* name, size_t name_len, uint16_t dclass) { size_t len; uint8_t decomp[256]; int labs; - if(dname_len >= sizeof(decomp)) + if(name_len >= sizeof(decomp)) return 0; dname_pkt_copy(pkt, decomp, name); labs = dname_count_size_labels(decomp, &len); - log_assert(dname_len == len); + log_assert(name_len == len); return name_tree_lookup(&priv->n, decomp, len, labs, dclass) != NULL; } diff --git a/util/iana_ports.inc b/util/iana_ports.inc index f9588fff9..3f3154b1c 100644 --- a/util/iana_ports.inc +++ b/util/iana_ports.inc @@ -4045,6 +4045,7 @@ 5100, 5101, 5102, +5111, 5112, 5133, 5137,