projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Thanks to D H Becker for sending in an icon. I'd have liked to have
[u/mdw/putty]
/
mac
/
macnet.c
diff --git
a/mac/macnet.c
b/mac/macnet.c
index
eb705e1
..
2ed0069
100644
(file)
--- a/
mac/macnet.c
+++ b/
mac/macnet.c
@@
-1,6
+1,7
@@
#include "putty.h"
#include "network.h"
#include "mac.h"
#include "putty.h"
#include "network.h"
#include "mac.h"
+#include "ssh.h"
struct macnet_stack {
SockAddr (*namelookup)(char const *, char **);
struct macnet_stack {
SockAddr (*namelookup)(char const *, char **);
@@
-12,8
+13,8
@@
struct macnet_stack {
void (*addrcopy)(SockAddr, char *);
void (*addr_free)(SockAddr);
Socket (*skregister)(void *, Plug); /* "register" is a reserved word */
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 (*newlistener)(char *, int, Plug, int);
+ Socket (*new)(SockAddr, int, int, int, int,
int,
Plug);
+ Socket (*newlistener)(char *, int, Plug, int
, int
);
char *(*addr_error)(SockAddr);
void (*poll)(void);
void (*cleanup)(void);
char *(*addr_error)(SockAddr);
void (*poll)(void);
void (*cleanup)(void);
@@
-39,7
+40,7
@@
static struct macnet_stack mactcp = {
void sk_init(void)
{
void sk_init(void)
{
-#if
0
+#if
ndef NO_OT
if (ot_init() == noErr)
stack = &ot;
else
if (ot_init() == noErr)
stack = &ot;
else
@@
-56,7
+57,7
@@
void sk_init(void)
* Network functions exported to the world. These choose whether to call
* MacTCP or OpenTransport and behave accordingly.
*/
* 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)
{
if (stack != NULL)
@@
-128,23
+129,24
@@
Socket sk_register(void *sock, Plug plug)
}
Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
}
Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
- int nodelay, Plug plug)
+ int nodelay,
int keepalive,
Plug plug)
{
if (stack != NULL)
{
if (stack != NULL)
- return stack->new(addr, port, privport, oobinline, nodelay, plug);
+ return stack->new(addr, port, privport, oobinline, nodelay, keepalive,
+ plug);
return NULL;
}
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)
{
if (stack != NULL)
- return stack->newlistener(srcaddr, port, plug, local_host_only);
+ return stack->newlistener(srcaddr, port, plug, local_host_only
, address_family
);
return NULL;
}
return NULL;
}
-char *sk_addr_error(SockAddr addr)
+c
onst c
har *sk_addr_error(SockAddr addr)
{
if (stack != NULL)
{
if (stack != NULL)
@@
-173,6
+175,10
@@
int net_service_lookup(char *service)
return 0;
}
return 0;
}
+SockAddr platform_get_x11_unix_address(int displaynum, char **canonicalname)
+{
+ return NULL;
+}
/*
* Local Variables:
/*
* Local Variables: