iana portlist updated.

doxygen comments better.

git-svn-id: file:///svn/unbound/trunk@1335 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 20bd1684a81b52de50fe7ff49385823072690f4a..43fcefe9a7dd37fbad81e3f53c1f0c2f76ac1162 100644 (file)
--- 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 6d8aad955067328f488e1f168888385f25ea0801..123c081ab52b37962f8092a4cd92753bc83f00fc 100644 (file)
--- 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 f9588fff9c327a27e28066923cae6832e1c79bf4..3f3154b1c6927992903b3a5b2a8bd89d07dd9272 100644 (file)
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -4045,6 +4045,7 @@
 5100,
 5101,
 5102,
+5111,
 5112,
 5133,
 5137,