zeekling/hiredis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-11-03 11:12:26 +01:00
parent 8220cd4ba6
commit 0ccb2c8d89
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hiredis.c
View File

@ -655,7 +655,7 @@ redisContext *redisConnect(const char *ip, int port) {
redisContext *c = redisContextInit();
c->flags |= REDIS_BLOCK;
c->flags |= REDIS_CONNECTED;
redisContextConnect(c,ip,port);
redisContextConnectTcp(c,ip,port);
return c;
}
@ -663,7 +663,7 @@ redisContext *redisConnectNonBlock(const char *ip, int port) {
redisContext *c = redisContextInit();
c->flags &= ~REDIS_BLOCK;
c->flags |= REDIS_CONNECTED;
redisContextConnect(c,ip,port);
redisContextConnectTcp(c,ip,port);
return c;
}

29
net.c
View File

@ -31,6 +31,7 @@
#include "fmacros.h"
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
@ -95,7 +96,7 @@ static int redisSetTcpNoDelay(redisContext *c, int fd) {
return REDIS_OK;
}
int redisContextConnect(redisContext *c, const char *addr, int port) {
int redisContextConnectTcp(redisContext *c, const char *addr, int port) {
int s;
int blocking = (c->flags & REDIS_BLOCK);
struct sockaddr_in sa;
@ -138,3 +139,29 @@ int redisContextConnect(redisContext *c, const char *addr, int port) {
c->fd = s;
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;
}

3
net.h
View File

@ -31,6 +31,7 @@
#ifndef __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