- better casts in pipe code, brackets placed wrongly.

        - iana portlist updated.

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

diff --git a/doc/Changelog b/doc/Changelog
index 91faf8c3cbe80153c6259e73e218ea4e078d3537..e7ef74843dc851cee16c1c7a9d19e96d6772ae36 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+3 March 2010: Wouter
+       - better casts in pipe code, brackets placed wrongly.
+       - iana portlist updated.
+
 1 March 2010: Wouter
        - make install depends on make all.
        - Fix 5011 auto-trust-anchor-file initial read to skip RRSIGs.

diff --git a/util/iana_ports.inc b/util/iana_ports.inc
index d2820126da10f93d388bb66b68ba823955233dbf..2002c0ba1be5418d8c0ec6d1d3cef3e029ab7a63 100644 (file)
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -4064,6 +4064,7 @@
 5085,
 5092,
 5093,
+5094,
 5099,
 5100,
 5101,

diff --git a/util/tube.c b/util/tube.c
index 1bf5573654993e0e9e7b90f2c2293301c26ab343..85822f9c9ccecb4dc6d73a9957e1a8937fd1ad61 100644 (file)
--- a/util/tube.c
+++ b/util/tube.c
@@ -298,7 +298,7 @@ int tube_write_msg(struct tube* tube, uint8_t* buf, uint32_t len,
                return 0;
        /* write remainder */
        if(r != (ssize_t)sizeof(len)) {
-               if(write(fd, (char*)(&len)+r, sizeof(len)-r) == -1) {
+               if(write(fd, ((char*)&len)+r, sizeof(len)-r) == -1) {
                        log_err("tube msg write failed: %s", strerror(errno));
                        (void)fd_set_nonblock(fd);
                        return 0;
@@ -337,7 +337,7 @@ int tube_read_msg(struct tube* tube, uint8_t** buf, uint32_t* len,
                return 0;
        /* read remainder */
        if(r != (ssize_t)sizeof(*len)) {
-               if((r=read(fd, (char*)(len)+r, sizeof(*len)-r)) == -1) {
+               if((r=read(fd, ((char*)len)+r, sizeof(*len)-r)) == -1) {
                        log_err("tube msg read failed: %s", strerror(errno));
                        (void)fd_set_nonblock(fd);
                        return 0;