1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00

Add a Socket implementation which just holds an error message.

This isn't yet used, but I plan to use it in situations where you have
to report errors by returning a valid Socket on which the client wlil
call sk_socket_error, but in fact you notice the error _before_
instantiating your usual kind of Socket. The resulting Socket is
usable for nothing except reading out the error string and closing it.

[originally from svn r10065]
This commit is contained in:
Simon Tatham 2013-11-17 14:03:36 +00:00
parent 0bc76b8252
commit a6139c1ad3
3 changed files with 90 additions and 2 deletions

4
Recipe
View File

@ -300,7 +300,7 @@ SSH = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf
+ sshdh sshcrcda sshpubk sshzlib sshdss x11fwd portfwd
+ sshaes sshsh256 sshsh512 sshbn wildcard pinger ssharcf
+ sshgssc pgssapi
WINSSH = SSH winnoise winpgntc wingss
WINSSH = SSH winnoise winpgntc wingss errsock
UXSSH = SSH uxnoise uxagentc uxgss
# SFTP implementation (pscp, psftp).
@ -310,7 +310,7 @@ SFTP = sftp int64 logging
# Pageant or PuTTYgen).
MISC = timing callback misc version settings tree234 proxy conf
WINMISC = MISC winstore winnet winhandl cmdline windefs winmisc winproxy
+ wintime
+ wintime errsock
UXMISC = MISC uxstore uxsel uxnet cmdline uxmisc uxproxy time
OSXMISC = MISC uxstore uxsel osxsel uxnet uxmisc uxproxy time

82
errsock.c Normal file
View File

@ -0,0 +1,82 @@
/*
* A dummy Socket implementation which just holds an error message.
*/
#include <stdio.h>
#include <assert.h>
#define DEFINE_PLUG_METHOD_MACROS
#include "tree234.h"
#include "putty.h"
#include "network.h"
typedef struct Socket_error_tag *Error_Socket;
struct Socket_error_tag {
const struct socket_function_table *fn;
/* the above variable absolutely *must* be the first in this structure */
char *error;
Plug plug;
void *privptr;
};
static Plug sk_error_plug(Socket s, Plug p)
{
Error_Socket ps = (Error_Socket) s;
Plug ret = ps->plug;
if (p)
ps->plug = p;
return ret;
}
static void sk_error_close(Socket s)
{
Error_Socket ps = (Error_Socket) s;
sfree(ps->error);
sfree(ps);
}
static void sk_error_set_private_ptr(Socket s, void *ptr)
{
Error_Socket ps = (Error_Socket) s;
ps->privptr = ptr;
}
static void *sk_error_get_private_ptr(Socket s)
{
Error_Socket ps = (Error_Socket) s;
return ps->privptr;
}
static const char *sk_error_socket_error(Socket s)
{
Error_Socket ps = (Error_Socket) s;
return ps->error;
}
Socket new_error_socket(const char *errmsg, Plug plug)
{
static const struct socket_function_table socket_fn_table = {
sk_error_plug,
sk_error_close,
NULL /* write */,
NULL /* write_oob */,
NULL /* write_eof */,
NULL /* flush */,
sk_error_set_private_ptr,
sk_error_get_private_ptr,
NULL /* set_frozen */,
sk_error_socket_error
};
Error_Socket ret;
ret = snew(struct Socket_error_tag);
ret->fn = &socket_fn_table;
ret->plug = plug;
ret->error = dupstr(errmsg);
return (Socket) ret;
}

View File

@ -205,6 +205,12 @@ int net_service_lookup(char *service);
*/
char *get_hostname(void);
/*
* Trivial socket implementation which just stores an error. Found in
* errsock.c.
*/
Socket new_error_socket(const char *errmsg, Plug plug);
/********** SSL stuff **********/
/*