Merge remote-tracking branch 'origin/unstable' into unstable

[redis.git] / src / anet.h

diff --git a/src/anet.h b/src/anet.h
index ce0f4778799824c8669e7487035dab6db614c057..406c578326ca70b94def7ae7cc40486b6a4ef2d2 100644 (file)
--- a/src/anet.h
+++ b/src/anet.h
@@ -35,15 +35,24 @@
 #define ANET_ERR -1
 #define ANET_ERR_LEN 256
 
 #define ANET_ERR -1
 #define ANET_ERR_LEN 256
 

+#if defined(__sun)
+#define AF_LOCAL AF_UNIX
+#endif
+

 int anetTcpConnect(char *err, char *addr, int port);
 int anetTcpNonBlockConnect(char *err, char *addr, int port);
 int anetTcpConnect(char *err, char *addr, int port);
 int anetTcpNonBlockConnect(char *err, char *addr, int port);

+int anetUnixConnect(char *err, char *path);
+int anetUnixNonBlockConnect(char *err, char *path);

 int anetRead(int fd, char *buf, int count);
 int anetResolve(char *err, char *host, char *ipbuf);
 int anetTcpServer(char *err, int port, char *bindaddr);
 int anetRead(int fd, char *buf, int count);
 int anetResolve(char *err, char *host, char *ipbuf);
 int anetTcpServer(char *err, int port, char *bindaddr);

-int anetAccept(char *err, int serversock, char *ip, int *port);
+int anetUnixServer(char *err, char *path, mode_t perm);
+int anetTcpAccept(char *err, int serversock, char *ip, int *port);
+int anetUnixAccept(char *err, int serversock);

 int anetWrite(int fd, char *buf, int count);
 int anetNonBlock(char *err, int fd);
 int anetTcpNoDelay(char *err, int fd);
 int anetTcpKeepAlive(char *err, int fd);
 int anetWrite(int fd, char *buf, int count);
 int anetNonBlock(char *err, int fd);
 int anetTcpNoDelay(char *err, int fd);
 int anetTcpKeepAlive(char *err, int fd);

+int anetPeerToString(int fd, char *ip, int *port);

 
 #endif
 
 #endif