Introduce and apply krb5_storage_from_socket

On Windows a file descriptor is an int value allocated by the
local module instance of the C Run Time Library.  A socket handle is a
SOCKET value allocated by a Winsock Provider for the requested family and
protocol.   These two values cannot be mixed and there is no mechanism for
converting between the two.   The _get_osfhandle() and _open_osfhandle()
functions can work with a standard HANDLE (file, pipe, etc) but cannot be
used for a SOCKET.

The Heimdal krb5_storage_from_fd() routine counted on the osf conversion
functions working on SOCKET values.  Since they do not any attempt to call
krb5_storage_from_fd() on a socket resulted in an assertion being thrown
by the C RTL.

Another problem is SOCKET value truncation when storing a 64-bit value
into a 32-bit int.

To address these problems a new krb5_storage_from_socket() routine is
introduced.  This routine setups a krb5_storage that stores a socket value
as a rk_socket_t and provides a set of helper routines that always use
network ready functions.

The krb5_storage_from_fd() routines no longer use net_read() and
net_write() but provide helpers that follow their logic so that pipes can
be processed.

All call sites that allocate a socket now store the socket as rk_socket_t
and call krb5_storage_from_socket().

All locations that previously called the bare close() on a socket value
now call rk_closesocket().

Change-Id: I045f775b2a5dbf5cf803751409490bc27fffe597

appl/gssmask/gssmaestro.c

@@ -270,26 +270,27 @@ wait_log(struct client *c)
     int32_t port;
     struct sockaddr_storage sast;
     socklen_t salen = sizeof(sast);
-    int fd, fd2, ret;
+    krb5_socket_t sock, sock2;
+    int ret;
 
     memset(&sast, 0, sizeof(sast));
 
     assert(sizeof(sast) >= c->salen);
 
-    fd = socket(c->sa->sa_family, SOCK_STREAM, 0);
-    if (fd < 0)
+    sock = socket(c->sa->sa_family, SOCK_STREAM, 0);
+    if (sock == rk_INVALID_SOCKET)
 	err(1, "failed to build socket for %s's logging port", c->moniker);
 
     sast.ss_family = c->sa->sa_family;
-    ret = bind(fd, (struct sockaddr *)&sast, c->salen);
+    ret = bind(sock, (struct sockaddr *)&sast, c->salen);
     if (ret < 0)
 	err(1, "failed to bind %s's logging port", c->moniker);
 
-    if (listen(fd, SOMAXCONN) < 0)
+    if (listen(sock, SOMAXCONN) < 0)
 	err(1, "failed to listen %s's logging port", c->moniker);
 
     salen = sizeof(sast);
-    ret = getsockname(fd, (struct sockaddr *)&sast, &salen);
+    ret = getsockname(sock, (struct sockaddr *)&sast, &salen);
     if (ret < 0)
 	err(1, "failed to get address of local socket for %s", c->moniker);
 
@@ -299,12 +300,12 @@ wait_log(struct client *c)
     put32(c, ntohs(port));
 
     salen = sizeof(sast);
-    fd2 = accept(fd, (struct sockaddr *)&sast, &salen);
-    if (fd2 < 0)
+    sock2 = accept(sock, (struct sockaddr *)&sast, &salen);
+    if (sock2 == rk_INVALID_SOCKET)
 	err(1, "failed to accept local socket for %s", c->moniker);
-    close(fd);
+    rk_closesocket(sock);
 
-    return fd2;
+    return sock2;
 }
 
 
@@ -610,7 +611,8 @@ connect_client(const char *slave)
     char *name, *port;
     struct client *c = ecalloc(1, sizeof(*c));
     struct addrinfo hints, *res0, *res;
-    int ret, fd;
+    int ret;
+    krb5_socket_t sock;
 
     name = estrdup(slave);
     port = strchr(name, ':');
@@ -628,13 +630,13 @@ connect_client(const char *slave)
     if (ret)
 	errx(1, "error resolving %s", name);
 
-    for (res = res0, fd = -1; res; res = res->ai_next) {
-	fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
-	if (fd < 0)
+    for (res = res0, sock = rk_INVALID_SOCKET; res; res = res->ai_next) {
+	sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+	if (sock == rk_INVALID_SOCKET)
 	    continue;
-	if (connect(fd, res->ai_addr, res->ai_addrlen) < 0) {
-	    close(fd);
-	    fd = -1;
+	if (connect(sock, res->ai_addr, res->ai_addrlen) < 0) {
+	    rk_closesocket(sock);
+	    sock = rk_INVALID_SOCKET;
 	    continue;
 	}
 	c->sa = ecalloc(1, res->ai_addrlen);
@@ -642,12 +644,12 @@ connect_client(const char *slave)
 	c->salen = res->ai_addrlen;
 	break;  /* okay we got one */
     }
-    if (fd < 0)
+    if (sock == rk_INVALID_SOCKET)
 	err(1, "connect to host: %s", name);
     freeaddrinfo(res);
 
-    c->sock = krb5_storage_from_fd(fd);
-    close(fd);
+    c->sock = krb5_storage_from_socket(sock);
+    rk_closesocket(sock);
     if (c->sock == NULL)
 	errx(1, "krb5_storage_from_fd");
 
@@ -669,10 +671,10 @@ connect_client(const char *slave)
     if (logfile) {
 	printf("starting log socket to client %s\n", c->moniker);
 
-	fd = wait_log(c);
+	sock = wait_log(c);
 
-	c->logsock = krb5_storage_from_fd(fd);
-	close(fd);
+	c->logsock = krb5_storage_from_socket(sock);
+	rk_closesocket(sock);
 	if (c->logsock == NULL)
 	    errx(1, "failed to create log krb5_storage");
 #ifdef ENABLE_PTHREAD_SUPPORT

appl/gssmask/gssmask.c

@@ -687,7 +687,8 @@ static int
 HandleOP(SetLoggingSocket)
 {
     int32_t portnum;
-    int fd, ret;
+    krb5_socket_t sock;
+    int ret;
 
     ret32(c, portnum);
 
@@ -696,22 +697,22 @@ HandleOP(SetLoggingSocket)
 
     socket_set_port((struct sockaddr *)(&c->sa), htons(portnum));
 
-    fd = socket(((struct sockaddr *)&c->sa)->sa_family, SOCK_STREAM, 0);
-    if (fd < 0)
+    sock = socket(((struct sockaddr *)&c->sa)->sa_family, SOCK_STREAM, 0);
+    if (sock == rk_INVALID_SOCKET)
 	return 0;
 
-    ret = connect(fd, (struct sockaddr *)&c->sa, c->salen);
+    ret = connect(sock, (struct sockaddr *)&c->sa, c->salen);
     if (ret < 0) {
 	logmessage(c, __FILE__, __LINE__, 0, "failed connect to log port: %s",
 		   strerror(errno));
-	close(fd);
+	rk_closesocket(sock);
 	return 0;
     }
 
     if (c->logging)
 	krb5_storage_free(c->logging);
-    c->logging = krb5_storage_from_fd(fd);
-    close(fd);
+    c->logging = krb5_storage_from_socket(sock);
+    rk_closesocket(sock);
 
     krb5_store_int32(c->logging, eLogSetMoniker);
     store_string(c->logging, c->moniker);
@@ -1087,7 +1088,7 @@ find_op(int32_t op)
 }
 
 static struct client *
-create_client(int fd, int port, const char *moniker)
+create_client(krb5_socket_t sock, int port, const char *moniker)
 {
     struct client *c;
     int ret;
@@ -1109,18 +1110,18 @@ create_client(int fd, int port, const char *moniker)
 
     {
 	c->salen = sizeof(c->sa);
-	getpeername(fd, (struct sockaddr *)&c->sa, &c->salen);
+	getpeername(sock, (struct sockaddr *)&c->sa, &c->salen);
 
 	getnameinfo((struct sockaddr *)&c->sa, c->salen,
 		    c->servername, sizeof(c->servername),
 		    NULL, 0, NI_NUMERICHOST);
     }
 
-    c->sock = krb5_storage_from_fd(fd);
+    c->sock = krb5_storage_from_socket(sock);
     if (c->sock == NULL)
-	errx(1, "krb5_storage_from_fd");
+	errx(1, "krb5_storage_from_socket");
 
-    close(fd);
+    rk_closesocket(sock);
 
     return c;
 }