mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-08 08:58:00 +00:00
807ed08da0
In the previous few commits I noticed some repeated work in the form of pointless empty implementations of Plug's log method, plus some existing (and some new) empty cases of Socket's endpoint_info. As a cleanup, I'm replacing as many as I can find with uses of a central null implementation in the stubs directory.
70 lines
1.4 KiB
C
70 lines
1.4 KiB
C
/*
|
|
* A dummy Socket implementation which just holds an error message.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <assert.h>
|
|
|
|
#include "tree234.h"
|
|
#include "putty.h"
|
|
#include "network.h"
|
|
|
|
typedef struct {
|
|
char *error;
|
|
Plug *plug;
|
|
|
|
Socket sock;
|
|
} ErrorSocket;
|
|
|
|
static Plug *sk_error_plug(Socket *s, Plug *p)
|
|
{
|
|
ErrorSocket *es = container_of(s, ErrorSocket, sock);
|
|
Plug *ret = es->plug;
|
|
if (p)
|
|
es->plug = p;
|
|
return ret;
|
|
}
|
|
|
|
static void sk_error_close(Socket *s)
|
|
{
|
|
ErrorSocket *es = container_of(s, ErrorSocket, sock);
|
|
|
|
sfree(es->error);
|
|
sfree(es);
|
|
}
|
|
|
|
static const char *sk_error_socket_error(Socket *s)
|
|
{
|
|
ErrorSocket *es = container_of(s, ErrorSocket, sock);
|
|
return es->error;
|
|
}
|
|
|
|
static const SocketVtable ErrorSocket_sockvt = {
|
|
.plug = sk_error_plug,
|
|
.close = sk_error_close,
|
|
.socket_error = sk_error_socket_error,
|
|
.endpoint_info = nullsock_endpoint_info,
|
|
/* other methods are NULL */
|
|
};
|
|
|
|
Socket *new_error_socket_consume_string(Plug *plug, char *errmsg)
|
|
{
|
|
ErrorSocket *es = snew(ErrorSocket);
|
|
es->sock.vt = &ErrorSocket_sockvt;
|
|
es->plug = plug;
|
|
es->error = errmsg;
|
|
return &es->sock;
|
|
}
|
|
|
|
Socket *new_error_socket_fmt(Plug *plug, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
char *msg;
|
|
|
|
va_start(ap, fmt);
|
|
msg = dupvprintf(fmt, ap);
|
|
va_end(ap);
|
|
|
|
return new_error_socket_consume_string(plug, msg);
|
|
}
|