Commit 0ccb2c8d authored by Pieter Noordhuis's avatar Pieter Noordhuis
Browse files

Add functiont to net.c to connect to a unix socket

parent 8220cd4b
...@@ -655,7 +655,7 @@ redisContext *redisConnect(const char *ip, int port) { ...@@ -655,7 +655,7 @@ redisContext *redisConnect(const char *ip, int port) {
redisContext *c = redisContextInit(); redisContext *c = redisContextInit();
c->flags |= REDIS_BLOCK; c->flags |= REDIS_BLOCK;
c->flags |= REDIS_CONNECTED; c->flags |= REDIS_CONNECTED;
redisContextConnect(c,ip,port); redisContextConnectTcp(c,ip,port);
return c; return c;
} }
...@@ -663,7 +663,7 @@ redisContext *redisConnectNonBlock(const char *ip, int port) { ...@@ -663,7 +663,7 @@ redisContext *redisConnectNonBlock(const char *ip, int port) {
redisContext *c = redisContextInit(); redisContext *c = redisContextInit();
c->flags &= ~REDIS_BLOCK; c->flags &= ~REDIS_BLOCK;
c->flags |= REDIS_CONNECTED; c->flags |= REDIS_CONNECTED;
redisContextConnect(c,ip,port); redisContextConnectTcp(c,ip,port);
return c; return c;
} }
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "fmacros.h" #include "fmacros.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <arpa/inet.h> #include <arpa/inet.h>
...@@ -95,7 +96,7 @@ static int redisSetTcpNoDelay(redisContext *c, int fd) { ...@@ -95,7 +96,7 @@ static int redisSetTcpNoDelay(redisContext *c, int fd) {
return REDIS_OK; return REDIS_OK;
} }
int redisContextConnect(redisContext *c, const char *addr, int port) { int redisContextConnectTcp(redisContext *c, const char *addr, int port) {
int s; int s;
int blocking = (c->flags & REDIS_BLOCK); int blocking = (c->flags & REDIS_BLOCK);
struct sockaddr_in sa; struct sockaddr_in sa;
...@@ -138,3 +139,29 @@ int redisContextConnect(redisContext *c, const char *addr, int port) { ...@@ -138,3 +139,29 @@ int redisContextConnect(redisContext *c, const char *addr, int port) {
c->fd = s; c->fd = s;
return REDIS_OK; return REDIS_OK;
} }
int redisContextConnectUnix(redisContext *c, const char *path) {
int s;
int blocking = (c->flags & REDIS_BLOCK);
struct sockaddr_un sa;
if ((s = redisCreateSocket(c,AF_LOCAL)) == REDIS_ERR)
return REDIS_ERR;
if (!blocking && redisSetNonBlock(c,s) != REDIS_OK)
return REDIS_ERR;
sa.sun_family = AF_LOCAL;
strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
if (connect(s, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
if (errno == EINPROGRESS && !blocking) {
/* This is ok. */
} else {
__redisSetError(c,REDIS_ERR_IO,NULL);
close(s);
return REDIS_ERR;
}
}
c->fd = s;
return REDIS_OK;
}
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#ifndef __NET_H #ifndef __NET_H
#define __NET_H #define __NET_H
int redisContextConnect(redisContext *c, const char *addr, int port); int redisContextConnectTcp(redisContext *c, const char *addr, int port);
int redisContextConnectUnix(redisContext *c, const char *path);
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment