Compare integers in ziplist regardless of encoding

[redis.git] / src / anet.c

diff --git a/src/anet.c b/src/anet.c
index 692cef1941c05f75b092ebaf8da4f8c864482ba7..434d945c7d850edd8b8a8934d254bbc88e5d62d0 100644 (file)
--- a/src/anet.c
+++ b/src/anet.c
@@ -32,6 +32,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>

+#include <sys/stat.h>

 #include <sys/un.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>


@@ -261,7 +262,11 @@ static int anetListen(char *err, int s, struct sockaddr *sa, socklen_t len) {
         close(s);
         return ANET_ERR;
     }
         close(s);
         return ANET_ERR;
     }

-    if (listen(s, 511) == -1) { /* the magic 511 constant is from nginx */
+
+    /* Use a backlog of 512 entries. We pass 511 to the listen() call because
+     * the kernel does: backlogsize = roundup_pow_of_two(backlogsize + 1);
+     * which will thus give us a backlog of 512 entries */
+    if (listen(s, 511) == -1) {

         anetSetError(err, "listen: %s", strerror(errno));
         close(s);
         return ANET_ERR;
         anetSetError(err, "listen: %s", strerror(errno));
         close(s);
         return ANET_ERR;


@@ -291,7 +296,7 @@ int anetTcpServer(char *err, int port, char *bindaddr)
     return s;
 }
 
     return s;
 }
 

-int anetUnixServer(char *err, char *path)
+int anetUnixServer(char *err, char *path, mode_t perm)

 {
     int s;
     struct sockaddr_un sa;
 {
     int s;
     struct sockaddr_un sa;


@@ -304,6 +309,8 @@ int anetUnixServer(char *err, char *path)
     strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
     if (anetListen(err,s,(struct sockaddr*)&sa,sizeof(sa)) == ANET_ERR)
         return ANET_ERR;
     strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
     if (anetListen(err,s,(struct sockaddr*)&sa,sizeof(sa)) == ANET_ERR)
         return ANET_ERR;

+    if (perm)
+        chmod(sa.sun_path, perm);

     return s;
 }
 
     return s;
 }
 


@@ -350,7 +357,12 @@ int anetPeerToString(int fd, char *ip, int *port) {
     struct sockaddr_in sa;
     socklen_t salen = sizeof(sa);
 
     struct sockaddr_in sa;
     socklen_t salen = sizeof(sa);
 

-    if (getpeername(fd,(struct sockaddr*)&sa,&salen) == -1) return -1;
+    if (getpeername(fd,(struct sockaddr*)&sa,&salen) == -1) {
+        *port = 0;
+        ip[0] = '?';
+        ip[1] = '\0';
+        return -1;
+    }

     if (ip) strcpy(ip,inet_ntoa(sa.sin_addr));
     if (port) *port = ntohs(sa.sin_port);
     return 0;
     if (ip) strcpy(ip,inet_ntoa(sa.sin_addr));
     if (port) *port = ntohs(sa.sin_port);
     return 0;