nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Allow sockets to retrieve their local endpoint info.

Browse Source 
The peer_info method in the Socket vtable is replaced with
endpoint_info, which takes a boolean indicating which end you're
asking about.

sk_peer_info still exists, as a wrapper on the new sk_endpoint_info.
This commit is contained in:
Simon Tatham
2024-06-26 06:47:53 +01:00
parent f454c84a23
commit 23b15dbc77
9 changed files with 61 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
unix/fd-socket.c
View File

@ -315,6 +315,11 @@ static void fdsocket_select_result_input_error(int fd, int event)
}
}
static SocketEndpointInfo *fdsocket_endpoint_info(Socket *s, bool peer)
{
return NULL;
}
static const SocketVtable FdSocket_sockvt = {
.plug = fdsocket_plug,
.close = fdsocket_close,
@ -323,7 +328,7 @@ static const SocketVtable FdSocket_sockvt = {
.write_eof = fdsocket_write_eof,
.set_frozen = fdsocket_set_frozen,
.socket_error = fdsocket_socket_error,
.peer_info = NULL,
.endpoint_info = fdsocket_endpoint_info,
};
static void fdsocket_connect_success_callback(void *ctx)

14
unix/network.c
View File

@ -488,7 +488,7 @@ static size_t sk_net_write(Socket *s, const void *data, size_t len);
static size_t sk_net_write_oob(Socket *s, const void *data, size_t len);
static void sk_net_write_eof(Socket *s);
static void sk_net_set_frozen(Socket *s, bool is_frozen);
static SocketEndpointInfo *sk_net_peer_info(Socket *s);
static SocketEndpointInfo *sk_net_endpoint_info(Socket *s, bool peer);
static const char *sk_net_socket_error(Socket *s);
static const SocketVtable NetSocket_sockvt = {
@ -499,7 +499,7 @@ static const SocketVtable NetSocket_sockvt = {
.write_eof = sk_net_write_eof,
.set_frozen = sk_net_set_frozen,
.socket_error = sk_net_socket_error,
.peer_info = sk_net_peer_info,
.endpoint_info = sk_net_endpoint_info,
};
static Socket *sk_net_accept(accept_ctx_t ctx, Plug *plug)
@ -1494,7 +1494,7 @@ static void sk_net_set_frozen(Socket *sock, bool is_frozen)
uxsel_tell(s);
}
static SocketEndpointInfo *sk_net_peer_info(Socket *sock)
static SocketEndpointInfo *sk_net_endpoint_info(Socket *sock, bool peer)
{
NetSocket *s = container_of(sock, NetSocket, sock);
union sockaddr_union addr;
@ -1504,8 +1504,12 @@ static SocketEndpointInfo *sk_net_peer_info(Socket *sock)
#endif
SocketEndpointInfo *pi;
if (getpeername(s->s, &addr.sa, &addrlen) < 0)
return NULL;
{
int retd = (peer ? getpeername(s->s, &addr.sa, &addrlen) :
getsockname(s->s, &addr.sa, &addrlen));
if (retd < 0)
return NULL;
}
pi = snew(SocketEndpointInfo);
pi->addressfamily = ADDRTYPE_UNSPEC;