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
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user