#include <assert.h>
+#define DEFINE_PLUG_METHOD_MACROS
#include "putty.h"
#include "network.h"
#include "mac.h"
int oobinline;
int pending_error; /* in case send() returns error */
int listener;
+ struct Socket_tag *next;
+ struct Socket_tag **prev;
};
/*
Handle dnr_handle;
int initialised;
short refnum;
+ ProcessSerialNumber self;
+ Actual_Socket socklist;
} mactcp;
static pascal void mactcp_lookupdone(struct hostInfo *hi, char *cookie);
+static pascal void mactcp_asr(StreamPtr, unsigned short, Ptr, unsigned short,
+ struct ICMPReport *);
static Plug mactcp_plug(Socket, Plug);
static void mactcp_flush(Socket);
static void mactcp_close(Socket);
static char *mactcp_socket_error(Socket);
static void mactcp_set_frozen(Socket, int);
+static void mactcp_recv(Actual_Socket s, size_t len);
+
/*
* Initialise MacTCP.
* This should be called once before any TCP connection is opened.
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)
realhost = "";
*canonicalname = smalloc(1+strlen(realhost));
strcpy(*canonicalname, realhost);
- fprintf(stderr, "canonical name = %s\n", realhost);
return ret;
}
char mybuf[16];
OSErr err;
- /* XXX only return first address */
- err = AddrToStr(addr->hostinfo.addr[0], mybuf);
- buf[0] = '\0';
- if (err != noErr)
- strncat(buf, mybuf, buflen - 1);
+ if (addr->resolved) {
+ /* XXX only return first address */
+ err = AddrToStr(addr->hostinfo.addr[0], mybuf);
+ buf[0] = '\0';
+ if (err != noErr)
+ strncat(buf, mybuf, buflen - 1);
+ } else {
+ buf[0] = '\0';
+ strncat(buf, addr->hostname, buflen - 1);
+ }
}
/* I think "local" here really means "loopback" */
fatalbox("sk_tcp_flush");
}
+Socket sk_register(void *sock, Plug plug)
+{
+
+ fatalbox("sk_register");
+}
+
+static TCPNotifyUPP mactcp_asr_upp;
+
Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
int nodelay, Plug plug)
{
ip_addr dstaddr;
size_t buflen;
- fprintf(stderr, "Opening socket, port = %d\n", port);
/*
* Create Socket structure.
*/
ret->frozen_readable = 0;
ret->localhost_only = 0; /* unused, but best init anyway */
ret->pending_error = 0;
+ ret->oobinline = oobinline;
ret->oobpending = FALSE;
ret->listener = 0;
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;
+ if (mactcp_asr_upp == NULL)
+ mactcp_asr_upp = NewTCPNotifyUPP(&mactcp_asr);
+ GetCurrentProcess(&mactcp.self);
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.notifyProc = mactcp_asr_upp;
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.
ret->connected = TRUE;
ret->writable = TRUE;
- fprintf(stderr, "Socket connected\n");
+ /* Add this to the list of all sockets */
+ ret->next = mactcp.socklist;
+ ret->prev = &mactcp.socklist;
+ ret->next->prev = &ret->next;
+ mactcp.socklist = ret;
+
return (Socket)ret;
}
+Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only)
+{
+
+ fatalbox("sk_newlistener");
+}
+
static void mactcp_close(Socket sock)
{
Actual_Socket s = (Actual_Socket)sock;
s->err = PBControlSync((ParmBlkPtr)&pb);
if (s->err == noErr)
sfree(pb.csParam.create.rcvBuff);
+
+ /* Unhitch from list of sockets */
+ *s->prev = s->next;
+ if (s->next != NULL)
+ s->next->prev = s->prev;
+
sfree(s);
}
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;
fatalbox("mactcp_write_oob");
}
+static pascal void mactcp_asr(StreamPtr str, unsigned short event, Ptr cookie,
+ unsigned short termin_reason,
+ struct ICMPReport *icmp)
+{
+
+ WakeUpProcess(&mactcp.self);
+}
+
+/*
+ * Called from our event loop if there's work to do.
+ */
+void mactcp_poll(void)
+{
+ Actual_Socket s;
+ TCPiopb pb;
+
+ for (s = mactcp.socklist; s != NULL; s = s->next) {
+ /* XXX above can't handle sockets being deleted. */
+ pb.ioCRefNum = mactcp.refnum;
+ pb.csCode = TCPStatus;
+ pb.tcpStream = s->s;
+ pb.csParam.status.userDataPtr = (Ptr)s;
+ s->err = PBControlSync((ParmBlkPtr)&pb);
+ if (s->err != noErr)
+ continue;
+ if (pb.csParam.status.amtUnreadData > 0)
+ mactcp_recv(s, pb.csParam.status.amtUnreadData);
+ /* Should check connectionState in case remote has closed */
+ }
+}
+
+static void mactcp_recv(Actual_Socket s, size_t len)
+{
+ rdsEntry rds[2];
+ TCPiopb pb;
+
+ if (s->frozen) return;
+
+ while (len > 0) {
+ pb.ioCRefNum = mactcp.refnum;
+ pb.csCode = TCPNoCopyRcv;
+ pb.tcpStream = s->s;
+ pb.csParam.receive.commandTimeoutValue = 0;
+ pb.csParam.receive.rdsPtr = (Ptr)rds;
+ pb.csParam.receive.rdsLength = lenof(rds) - 1;
+ pb.csParam.receive.userDataPtr = (Ptr)s;
+ s->err = PBControlSync((ParmBlkPtr)&pb);
+ if (s->err != noErr)
+ return;
+ plug_receive(s->plug, 0, rds[0].ptr, rds[0].length);
+ len -= rds[0].length;
+ pb.csCode = TCPRcvBfrReturn;
+ s->err = PBControlSync((ParmBlkPtr)&pb);
+ if (s->err != noErr)
+ return;
+ }
+}
+
/*
* Each socket abstraction contains a `void *' private field in
* which the client can keep state.
static void mactcp_set_frozen(Socket sock, int is_frozen)
{
+ Actual_Socket s = (Actual_Socket) sock;
- fatalbox("mactcp_set_frozen");
+ if (s->frozen == is_frozen)
+ return;
+ s->frozen = is_frozen;
}
/*
return noErr;
}
+/* MacTCP doesn't have a services database. */
+int net_service_lookup(char *service)
+{
+
+ return 0;
+}
+
+
/*
* Local Variables:
* c-file-style: "simon"
projects / u / mdw / putty / blobdiff