зеркало из https://github.com/github/putty.git
Second work-in-progress MacTCP commit. We can now open a connection, but
not transfer any data across it. [originally from svn r2456]
This commit is contained in:
Ben Harris
Родитель
907a420878
Коммит
ac85d9b8c9
22
mac/mac.c
22
mac/mac.c
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: mac.c,v 1.17 2003/01/04 12:45:11 ben Exp $ */
|
||||
/* $Id: mac.c,v 1.18 2003/01/05 10:52:56 ben Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1999 Ben Harris
|
||||
* All rights reserved.
|
||||
|
|
@ -167,6 +167,8 @@ static void mac_startup(void) {
|
|||
DisposeHandle((Handle)ti);
|
||||
}
|
||||
|
||||
mactcp_init();
|
||||
|
||||
/* We've been tested with the Appearance Manager */
|
||||
if (mac_gestalts.apprvers != 0)
|
||||
RegisterAppearanceClient();
|
||||
|
|
@ -182,6 +184,9 @@ static void mac_startup(void) {
|
|||
windows.about = NULL;
|
||||
windows.licence = NULL;
|
||||
|
||||
default_protocol = DEFAULT_PROTOCOL;
|
||||
default_port = DEFAULT_PORT;
|
||||
|
||||
{
|
||||
short vol;
|
||||
long dirid;
|
||||
|
|
@ -597,6 +602,7 @@ static void mac_shutdown(void) {
|
|||
if (mac_gestalts.encvvers != 0)
|
||||
TerminateUnicodeConverter();
|
||||
#endif
|
||||
mactcp_shutdown();
|
||||
exit(0);
|
||||
}
|
||||
|
||||
|
|
@ -626,6 +632,20 @@ void modalfatalbox(char *fmt, ...) {
|
|||
exit(1);
|
||||
}
|
||||
|
||||
/* This should only kill the current session, not the whole application. */
|
||||
void connection_fatal(void *fontend, char *fmt, ...) {
|
||||
va_list ap;
|
||||
Str255 stuff;
|
||||
|
||||
va_start(ap, fmt);
|
||||
/* We'd like stuff to be a Pascal string */
|
||||
stuff[0] = vsprintf((char *)(&stuff[1]), fmt, ap);
|
||||
va_end(ap);
|
||||
ParamText(stuff, NULL, NULL, NULL);
|
||||
StopAlert(128, NULL);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Local Variables:
|
||||
* c-file-style: "simon"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ typedef void *Context; /* FIXME */
|
|||
*/
|
||||
#define SEL_NL { 0x2028 }
|
||||
|
||||
|
||||
#include <MacTypes.h>
|
||||
#include <Events.h> /* Timing related goo */
|
||||
|
||||
#define GETTICKCOUNT TickCount
|
||||
|
|
@ -21,7 +21,8 @@ typedef void *Context; /* FIXME */
|
|||
#define DEFAULT_CODEPAGE 0 /* FIXME: no idea how to do this */
|
||||
|
||||
#define WCHAR wchar_t
|
||||
#define BYTE unsigned char
|
||||
#define BYTE UInt8
|
||||
#define DWORD UInt32
|
||||
|
||||
#define OPTIMISE_SCROLL
|
||||
|
||||
|
|
@ -29,3 +30,6 @@ typedef void *Context; /* FIXME */
|
|||
|
||||
#include <stdarg.h>
|
||||
extern int vsnprintf(char *, size_t, char const *, va_list);
|
||||
|
||||
extern int stricmp(char const *, char const *);
|
||||
extern int strnicmp(char const *, char const *, size_t);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: macterm.c,v 1.33 2003/01/04 00:48:13 ben Exp $ */
|
||||
/* $Id: macterm.c,v 1.34 2003/01/05 10:52:56 ben Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1999 Simon Tatham
|
||||
* Copyright (c) 1999, 2002 Ben Harris
|
||||
|
|
@ -143,6 +143,7 @@ void mac_opensession(void) {
|
|||
StandardFileReply sfr;
|
||||
static const OSType sftypes[] = { 'Sess', 0, 0, 0 };
|
||||
void *sesshandle;
|
||||
int i;
|
||||
|
||||
s = smalloc(sizeof(*s));
|
||||
memset(s, 0, sizeof(*s));
|
||||
|
|
@ -154,7 +155,20 @@ void mac_opensession(void) {
|
|||
if (sesshandle == NULL) goto fail;
|
||||
load_open_settings(sesshandle, TRUE, &s->cfg);
|
||||
close_settings_r(sesshandle);
|
||||
s->back = &loop_backend;
|
||||
|
||||
/*
|
||||
* Select protocol. This is farmed out into a table in a
|
||||
* separate file to enable an ssh-free variant.
|
||||
*/
|
||||
s->back = NULL;
|
||||
for (i = 0; backends[i].backend != NULL; i++)
|
||||
if (backends[i].protocol == cfg.protocol) {
|
||||
s->back = backends[i].backend;
|
||||
break;
|
||||
}
|
||||
if (s->back == NULL) {
|
||||
fatalbox("Unsupported protocol number found");
|
||||
}
|
||||
mac_startsession(s);
|
||||
return;
|
||||
|
||||
|
|
@ -167,6 +181,7 @@ void mac_startsession(Session *s)
|
|||
{
|
||||
UInt32 starttime;
|
||||
char msg[128];
|
||||
char *errmsg;
|
||||
|
||||
/* XXX: Own storage management? */
|
||||
if (HAVE_COLOR_QD())
|
||||
|
|
@ -177,10 +192,21 @@ void mac_startsession(Session *s)
|
|||
s->scrollbar = GetNewControl(cVScroll, s->window);
|
||||
s->term = term_init(&s->cfg, s);
|
||||
|
||||
mac_initfont(s);
|
||||
mac_initpalette(s);
|
||||
if (HAVE_COLOR_QD()) {
|
||||
/* Set to FALSE to not get palette updates in the background. */
|
||||
SetPalette(s->window, s->palette, TRUE);
|
||||
ActivatePalette(s->window);
|
||||
}
|
||||
|
||||
s->logctx = log_init(s);
|
||||
term_provide_logctx(s->term, s->logctx);
|
||||
|
||||
s->back->init(s->term, &s->backhandle, "localhost", 23, &s->realhost, 0);
|
||||
errmsg = s->back->init(s->term, &s->backhandle, s->cfg.host, s->cfg.port,
|
||||
&s->realhost, s->cfg.tcp_nodelay);
|
||||
if (errmsg != NULL)
|
||||
inbuf_putstr(s, errmsg);
|
||||
s->back->provide_logctx(s->backhandle, s->logctx);
|
||||
|
||||
term_provide_resize_fn(s->term, s->back->size, s->backhandle);
|
||||
|
|
@ -191,13 +217,6 @@ void mac_startsession(Session *s)
|
|||
s->ldisc = ldisc_create(&s->cfg, s->term, s->back, s->backhandle, s);
|
||||
ldisc_send(s->ldisc, NULL, 0, 0);/* cause ldisc to notice changes */
|
||||
|
||||
mac_initfont(s);
|
||||
mac_initpalette(s);
|
||||
if (HAVE_COLOR_QD()) {
|
||||
/* Set to FALSE to not get palette updates in the background. */
|
||||
SetPalette(s->window, s->palette, TRUE);
|
||||
ActivatePalette(s->window);
|
||||
}
|
||||
ShowWindow(s->window);
|
||||
starttime = TickCount();
|
||||
display_resource(s, 'pTST', 128);
|
||||
|
|
@ -1490,7 +1509,7 @@ void do_scroll(void *frontend, int topline, int botline, int lines) {
|
|||
|
||||
void logevent(void *frontend, char *str) {
|
||||
|
||||
/* XXX Do something */
|
||||
fprintf(stderr, "%s\n", str);
|
||||
}
|
||||
|
||||
/* Dummy routine, only required in plink. */
|
||||
|
|
|
|||
259
mac/mtcpnet.c
259
mac/mtcpnet.c
|
|
@ -144,6 +144,23 @@ enum { uppAddrToStrProcInfo = kCStackBased
|
|||
struct Socket_tag {
|
||||
struct socket_function_table *fn;
|
||||
/* the above variable absolutely *must* be the first in this structure */
|
||||
StreamPtr s;
|
||||
OSErr err;
|
||||
Plug plug;
|
||||
void *private_ptr;
|
||||
bufchain output_data;
|
||||
int connected;
|
||||
int writable;
|
||||
int frozen; /* this causes readability notifications to be ignored */
|
||||
int frozen_readable; /* this means we missed at least one readability
|
||||
* notification while we were frozen */
|
||||
int localhost_only; /* for listening sockets */
|
||||
char oobdata[1];
|
||||
int sending_oob;
|
||||
int oobpending; /* is there OOB data available to read? */
|
||||
int oobinline;
|
||||
int pending_error; /* in case send() returns error */
|
||||
int listener;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -170,6 +187,15 @@ static struct {
|
|||
} mactcp;
|
||||
|
||||
static pascal void mactcp_lookupdone(struct hostInfo *hi, char *cookie);
|
||||
static Plug mactcp_plug(Socket, Plug);
|
||||
static void mactcp_flush(Socket);
|
||||
static void mactcp_close(Socket);
|
||||
static int mactcp_write(Socket, char *, int);
|
||||
static int mactcp_write_oob(Socket, char *, int);
|
||||
static void mactcp_set_private_ptr(Socket, void *);
|
||||
static void *mactcp_get_private_ptr(Socket);
|
||||
static char *mactcp_socket_error(Socket);
|
||||
static void mactcp_set_frozen(Socket, int);
|
||||
|
||||
/*
|
||||
* Initialise MacTCP.
|
||||
|
|
@ -183,9 +209,9 @@ OSErr mactcp_init(void)
|
|||
/*
|
||||
* IM:Devices describes a convoluted way of finding a spare unit
|
||||
* number to open a driver on before calling OpenDriver. Happily,
|
||||
* I think the MacTCP INIT ensures that .IPP is already open (and
|
||||
* hence has a valid unit number already) so we don't need to go
|
||||
* through all that.
|
||||
* the MacTCP INIT ensures that .IPP is already open (and hence
|
||||
* has a valid unit number already) so we don't need to go through
|
||||
* all that. (MacTCP Programmer's Guide p6)
|
||||
*/
|
||||
err = OpenDriver("\p.IPP", &mactcp.refnum);
|
||||
if (err != noErr) return err;
|
||||
|
|
@ -212,6 +238,7 @@ SockAddr sk_namelookup(char *host, char **canonicalname)
|
|||
volatile int done = FALSE;
|
||||
char *realhost;
|
||||
|
||||
fprintf(stderr, "Resolving %s...\n", host);
|
||||
/* Clear the structure. */
|
||||
memset(ret, 0, sizeof(struct SockAddr_tag));
|
||||
if (mactcp_lookupdone_upp == NULL)
|
||||
|
|
@ -233,6 +260,7 @@ SockAddr sk_namelookup(char *host, char **canonicalname)
|
|||
realhost = "";
|
||||
*canonicalname = smalloc(1+strlen(realhost));
|
||||
strcpy(*canonicalname, realhost);
|
||||
fprintf(stderr, "canonical name = %s\n", realhost);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -306,11 +334,207 @@ void sk_addr_free(SockAddr addr)
|
|||
sfree(addr);
|
||||
}
|
||||
|
||||
static Plug mactcp_plug(Socket sock, Plug p)
|
||||
{
|
||||
Actual_Socket s = (Actual_Socket) sock;
|
||||
Plug ret = s->plug;
|
||||
|
||||
if (p)
|
||||
s->plug = p;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void mactcp_flush(Socket s)
|
||||
{
|
||||
|
||||
fatalbox("sk_tcp_flush");
|
||||
}
|
||||
|
||||
Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
|
||||
int nodelay, Plug plug)
|
||||
{
|
||||
static struct socket_function_table fn_table = {
|
||||
mactcp_plug,
|
||||
mactcp_close,
|
||||
mactcp_write,
|
||||
mactcp_write_oob,
|
||||
mactcp_flush,
|
||||
mactcp_set_private_ptr,
|
||||
mactcp_get_private_ptr,
|
||||
mactcp_set_frozen,
|
||||
mactcp_socket_error
|
||||
};
|
||||
TCPiopb pb;
|
||||
UDPiopb upb;
|
||||
Actual_Socket ret;
|
||||
ip_addr dstaddr;
|
||||
size_t buflen;
|
||||
|
||||
fatalbox("sk_new");
|
||||
fprintf(stderr, "Opening socket, port = %d\n", port);
|
||||
/*
|
||||
* Create Socket structure.
|
||||
*/
|
||||
ret = smalloc(sizeof(struct Socket_tag));
|
||||
ret->s = 0;
|
||||
ret->fn = &fn_table;
|
||||
ret->err = noErr;
|
||||
ret->plug = plug;
|
||||
bufchain_init(&ret->output_data);
|
||||
ret->connected = 0; /* to start with */
|
||||
ret->writable = 0; /* to start with */
|
||||
ret->sending_oob = 0;
|
||||
ret->frozen = 0;
|
||||
ret->frozen_readable = 0;
|
||||
ret->localhost_only = 0; /* unused, but best init anyway */
|
||||
ret->pending_error = 0;
|
||||
ret->oobpending = FALSE;
|
||||
ret->listener = 0;
|
||||
|
||||
dstaddr = addr->hostinfo.addr[0]; /* XXX should try all of them */
|
||||
/*
|
||||
* Create a TCP stream.
|
||||
*
|
||||
* MacTCP requires us to provide it with some buffer memory. Page
|
||||
* 31 of the Programmer's Guide says it should be a minimum of
|
||||
* 4*MTU+1024. Page 36 says a minimum of 4096 bytes. Assume
|
||||
* they're both correct.
|
||||
*/
|
||||
assert(addr->resolved);
|
||||
upb.ioCRefNum = mactcp.refnum;
|
||||
upb.csCode = UDPMaxMTUSize;
|
||||
upb.csParam.mtu.remoteHost = dstaddr;
|
||||
upb.csParam.mtu.userDataPtr = NULL;
|
||||
ret->err = PBControlSync((ParmBlkPtr)&upb);
|
||||
fprintf(stderr, "getting mtu, err = %d\n", ret->err);
|
||||
if (ret->err != noErr) return (Socket)ret;
|
||||
fprintf(stderr, "Got MTU = %d\n", upb.csParam.mtu.mtuSize);
|
||||
|
||||
buflen = upb.csParam.mtu.mtuSize * 4 + 1024;
|
||||
if (buflen < 4096) buflen = 4096;
|
||||
pb.ioCRefNum = mactcp.refnum;
|
||||
pb.csCode = TCPCreate;
|
||||
pb.csParam.create.rcvBuff = smalloc(buflen);
|
||||
pb.csParam.create.rcvBuffLen = buflen;
|
||||
pb.csParam.create.notifyProc = NULL;
|
||||
pb.csParam.create.userDataPtr = (Ptr)ret;
|
||||
ret->err = PBControlSync((ParmBlkPtr)&pb);
|
||||
if (ret->err != noErr) return (Socket)ret;
|
||||
ret->s = pb.tcpStream;
|
||||
fprintf(stderr, "stream opened\n");
|
||||
|
||||
/*
|
||||
* Open the connection.
|
||||
*/
|
||||
pb.ioCRefNum = mactcp.refnum;
|
||||
pb.csCode = TCPActiveOpen;
|
||||
pb.tcpStream = ret->s;
|
||||
pb.csParam.open.validityFlags = 0;
|
||||
pb.csParam.open.remoteHost = dstaddr;
|
||||
pb.csParam.open.remotePort = port;
|
||||
pb.csParam.open.localPort = privport ? 1023 : 0;
|
||||
pb.csParam.open.dontFrag = FALSE;
|
||||
pb.csParam.open.timeToLive = 0;
|
||||
pb.csParam.open.security = 0;
|
||||
pb.csParam.open.optionCnt = 0;
|
||||
pb.csParam.open.userDataPtr = (Ptr)ret;
|
||||
while (1) {
|
||||
ret->err = PBControlSync((ParmBlkPtr)&pb);
|
||||
if (!privport || ret->err != duplicateSocket)
|
||||
break;
|
||||
pb.csParam.open.localPort--;
|
||||
if (pb.csParam.open.localPort == 0)
|
||||
break;
|
||||
}
|
||||
|
||||
if (ret->err != noErr) return (Socket)ret;
|
||||
|
||||
ret->connected = TRUE;
|
||||
ret->writable = TRUE;
|
||||
|
||||
fprintf(stderr, "Socket connected\n");
|
||||
return (Socket)ret;
|
||||
}
|
||||
|
||||
static void mactcp_close(Socket sock)
|
||||
{
|
||||
Actual_Socket s = (Actual_Socket)sock;
|
||||
TCPiopb pb;
|
||||
|
||||
/*
|
||||
* TCPClose is equivalent to shutdown(fd, SHUT_WR), and hence
|
||||
* leaves the Rx side open, while TCPAbort seems rather vicious,
|
||||
* throwing away Tx data that haven't been ACKed yet. We do both
|
||||
* in succession.
|
||||
*/
|
||||
pb.ioCRefNum = mactcp.refnum;
|
||||
pb.csCode = TCPClose;
|
||||
pb.tcpStream = s->s;
|
||||
pb.csParam.close.validityFlags = 0;
|
||||
pb.csParam.close.userDataPtr = (Ptr)s;
|
||||
s->err = PBControlSync((ParmBlkPtr)&pb);
|
||||
/* Not much we can do about an error anyway. */
|
||||
|
||||
pb.ioCRefNum = mactcp.refnum;
|
||||
pb.csCode = TCPAbort;
|
||||
pb.tcpStream = s->s;
|
||||
pb.csParam.abort.userDataPtr = (Ptr)s;
|
||||
s->err = PBControlSync((ParmBlkPtr)&pb);
|
||||
/* Even less we can do about an error here. */
|
||||
|
||||
pb.ioCRefNum = mactcp.refnum;
|
||||
pb.csCode = TCPRelease;
|
||||
pb.tcpStream = s->s;
|
||||
pb.csParam.create.userDataPtr = (Ptr)s;
|
||||
s->err = PBControlSync((ParmBlkPtr)&pb);
|
||||
if (s->err == noErr)
|
||||
sfree(pb.csParam.create.rcvBuff);
|
||||
sfree(s);
|
||||
}
|
||||
|
||||
static int mactcp_write(Socket sock, char *buf, int len)
|
||||
{
|
||||
Actual_Socket s = (Actual_Socket) sock;
|
||||
wdsEntry wds[2];
|
||||
TCPiopb pb;
|
||||
|
||||
fprintf(stderr, "Write data, %d bytes\n", len);
|
||||
|
||||
wds[0].length = len;
|
||||
wds[0].ptr = buf;
|
||||
wds[1].length = 0;
|
||||
|
||||
pb.ioCRefNum = mactcp.refnum;
|
||||
pb.csCode = TCPSend;
|
||||
pb.tcpStream = s->s;
|
||||
pb.csParam.send.validityFlags = 0;
|
||||
pb.csParam.send.pushFlag = TRUE; /* XXX we want it to return. */
|
||||
pb.csParam.send.urgentFlag = 0;
|
||||
pb.csParam.send.wdsPtr = (Ptr)wds;
|
||||
pb.csParam.send.userDataPtr = (Ptr)s;
|
||||
s->err = PBControlSync((ParmBlkPtr)&pb);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mactcp_write_oob(Socket sock, char *buf, int len)
|
||||
{
|
||||
|
||||
fatalbox("mactcp_write_oob");
|
||||
}
|
||||
|
||||
/*
|
||||
* Each socket abstraction contains a `void *' private field in
|
||||
* which the client can keep state.
|
||||
*/
|
||||
static void mactcp_set_private_ptr(Socket sock, void *ptr)
|
||||
{
|
||||
Actual_Socket s = (Actual_Socket) sock;
|
||||
s->private_ptr = ptr;
|
||||
}
|
||||
|
||||
static void *mactcp_get_private_ptr(Socket sock)
|
||||
{
|
||||
Actual_Socket s = (Actual_Socket) sock;
|
||||
return s->private_ptr;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -343,6 +567,31 @@ char *sk_addr_error(SockAddr addr)
|
|||
}
|
||||
}
|
||||
|
||||
static char *mactcp_socket_error(Socket sock)
|
||||
{
|
||||
static char buf[64];
|
||||
Actual_Socket s = (Actual_Socket) sock;
|
||||
|
||||
switch (s->err) {
|
||||
case noErr:
|
||||
return NULL;
|
||||
case insufficientResources:
|
||||
return "Insufficient resources to open TCP stream";
|
||||
case duplicateSocket:
|
||||
return "Duplicate socket";
|
||||
case openFailed:
|
||||
return "Connection failed while opening";
|
||||
default:
|
||||
sprintf(buf, "Unknown MacTCP error %d", s->err);
|
||||
return buf;
|
||||
}
|
||||
}
|
||||
|
||||
static void mactcp_set_frozen(Socket sock, int is_frozen)
|
||||
{
|
||||
|
||||
fatalbox("mactcp_set_frozen");
|
||||
}
|
||||
|
||||
/*
|
||||
* Bits below here would usually be in dnr.c, shipped with the MacTCP
|
||||
|
|
@ -378,7 +627,7 @@ static OSErr OpenResolver(char *hosts_file)
|
|||
pb.fileParam.ioDirID = dirid;
|
||||
fd = -1;
|
||||
|
||||
while (PBHGetFInfo(&pb, FALSE) == noErr) {
|
||||
while (PBHGetFInfoSync(&pb) == noErr) {
|
||||
if (pb.fileParam.ioFlFndrInfo.fdType == 'cdev' &&
|
||||
pb.fileParam.ioFlFndrInfo.fdCreator == 'ztcp') {
|
||||
fd = HOpenResFile(vrefnum, dirid, filename, fsRdPerm);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче