1 files changed, 68 insertions, 29 deletions

diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
index c5b7d28..6abfa60 100644
--- a/generic/tclIOSock.c
+++ b/generic/tclIOSock.c
@@ -12,16 +12,21 @@
 #include "tclInt.h"
 
 #if defined(_WIN32) && defined(UNICODE)
-/* On Windows, we need to do proper Unicode->UTF-8 conversion. */
+/*
+ * On Windows, we need to do proper Unicode->UTF-8 conversion.
+ */
 
-typedef struct ThreadSpecificData {
+typedef struct {
     int initialized;
     Tcl_DString errorMsg; /* UTF-8 encoded error-message */
 } ThreadSpecificData;
 static Tcl_ThreadDataKey dataKey;
 
 #undef gai_strerror
-static const char *gai_strerror(int code) {
+static const char *
+gai_strerror(
+    int code)
+{
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
     if (tsdPtr->initialized) {
@@ -56,8 +61,8 @@ static const char *gai_strerror(int code) {
 int
 TclSockGetPort(
     Tcl_Interp *interp,
-    const char *string, /* Integer or service name */
-    const char *proto, /* "tcp" or "udp", typically */
+    const char *string,		/* Integer or service name */
+    const char *proto,		/* "tcp" or "udp", typically */
     int *portPtr)		/* Return port number */
 {
     struct servent *sp;		/* Protocol info for named services */
@@ -126,7 +131,7 @@ TclSockMinimumBuffers(
     }
     len = sizeof(int);
     getsockopt((SOCKET)(size_t) sock, SOL_SOCKET, SO_RCVBUF,
-		(char *) &current, &len);
+	    (char *) &current, &len);
     if (current < size) {
 	len = sizeof(int);
 	setsockopt((SOCKET)(size_t) sock, SOL_SOCKET, SO_RCVBUF,
@@ -154,15 +159,15 @@ TclSockMinimumBuffers(
 
 int
 TclCreateSocketAddress(
-    Tcl_Interp *interp,                 /* Interpreter for querying
-					 * the desired socket family */
-    struct addrinfo **addrlist,		/* Socket address list */
-    const char *host,			/* Host. NULL implies INADDR_ANY */
-    int port,				/* Port number */
-    int willBind,			/* Is this an address to bind() to or
-					 * to connect() to? */
-    const char **errorMsgPtr)		/* Place to store the error message
-					 * detail, if available. */
+    Tcl_Interp *interp,		/* Interpreter for querying the desired socket
+				 * family */
+    struct addrinfo **addrlist,	/* Socket address list */
+    const char *host,		/* Host. NULL implies INADDR_ANY */
+    int port,			/* Port number */
+    int willBind,		/* Is this an address to bind() to or to
+				 * connect() to? */
+    const char **errorMsgPtr)	/* Place to store the error message detail, if
+				 * available. */
 {
     struct addrinfo hints;
     struct addrinfo *p;
@@ -181,30 +186,31 @@ TclCreateSocketAddress(
      * Workaround for OSX's apparent inability to resolve "localhost", "0"
      * when the loopback device is the only available network interface.
      */
+
     if (host != NULL && port == 0) {
-        portstring = NULL;
+	portstring = NULL;
     } else {
-        TclFormatInt(portbuf, port);
-        portstring = portbuf;
+	TclFormatInt(portbuf, port);
+	portstring = portbuf;
     }
 
     (void) memset(&hints, 0, sizeof(hints));
     hints.ai_family = AF_UNSPEC;
 
     /*
-     * Magic variable to enforce a certain address family - to be superseded
-     * by a TIP that adds explicit switches to [socket]
+     * Magic variable to enforce a certain address family; to be superseded
+     * by a TIP that adds explicit switches to [socket].
      */
 
     if (interp != NULL) {
-        family = Tcl_GetVar(interp, "::tcl::unsupported::socketAF", 0);
-        if (family != NULL) {
-            if (strcmp(family, "inet") == 0) {
-                hints.ai_family = AF_INET;
-            } else if (strcmp(family, "inet6") == 0) {
-                hints.ai_family = AF_INET6;
-            }
-        }
+	family = Tcl_GetVar2(interp, "::tcl::unsupported::socketAF", NULL, 0);
+	if (family != NULL) {
+	    if (strcmp(family, "inet") == 0) {
+		hints.ai_family = AF_INET;
+	    } else if (strcmp(family, "inet6") == 0) {
+		hints.ai_family = AF_INET6;
+	    }
+	}
     }
 
     hints.ai_socktype = SOCK_STREAM;
@@ -214,7 +220,7 @@ TclCreateSocketAddress(
      * We found some problems when using AI_ADDRCONFIG, e.g. on systems that
      * have no networking besides the loopback interface and want to resolve
      * localhost. See [Bugs 3385024, 3382419, 3382431]. As the advantage of
-     * using AI_ADDRCONFIG in situations where it works, is probably low,
+     * using AI_ADDRCONFIG is probably low even in situations where it works,
      * we'll leave it out for now. After all, it is just an optimisation.
      *
      * Missing on: OpenBSD, NetBSD.
@@ -251,6 +257,7 @@ TclCreateSocketAddress(
      *
      * There might be more elegant/efficient ways to do this.
      */
+
     if (willBind) {
 	for (p = *addrlist; p != NULL; p = p->ai_next) {
 	    if (p->ai_family == AF_INET) {
@@ -283,6 +290,38 @@ TclCreateSocketAddress(
 }
 
 /*
+ *----------------------------------------------------------------------
+ *
+ * Tcl_OpenTcpServer --
+ *
+ *	Opens a TCP server socket and creates a channel around it.
+ *
+ * Results:
+ *	The channel or NULL if failed. If an error occurred, an error message
+ *	is left in the interp's result if interp is not NULL.
+ *
+ * Side effects:
+ *	Opens a server socket and creates a new channel.
+ *
+ *----------------------------------------------------------------------
+ */
+
+Tcl_Channel
+Tcl_OpenTcpServer(
+    Tcl_Interp *interp,
+    int port,
+    const char *host,
+    Tcl_TcpAcceptProc *acceptProc,
+    ClientData callbackData)
+{
+    char portbuf[TCL_INTEGER_SPACE];
+
+    TclFormatInt(portbuf, port);
+    return Tcl_OpenTcpServerEx(interp, portbuf, host, TCL_TCPSERVER_REUSEADDR,
+	    acceptProc, callbackData);
+}
+
+/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4