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

Pass the calling Socket to plug_log.

Browse Source 
This enables plug_log to run query methods on the socket in order to
find out useful information to log. I don't expect it's sensible to do
anything else with it.
This commit is contained in:
Simon Tatham
2024-06-26 08:29:39 +01:00
parent 23b15dbc77
commit c1d9da67a2
27 changed files with 94 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
windows/handle-socket.c
View File

@ -107,7 +107,7 @@ static size_t handle_stderr(
HandleSocket *hs = (HandleSocket *)handle_get_privdata(h);
if (!err && len > 0)
log_proxy_stderr(hs->plug, &hs->psb, data, len);
log_proxy_stderr(hs->plug, &hs->sock, &hs->psb, data, len);
return 0;
}
@ -354,7 +354,8 @@ static const SocketVtable HandleSocket_sockvt = {
static void sk_handle_connect_success_callback(void *ctx)
{
HandleSocket *hs = (HandleSocket *)ctx;
plug_log(hs->plug, PLUGLOG_CONNECT_SUCCESS, hs->addr, hs->port, NULL, 0);
plug_log(hs->plug, &hs->sock, PLUGLOG_CONNECT_SUCCESS, hs->addr, hs->port,
NULL, 0);
}
Socket *make_handle_socket(HANDLE send_H, HANDLE recv_H, HANDLE stderr_H,

2
windows/named-pipe-server.c
View File

@ -176,7 +176,7 @@ static void named_pipe_accept_loop(NamedPipeServerSocket *ps,
errmsg = dupprintf("Error while listening to named pipe: %s",
win_strerror(error));
plug_log(ps->plug, 1, sk_namedpipe_addr(ps->pipename), 0,
plug_log(ps->plug, &ps->sock, 1, sk_namedpipe_addr(ps->pipename), 0,
errmsg, error);
sfree(errmsg);
break;

12
windows/network.c
View File

@ -904,7 +904,7 @@ static DWORD try_connect(NetSocket *sock)
{
SockAddr thisaddr = sk_extractaddr_tmp(
sock->addr, &sock->step);
plug_log(sock->plug, PLUGLOG_CONNECT_TRYING,
plug_log(sock->plug, &sock->sock, PLUGLOG_CONNECT_TRYING,
&thisaddr, sock->port, NULL, 0);
}
@ -1065,7 +1065,7 @@ static DWORD try_connect(NetSocket *sock)
*/
sock->writable = true;
SockAddr thisaddr = sk_extractaddr_tmp(sock->addr, &sock->step);
plug_log(sock->plug, PLUGLOG_CONNECT_SUCCESS,
plug_log(sock->plug, &sock->sock, PLUGLOG_CONNECT_SUCCESS,
&thisaddr, sock->port, NULL, 0);
}
@ -1081,7 +1081,7 @@ static DWORD try_connect(NetSocket *sock)
if (err) {
SockAddr thisaddr = sk_extractaddr_tmp(
sock->addr, &sock->step);
plug_log(sock->plug, PLUGLOG_CONNECT_FAILED,
plug_log(sock->plug, &sock->sock, PLUGLOG_CONNECT_FAILED,
&thisaddr, sock->port, sock->error, err);
}
return err;
@ -1578,8 +1578,8 @@ void select_result(WPARAM wParam, LPARAM lParam)
if (s->addr) {
SockAddr thisaddr = sk_extractaddr_tmp(
s->addr, &s->step);
plug_log(s->plug, PLUGLOG_CONNECT_FAILED, &thisaddr, s->port,
winsock_error_string(err), err);
plug_log(s->plug, &s->sock, PLUGLOG_CONNECT_FAILED, &thisaddr,
s->port, winsock_error_string(err), err);
while (err && s->addr && sk_nextaddr(s->addr, &s->step)) {
err = try_connect(s);
}
@ -1604,7 +1604,7 @@ void select_result(WPARAM wParam, LPARAM lParam)
if (s->addr) {
SockAddr thisaddr = sk_extractaddr_tmp(
s->addr, &s->step);
plug_log(s->plug, PLUGLOG_CONNECT_SUCCESS,
plug_log(s->plug, &s->sock, PLUGLOG_CONNECT_SUCCESS,
&thisaddr, s->port, NULL, 0);
sk_addr_free(s->addr);