From 96f932d0209b23eaf5071be70dda9796f1d1ef39 Mon Sep 17 00:00:00 2001 From: ferrieux Date: Mon, 1 Mar 2010 14:57:46 +0000 Subject: Refrain from a possibly lengthy reverse-DNS lookup on 0.0.0.0 when calling [fconfigure -sockname] on an universally-bound (default) server socket. --- ChangeLog | 6 ++++++ unix/tclUnixSock.c | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33f1ba4..6bf0af1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-03-01 Alexandre Ferrieux + + * unix/tclUnixSock.c: Refrain from a possibly lengthy reverse-DNS + lookup on 0.0.0.0 when calling [fconfigure -sockname] on an + universally-bound (default) server socket. + 2010-02-28 Donal K. Fellows * generic/tclCmdIL.c: More additions of {TCL LOOKUP} error-code diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index 1c852ce..8169357 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixSock.c,v 1.23 2010/01/10 22:58:40 nijtmans Exp $ + * RCS: @(#) $Id: tclUnixSock.c,v 1.24 2010/03/01 14:57:47 ferrieux Exp $ */ #include "tclInt.h" @@ -685,9 +685,13 @@ TcpGetOptionProc( Tcl_DStringStartSublist(dsPtr); } Tcl_DStringAppendElement(dsPtr, inet_ntoa(sockname.sin_addr)); - hostEntPtr = TclpGetHostByAddr( /* INTL: Native. */ - (char *) &sockname.sin_addr, - sizeof(sockname.sin_addr), AF_INET); + if (sockname.sin_addr.s_addr == INADDR_ANY) { + hostEntPtr = NULL; /* we don't want to resolve INADDR_ANY */ + } else { + hostEntPtr = TclpGetHostByAddr( /* INTL: Native. */ + (char *) &sockname.sin_addr, + sizeof(sockname.sin_addr), AF_INET); + } if (hostEntPtr != NULL) { Tcl_DString ds; @@ -1335,5 +1339,7 @@ TcpAccept( * mode: c * c-basic-offset: 4 * fill-column: 78 + * tab-width: 8 + * indent-tabs-mode: nil * End: */ -- cgit v0.12