X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/90588fc697ec7f68c46a8c7da5e6dfde74504bc9..f85e6f6edb2c9415bc10bd2015479d72ea8c5ae2:/mac/mtcpnet.c diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c index 45248185..a8404b7a 100644 --- a/mac/mtcpnet.c +++ b/mac/mtcpnet.c @@ -27,6 +27,8 @@ * mtcpnet.c - MacTCP interface */ +#if !TARGET_API_MAC_CARBON + #include #include #include @@ -130,8 +132,9 @@ typedef CALLBACK_API_C(OSErr, AddrToStrProcPtr)(UInt32, unsigned long, char *); typedef STACK_UPP_TYPE(AddrToStrProcPtr) AddrToStrUPP; enum { uppAddrToStrProcInfo = kCStackBased | RESULT_SIZE(SIZE_CODE(sizeof(OSErr))) - | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(unsigned long))) - | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(char *))) + | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(UInt32))) + | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(unsigned long))) + | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(char *))) }; #define InvokeAddrToStrUPP(selector, addr, addrStr, userUPP) \ CALL_THREE_PARAMETER_UPP((userUPP), uppAddrToStrProcInfo, (selector),\ @@ -142,6 +145,19 @@ enum { uppAddrToStrProcInfo = kCStackBased /* End of AddressXlation.h bits */ +/* TCP connection states, mysteriously missing from */ +#define TCPS_CLOSED 0 +#define TCPS_LISTEN 2 +#define TCPS_SYN_RECEIVED 4 +#define TCPS_SYN_SENT 6 +#define TCPS_ESTABLISHED 8 +#define TCPS_FIN_WAIT_1 10 +#define TCPS_FIN_WAIT_2 12 +#define TCPS_CLOSE_WAIT 14 +#define TCPS_CLOSING 16 +#define TCPS_LAST_ACK 18 +#define TCPS_TIME_WAIT 20 + struct Socket_tag { struct socket_function_table *fn; /* the above variable absolutely *must* be the first in this structure */ @@ -197,11 +213,11 @@ static pascal void mactcp_asr(StreamPtr, unsigned short, Ptr, unsigned short, 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 int mactcp_write(Socket, char const *, int); +static int mactcp_write_oob(Socket, char const*, int); static void mactcp_set_private_ptr(Socket, void *); static void *mactcp_get_private_ptr(Socket); -static char *mactcp_socket_error(Socket); +static const char *mactcp_socket_error(Socket); static void mactcp_set_frozen(Socket, int); static void mactcp_recv(Actual_Socket s, size_t len); @@ -231,7 +247,7 @@ OSErr mactcp_init(void) return noErr; } -void mactcp_shutdown(void) +void mactcp_cleanup(void) { Actual_Socket s, next; @@ -257,18 +273,20 @@ void mactcp_shutdown(void) static ResultUPP mactcp_lookupdone_upp; -SockAddr sk_namelookup(char *host, char **canonicalname) +SockAddr mactcp_namelookup(char const *host, char **canonicalname) { - SockAddr ret = smalloc(sizeof(struct SockAddr_tag)); + SockAddr ret = snew(struct SockAddr_tag); OSErr err; volatile int done = FALSE; char *realhost; + int realhostlen; /* Clear the structure. */ memset(ret, 0, sizeof(struct SockAddr_tag)); if (mactcp_lookupdone_upp == NULL) mactcp_lookupdone_upp = NewResultUPP(&mactcp_lookupdone); - err = StrToAddr(host, &ret->hostinfo, mactcp_lookupdone_upp, + /* Casting away const -- hope StrToAddr is sensible */ + err = StrToAddr((char *)host, &ret->hostinfo, mactcp_lookupdone_upp, (char *)&done); /* * PuTTY expects DNS lookups to be synchronous (see bug @@ -279,11 +297,15 @@ SockAddr sk_namelookup(char *host, char **canonicalname) continue; ret->resolved = TRUE; - if (ret->hostinfo.rtnCode == noErr) + if (ret->hostinfo.rtnCode == noErr) { realhost = ret->hostinfo.cname; - else + /* MacTCP puts trailing dots on canonical names. */ + realhostlen = strlen(realhost); + if (realhost[realhostlen - 1] == '.') + realhost[realhostlen - 1] = '\0'; + } else realhost = ""; - *canonicalname = smalloc(1+strlen(realhost)); + *canonicalname = snewn(1 + strlen(realhost), char); strcpy(*canonicalname, realhost); return ret; } @@ -295,9 +317,9 @@ static pascal void mactcp_lookupdone(struct hostInfo *hi, char *cookie) *donep = TRUE; } -SockAddr sk_nonamelookup(char *host) +SockAddr mactcp_nonamelookup(char const *host) { - SockAddr ret = smalloc(sizeof(struct SockAddr_tag)); + SockAddr ret = snew(struct SockAddr_tag); ret->resolved = FALSE; ret->hostinfo.rtnCode = noErr; @@ -306,7 +328,7 @@ SockAddr sk_nonamelookup(char *host) return ret; } -void sk_getaddr(SockAddr addr, char *buf, int buflen) +void mactcp_getaddr(SockAddr addr, char *buf, int buflen) { char mybuf[16]; OSErr err; @@ -325,13 +347,13 @@ void sk_getaddr(SockAddr addr, char *buf, int buflen) /* I think "local" here really means "loopback" */ -int sk_hostname_is_local(char *name) +int mactcp_hostname_is_local(char *name) { return !strcmp(name, "localhost"); } -int sk_address_is_local(SockAddr addr) +int mactcp_address_is_local(SockAddr addr) { int i; @@ -342,7 +364,7 @@ int sk_address_is_local(SockAddr addr) return FALSE; } -int sk_addrtype(SockAddr addr) +int mactcp_addrtype(SockAddr addr) { if (addr->resolved) @@ -350,14 +372,14 @@ int sk_addrtype(SockAddr addr) return ADDRTYPE_NAME; } -void sk_addrcopy(SockAddr addr, char *buf) +void mactcp_addrcopy(SockAddr addr, char *buf) { /* XXX only return first address */ memcpy(buf, &addr->hostinfo.addr[0], 4); } -void sk_addr_free(SockAddr addr) +void mactcp_addr_free(SockAddr addr) { sfree(addr); @@ -376,18 +398,18 @@ static Plug mactcp_plug(Socket sock, Plug p) static void mactcp_flush(Socket s) { - fatalbox("sk_tcp_flush"); + fatalbox("mactcp_flush"); } -Socket sk_register(void *sock, Plug plug) +Socket mactcp_register(void *sock, Plug plug) { - fatalbox("sk_register"); + fatalbox("mactcp_register"); } static TCPNotifyUPP mactcp_asr_upp; -Socket sk_new(SockAddr addr, int port, int privport, int oobinline, +Socket mactcp_new(SockAddr addr, int port, int privport, int oobinline, int nodelay, Plug plug) { static struct socket_function_table fn_table = { @@ -410,7 +432,7 @@ Socket sk_new(SockAddr addr, int port, int privport, int oobinline, /* * Create Socket structure. */ - ret = smalloc(sizeof(struct Socket_tag)); + ret = snew(struct Socket_tag); ret->s = 0; ret->fn = &fn_table; ret->err = noErr; @@ -451,7 +473,7 @@ Socket sk_new(SockAddr addr, int port, int privport, int oobinline, GetCurrentProcess(&mactcp.self); pb.ioCRefNum = mactcp.refnum; pb.csCode = TCPCreate; - pb.csParam.create.rcvBuff = smalloc(buflen); + pb.csParam.create.rcvBuff = snewn(buflen, char); pb.csParam.create.rcvBuffLen = buflen; pb.csParam.create.notifyProc = mactcp_asr_upp; pb.csParam.create.userDataPtr = (Ptr)ret; @@ -491,16 +513,20 @@ Socket sk_new(SockAddr addr, int port, int privport, int oobinline, /* Add this to the list of all sockets */ ret->next = mactcp.socklist; ret->prev = &mactcp.socklist; - ret->next->prev = &ret->next; + if (ret->next != NULL) + ret->next->prev = &ret->next; mactcp.socklist = ret; + sk_addr_free(addr); /* don't need this anymore */ + return (Socket)ret; } -Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only) +Socket mactcp_newlistener(char *srcaddr, int port, Plug plug, + int local_host_only) { - fatalbox("sk_newlistener"); + fatalbox("mactcp_newlistener"); } static void mactcp_close(Socket sock) @@ -545,14 +571,18 @@ static void mactcp_close(Socket sock) sfree(s); } -static int mactcp_write(Socket sock, char *buf, int len) +static int mactcp_write(Socket sock, char const *buf, int len) { Actual_Socket s = (Actual_Socket) sock; wdsEntry wds[2]; TCPiopb pb; + /* + * Casting away const from buf should be safe -- MacTCP won't + * write to it. + */ wds[0].length = len; - wds[0].ptr = buf; + wds[0].ptr = (char *)buf; wds[1].length = 0; pb.ioCRefNum = mactcp.refnum; @@ -567,7 +597,7 @@ static int mactcp_write(Socket sock, char *buf, int len) return 0; } -static int mactcp_write_oob(Socket sock, char *buf, int len) +static int mactcp_write_oob(Socket sock, char const *buf, int len) { fatalbox("mactcp_write_oob"); @@ -586,11 +616,11 @@ static pascal void mactcp_asr(StreamPtr str, unsigned short event, Ptr cookie, */ void mactcp_poll(void) { - Actual_Socket s; + Actual_Socket s, next; TCPiopb pb; - for (s = mactcp.socklist; s != NULL; s = s->next) { - /* XXX above can't handle sockets being deleted. */ + for (s = mactcp.socklist; s != NULL; s = next) { + next = s->next; do { pb.ioCRefNum = mactcp.refnum; pb.csCode = TCPStatus; @@ -602,8 +632,12 @@ void mactcp_poll(void) if (pb.csParam.status.amtUnreadData == 0) break; mactcp_recv(s, pb.csParam.status.amtUnreadData); - /* Should check connectionState in case remote has closed */ } while (TRUE); + switch (pb.csParam.status.connectionState) { + case TCPS_CLOSE_WAIT: + /* Remote end has sent us a FIN */ + plug_closing(s->plug, NULL, 0, 0); + } next_socket: ; } @@ -653,11 +687,11 @@ static void *mactcp_get_private_ptr(Socket sock) } /* - * Special error values are returned from sk_namelookup and sk_new - * if there's a problem. These functions extract an error message, - * or return NULL if there's no problem. + * Special error values are returned from mactcp_namelookup and + * mactcp_new if there's a problem. These functions extract an error + * message, or return NULL if there's no problem. */ -char *sk_addr_error(SockAddr addr) +char *mactcp_addr_error(SockAddr addr) { static char buf[64]; @@ -682,7 +716,7 @@ char *sk_addr_error(SockAddr addr) } } -static char *mactcp_socket_error(Socket sock) +static const char *mactcp_socket_error(Socket sock) { static char buf[64]; Actual_Socket s = (Actual_Socket) sock; @@ -799,13 +833,7 @@ OSErr CloseResolver(void) return noErr; } -/* MacTCP doesn't have a services database. */ -int net_service_lookup(char *service) -{ - - return 0; -} - +#endif /* * Local Variables: