X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/347732736a7c51fb7ebcab24122de84882e9665f..21226fd7e6d5e69dab830cc745e2dc59ed4a00cc:/mac/mtcpnet.c diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c index 7644ddf5..c1c1fb80 100644 --- a/mac/mtcpnet.c +++ b/mac/mtcpnet.c @@ -217,7 +217,7 @@ 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); @@ -410,7 +410,7 @@ Socket mactcp_register(void *sock, Plug plug) static TCPNotifyUPP mactcp_asr_upp; Socket mactcp_new(SockAddr addr, int port, int privport, int oobinline, - int nodelay, Plug plug) + int nodelay, int keepalive, Plug plug) { static struct socket_function_table fn_table = { mactcp_plug, @@ -517,11 +517,13 @@ Socket mactcp_new(SockAddr addr, int port, int privport, int oobinline, ret->next->prev = &ret->next; mactcp.socklist = ret; + sk_addr_free(addr); /* don't need this anymore */ + return (Socket)ret; } Socket mactcp_newlistener(char *srcaddr, int port, Plug plug, - int local_host_only) + int local_host_only, int address_family) { fatalbox("mactcp_newlistener"); @@ -714,7 +716,7 @@ char *mactcp_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;