X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=regress%2Fhcommon.c.m4;h=d8b9821c94e86b470a03118a3e5494f5cf2b2d5c;hp=03ff5d7177be3717be5700e194434a503b7a1b84;hb=84ada014b1bf2cf7e5a38320be7371dbbf91bb23;hpb=51cb3de39ef4e85d2efa7d167dc531d04500a525 diff --git a/regress/hcommon.c.m4 b/regress/hcommon.c.m4 index 03ff5d7..d8b9821 100644 --- a/regress/hcommon.c.m4 +++ b/regress/hcommon.c.m4 @@ -129,11 +129,14 @@ m4_define(`hm_specsyscall', `') m4_include(`hsyscalls.i4') void Tvbaddr(const struct sockaddr *addr, int len) { - const struct sockaddr_in *ai= (const struct sockaddr_in*)addr; - - assert(len==sizeof(struct sockaddr_in)); - assert(ai->sin_family==AF_INET); - Tvbf("%s:%u",inet_ntoa(ai->sin_addr),htons(ai->sin_port)); + char buf[ADNS_ADDR2TEXT_BUFLEN]; + int err, port; + int sz= sizeof(buf); + + err= adns_addr2text(addr, 0, buf,&sz, &port); + assert(!err); + + Tvbf(strchr(buf, ':') ? "[%s]:%d" : "%s:%d", buf,port); } void Tvbbytes(const void *buf, int len) {