X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=mac%2Fmacnet.c;h=63d0cc42bd204f4c80c0036a17140e870a83faea;hb=550f7b37cb7dbe0dcd68d2ac2c3b529e643599b3;hp=34d688522ec5fb45e30a139b7d5ac121d8409c14;hpb=6993486b4394e4d3f65b88d595a79e8c79820b0e;p=PuTTY.git

diff --git a/mac/macnet.c b/mac/macnet.c
index 34d68852..63d0cc42 100644
--- a/mac/macnet.c
+++ b/mac/macnet.c
@@ -12,7 +12,7 @@ struct macnet_stack {
     void (*addrcopy)(SockAddr, char *);
     void (*addr_free)(SockAddr);
     Socket (*skregister)(void *, Plug); /* "register" is a reserved word */
-    Socket (*new)(SockAddr, int, int, int, int, Plug);
+    Socket (*new)(SockAddr, int, int, int, int, int, Plug);
     Socket (*newlistener)(char *, int, Plug, int);
     char *(*addr_error)(SockAddr);
     void (*poll)(void);
@@ -27,12 +27,14 @@ static struct macnet_stack ot = {
     ot_register, ot_new, ot_newlistener, ot_addr_error, ot_poll, ot_cleanup
 };
 
+#if !TARGET_API_MAC_CARBON
 static struct macnet_stack mactcp = {
     mactcp_namelookup, mactcp_nonamelookup, mactcp_getaddr,
     mactcp_hostname_is_local, mactcp_address_is_local, mactcp_addrtype,
     mactcp_addrcopy, mactcp_addr_free, mactcp_register, mactcp_new,
     mactcp_newlistener, mactcp_addr_error, mactcp_poll, mactcp_cleanup
 };
+#endif
 
 void sk_init(void)
 {
@@ -42,9 +44,11 @@ void sk_init(void)
 	stack = &ot;
     else
 #endif
+#if !TARGET_API_MAC_CARBON
     if (mactcp_init() == noErr)
 	stack = &mactcp;
     else
+#endif
 	stack = NULL;
 }
 
@@ -52,7 +56,7 @@ void sk_init(void)
  * Network functions exported to the world.  These choose whether to call
  * MacTCP or OpenTransport and behave accordingly.
  */
-SockAddr sk_namelookup(char const *host, char **canonicalname)
+SockAddr sk_namelookup(char const *host, char **canonicalname, int address_family)
 {
 
     if (stack != NULL)
@@ -124,15 +128,16 @@ Socket sk_register(void *sock, Plug plug)
 }
 
 Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
-	      int nodelay, Plug plug)
+	      int nodelay, int keepalive, Plug plug)
 {
 
     if (stack != NULL)
-	return stack->new(addr, port, privport, oobinline, nodelay, plug);
+	return stack->new(addr, port, privport, oobinline, nodelay, keepalive,
+			  plug);
     return NULL;
 }
 
-Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only)
+Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only, int address_family)
 {
 
     if (stack != NULL)
@@ -140,7 +145,7 @@ Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only)
     return NULL;
 }
 
-char *sk_addr_error(SockAddr addr)
+const char *sk_addr_error(SockAddr addr)
 {
 
     if (stack != NULL)
@@ -162,6 +167,14 @@ void sk_cleanup(void)
 	stack->cleanup();
 }
 
+/* We should use Internet Config here. */
+int net_service_lookup(char *service)
+{
+
+    return 0;
+}
+
+
 /*
  * Local Variables:
  * c-file-style: "simon"