nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 11:32:48 -05:00
Code Issues Projects Releases Wiki Activity

Overhaul of client-side XDM-AUTHORIZATION-1:

Browse Source 
* Make sk_getxdmdata() return an arbitrary string rather than two integers.
  This better matches the spec, even if the current version always returns
  six bytes
* On Unix, for PF_UNIX sockets, return a counter rather than a constant along
  with the PID.  This should allow multiple clients to connect within one
  second, and is what Xlib does.
* On Unix, interpret AF_INET6 addresses like Xlib does, returning the
  embedded IPv4 address for v4-mapped addresses, and six bytes of zeroes
  otherwise.  The latter is silly, but if I'm going to do anything more sane
  I need to check that X servers won't reject it.

[originally from svn r5219]
This commit is contained in:
Ben Harris
2005-01-28 11:39:45 +00:00
parent 5e35aa383a
commit 865fbaa8ce
5 changed files with 62 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unix/unix.h
View File

@ -126,7 +126,7 @@ int init_ucs(struct unicode_data *ucsdata, char *line_codepage,
/*
* Spare function exported directly from uxnet.c.
*/
int sk_getxdmdata(void *sock, unsigned long *ip, int *port);
void *sk_getxdmdata(void *sock, int *lenp);
/*
* General helpful Unix stuff: more helpful version of the FD_SET

61
unix/uxnet.c
View File

@ -811,42 +811,73 @@ static void sk_tcp_close(Socket sock)
sfree(s);
}
int sk_getxdmdata(void *sock, unsigned long *ip, int *port)
#define PUT_32BIT_MSB_FIRST(cp, value) ( \
(cp)[0] = (char)((value) >> 24), \
(cp)[1] = (char)((value) >> 16), \
(cp)[2] = (char)((value) >> 8), \
(cp)[3] = (char)(value) )
#define PUT_16BIT_MSB_FIRST(cp, value) ( \
(cp)[0] = (char)((value) >> 8), \
(cp)[1] = (char)(value) )
void *sk_getxdmdata(void *sock, int *lenp)
{
Actual_Socket s = (Actual_Socket) sock;
#ifdef NO_IPV6
struct sockaddr_in addr;
#else
struct sockaddr_storage addr;
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&addr;
#endif
struct sockaddr *sa = (struct sockaddr *)&addr;
struct sockaddr_in *sin = (struct sockaddr_in *)&addr;
socklen_t addrlen;
char *buf;
static unsigned int unix_addr = 0xFFFFFFFF;
/*
* We must check that this socket really _is_ an Actual_Socket.
*/
if (s->fn != &tcp_fn_table)
return 0; /* failure */
return NULL; /* failure */
addrlen = sizeof(addr);
if (getsockname(s->s, (struct sockaddr *)&addr, &addrlen) < 0)
return 0;
switch(addr.sin_family) {
if (getsockname(s->s, sa, &addrlen) < 0)
return NULL;
switch(sa->sa_family) {
case AF_INET:
*ip = ntohl(addr.sin_addr.s_addr);
*port = ntohs(addr.sin_port);
*lenp = 6;
buf = snewn(*lenp, char);
PUT_32BIT_MSB_FIRST(buf, ntohl(sin->sin_addr.s_addr));
PUT_16BIT_MSB_FIRST(buf+4, ntohs(sin->sin_port));
break;
#ifndef NO_IPV6
case AF_INET6:
*lenp = 6;
buf = snewn(*lenp, char);
if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
memcpy(buf, sin6->sin6_addr.s6_addr + 12, 4);
PUT_16BIT_MSB_FIRST(buf+4, ntohs(sin6->sin6_port));
} else
/* This is stupid, but it's what XLib does. */
memset(buf, 0, 6);
break;
#endif
case AF_UNIX:
/*
* For a Unix socket, we return 0xFFFFFFFF for the IP address and
* our current pid for the port. Bizarre, but such is life.
*/
*ip = ntohl(0xFFFFFFFF);
*port = getpid();
*lenp = 6;
buf = snewn(*lenp, char);
PUT_32BIT_MSB_FIRST(buf, unix_addr--);
PUT_16BIT_MSB_FIRST(buf+4, getpid());
break;
/* XXX IPV6 */
default:
return 0;
return NULL;
}
return 1;
return buf;
}
/*