From a63c8bd73685977573cc12aa07a7964e1b45aedc Mon Sep 17 00:00:00 2001 From: ferrieux Date: Mon, 1 Mar 2010 15:14:14 +0000 Subject: [Backported] 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/tclUnixChan.c | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73c15ae..95bf9c2 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-27 Donal K. Fellows * generic/tclCmdMZ.c (StringFirstCmd, StringLastCmd): [Bug 2960021]: diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c index 01d4005..943e924 100644 --- a/unix/tclUnixChan.c +++ b/unix/tclUnixChan.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixChan.c,v 1.93.2.3 2009/07/16 20:50:54 dgp Exp $ + * RCS: @(#) $Id: tclUnixChan.c,v 1.93.2.4 2010/03/01 15:14:15 ferrieux Exp $ */ #include "tclInt.h" /* Internal definitions for Tcl. */ @@ -2138,9 +2138,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; @@ -3192,5 +3196,7 @@ FileTruncateProc( * mode: c * c-basic-offset: 4 * fill-column: 78 + * tab-width: 8 + * indent-tabs-mode: nil * End: */ -- cgit v0.12