X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=regress%2Fhcommon.c;h=7aada144aed629c37d49df95de3da19cf666f141;hp=2ee9d417776f0a6277025f96405585aaa0e25f9c;hb=84ada014b1bf2cf7e5a38320be7371dbbf91bb23;hpb=51cb3de39ef4e85d2efa7d167dc531d04500a525 diff --git a/regress/hcommon.c b/regress/hcommon.c index 2ee9d41..7aada14 100644 --- a/regress/hcommon.c +++ b/regress/hcommon.c @@ -143,10 +143,12 @@ void Qwrite( int fd , const void *buf , size_t len ) { Q_vb(); } 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) { const byte *bp;