summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGravatar Karl Ramm <kcr@1ts.org>2013-02-16 21:28:15 -0500
committerGravatar Karl Ramm <kcr@1ts.org>2013-02-16 21:28:15 -0500
commit75d881db99b0f32b86c6ab94ed9045dde1237c33 (patch)
treedd5593ef3e13cca0a5aeced07497b1f888289a23 /lib
parentb92153fac201a9a22779817be5f2375f7cf754fc (diff)
Revert "Send IPv4 addresses ASCII-encoded, not ZCode"
This can't get subs in the athena realm. This reverts commit b92153fac201a9a22779817be5f2375f7cf754fc.
Diffstat (limited to 'lib')
-rw-r--r--lib/Zinternal.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Zinternal.c b/lib/Zinternal.c
index 87d6e91..0f692f3 100644
--- a/lib/Zinternal.c
+++ b/lib/Zinternal.c
@@ -947,15 +947,13 @@ Z_ZcodeFormatRawHeader(ZNotice_t *notice,
if (notice->z_sender_sockaddr.sa.sa_family == AF_INET) {
addrlen = sizeof(notice->z_sender_sockaddr.ip4.sin_addr);
addraddr = (unsigned char *)&notice->z_sender_sockaddr.ip4.sin_addr;
- if (ZMakeAscii(ptr, end-ptr, addraddr, addrlen) == ZERR_FIELDLEN)
- return ZERR_HEADERLEN;
} else if (notice->z_sender_sockaddr.sa.sa_family == AF_INET6) {
addrlen = sizeof(notice->z_sender_sockaddr.ip6.sin6_addr);
addraddr = (unsigned char *)&notice->z_sender_sockaddr.ip6.sin6_addr;
- if (ZMakeZcode(ptr, end-ptr, addraddr, addrlen) == ZERR_FIELDLEN)
- return ZERR_HEADERLEN;
}
+ if (ZMakeZcode(ptr, end-ptr, addraddr, addrlen) == ZERR_FIELDLEN)
+ return ZERR_HEADERLEN;
ptr += strlen(ptr) + 1;
}