diff options
Diffstat (limited to 'unix/tclUnixSock.c')
| -rw-r--r-- | unix/tclUnixSock.c | 147 |
1 files changed, 65 insertions, 82 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index a2b4015..cb3cc36 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -1,66 +1,96 @@ -/* +/* * tclUnixSock.c -- * * This file contains Unix-specific socket related code. * * Copyright (c) 1995 Sun Microsystems, Inc. * - * See the file "license.terms" for information on usage and redistribution of - * this file, and for a DISCLAIMER OF ALL WARRANTIES. + * See the file "license.terms" for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#include "tclInt.h" +#include "tcl.h" +#include "tclPort.h" + +/* + * There is no portable macro for the maximum length + * of host names returned by gethostbyname(). We should only + * trust SYS_NMLN if it is at least 255 + 1 bytes to comply with DNS + * host name limits. + * + * Note: SYS_NMLN is a restriction on "uname" not on gethostbyname! + * + * For example HP-UX 10.20 has SYS_NMLN == 9, while gethostbyname() + * can return a fully qualified name from DNS of up to 255 bytes. + * + * Fix suggested by Viktor Dukhovni (viktor@esm.com) + */ + +#if defined(SYS_NMLN) && SYS_NMLEN >= 256 +#define TCL_HOSTNAME_LEN SYS_NMLEN +#else +#define TCL_HOSTNAME_LEN 256 +#endif + /* * The following variable holds the network name of this host. */ -static TclInitProcessGlobalValueProc InitializeHostName; -static ProcessGlobalValue hostName = - {0, 0, NULL, NULL, InitializeHostName, NULL, NULL}; +static char hostname[TCL_HOSTNAME_LEN + 1]; +static int hostnameInited = 0; +TCL_DECLARE_MUTEX(hostMutex) /* *---------------------------------------------------------------------- * - * InitializeHostName -- + * Tcl_GetHostName -- * - * This routine sets the process global value of the name of the local - * host on which the process is running. + * Returns the name of the local host. * * Results: + * A string containing the network name for this machine, or + * an empty string if we can't figure out the name. The caller + * must not modify or free this string. + * + * Side effects: * None. * *---------------------------------------------------------------------- */ -static void -InitializeHostName( - char **valuePtr, - int *lengthPtr, - Tcl_Encoding *encodingPtr) +CONST char * +Tcl_GetHostName() { - CONST char *native = NULL; - #ifndef NO_UNAME struct utsname u; struct hostent *hp; +#else + char buffer[sizeof(hostname)]; +#endif + CONST char *native; - memset(&u, (int) 0, sizeof(struct utsname)); + Tcl_MutexLock(&hostMutex); + if (hostnameInited) { + Tcl_MutexUnlock(&hostMutex); + return hostname; + } + + native = NULL; +#ifndef NO_UNAME + (VOID *) memset((VOID *) &u, (int) 0, sizeof(struct utsname)); if (uname(&u) > -1) { /* INTL: Native. */ - hp = TclpGetHostByName(u.nodename); /* INTL: Native. */ + hp = TclpGetHostByName(u.nodename); /* INTL: Native. */ if (hp == NULL) { /* * Sometimes the nodename is fully qualified, but gets truncated - * as it exceeds SYS_NMLN. See if we can just get the immediate + * as it exceeds SYS_NMLN. See if we can just get the immediate * nodename and get a proper answer that way. */ - char *dot = strchr(u.nodename, '.'); - if (dot != NULL) { char *node = ckalloc((unsigned) (dot - u.nodename + 1)); - memcpy(node, u.nodename, (size_t) (dot - u.nodename)); node[dot - u.nodename] = '\0'; hp = TclpGetHostByName(node); @@ -73,64 +103,25 @@ InitializeHostName( native = u.nodename; } } - if (native == NULL) { - native = tclEmptyStringRep; - } #else /* * Uname doesn't exist; try gethostname instead. - * - * There is no portable macro for the maximum length of host names - * returned by gethostbyname(). We should only trust SYS_NMLN if it is at - * least 255 + 1 bytes to comply with DNS host name limits. - * - * Note: SYS_NMLN is a restriction on "uname" not on gethostbyname! - * - * For example HP-UX 10.20 has SYS_NMLN == 9, while gethostbyname() can - * return a fully qualified name from DNS of up to 255 bytes. - * - * Fix suggested by Viktor Dukhovni (viktor@esm.com) */ -# if defined(SYS_NMLN) && SYS_NMLEN >= 256 - char buffer[SYS_NMLEN]; -# else - char buffer[256]; -# endif - if (gethostname(buffer, sizeof(buffer)) > -1) { /* INTL: Native. */ native = buffer; } #endif - *encodingPtr = Tcl_GetEncoding(NULL, NULL); - *lengthPtr = strlen(native); - *valuePtr = ckalloc((unsigned int) (*lengthPtr)+1); - memcpy(*valuePtr, (void *) native, (size_t)(*lengthPtr)+1); -} - -/* - *---------------------------------------------------------------------- - * - * Tcl_GetHostName -- - * - * Returns the name of the local host. - * - * Results: - * A string containing the network name for this machine, or an empty - * string if we can't figure out the name. The caller must not modify or - * free this string. - * - * Side effects: - * Caches the name to return for future calls. - * - *---------------------------------------------------------------------- - */ - -CONST char * -Tcl_GetHostName(void) -{ - return Tcl_GetString(TclGetProcessGlobalValue(&hostName)); + if (native == NULL) { + hostname[0] = 0; + } else { + Tcl_ExternalToUtf(NULL, NULL, native, -1, 0, NULL, hostname, + sizeof(hostname), NULL, NULL, NULL); + } + hostnameInited = 1; + Tcl_MutexUnlock(&hostMutex); + return hostname; } /* @@ -150,8 +141,8 @@ Tcl_GetHostName(void) */ int -TclpHasSockets( - Tcl_Interp *interp) /* Not used. */ +TclpHasSockets(interp) + Tcl_Interp *interp; /* Not used. */ { return TCL_OK; } @@ -173,15 +164,7 @@ TclpHasSockets( */ void -TclpFinalizeSockets(void) +TclpFinalizeSockets() { return; } - -/* - * Local Variables: - * mode: c - * c-basic-offset: 4 - * fill-column: 78 - * End: - */ |