actually set the address family on incoming addresses

git-svn-id: svn://svn.1ts.org/debian/branches/zephyr-reloaded@415 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/debian/rules b/zephyr/debian/rules
index c06f918a816360c550a6ce2082e980b1776e4a46..b89b6558d4e70edc8714c1d9311b9dbfba47ed59 100755 (executable)
--- a/zephyr/debian/rules
+++ b/zephyr/debian/rules
@@ -13,6 +13,8 @@
 export DH_OPTIONS
 CONFIGURE_ROOT=--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --datadir=/etc  --with-ares=/usr --with-hesiod=/usr
 
+CFLAGS=-O -g
+
 # see /usr/share/doc/autotools-dev/README.Debian.gz
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

diff --git a/zephyr/lib/ZParseNot.c b/zephyr/lib/ZParseNot.c
index c81ae978d17bbd00fe97f536f22c357a946d0b92..f5b90cd4399a74d5a3d4763205e86174b896e9a2 100644 (file)
--- a/zephyr/lib/ZParseNot.c
+++ b/zephyr/lib/ZParseNot.c
@@ -260,11 +260,13 @@ ZParseNotice(char *buffer,
        if (ZReadZcode((unsigned char *)ptr, addrbuf, sizeof(addrbuf), &len) == ZERR_BADFIELD)
            BAD_PACKET;
 
-       if (len == sizeof(notice->z_sender_sockaddr.ip6.sin6_addr))
+       if (len == sizeof(notice->z_sender_sockaddr.ip6.sin6_addr)) {
+           notice->z_sender_sockaddr.ip6.sin6_family = AF_INET6;
            memcpy(&notice->z_sender_sockaddr.ip6.sin6_addr, addrbuf, len);
-       else if (len == sizeof(notice->z_sender_sockaddr.ip4.sin_addr))
+       } else if (len == sizeof(notice->z_sender_sockaddr.ip4.sin_addr)) {
+           notice->z_sender_sockaddr.ip4.sin_family = AF_INET;
            memcpy(&notice->z_sender_sockaddr.ip4.sin_addr, addrbuf, len);
-       else
+       } else
            BAD_PACKET;
 
        numfields--;