Mercurial > hgrepos > FreeBSD > ports > net > turnserver
view files/patch-src_apps_common_hiredis__libevent2.c @ 18:4a6383e57d12
Compile with coturn 4.5.1.3 (GitHub): some security patches are already included now -- "socket" Redis option is included again
| author | Franz Glasner <fzglas.hg@dom66.de> |
|---|---|
| date | Wed, 02 Sep 2020 22:38:36 +0200 |
| parents | 9a1ee735f28f |
| children | 735b41782ed7 |
line wrap: on
line source
--- src/apps/common/hiredis_libevent2.c.orig +++ src/apps/common/hiredis_libevent2.c @@ -55,6 +55,7 @@ char *ip; int port; char *pwd; + char *usocket; int db; }; @@ -223,12 +224,13 @@ ///////////////////////// Attach ///////////////////////////////// -redis_context_handle redisLibeventAttach(struct event_base *base, char *ip0, int port0, char *pwd, int db) +redis_context_handle redisLibeventAttach(struct event_base *base, char *ip0, int port0, char *pwd, char *usocket, int db) { struct redisLibeventEvents *e = NULL; redisAsyncContext *ac = NULL; + char sockpath[256] = "\0"; char ip[256]; if(ip0 && ip0[0]) STRCPY(ip,ip0); @@ -239,7 +241,14 @@ if(port0>0) port=port0; - ac = redisAsyncConnect(ip, port); + if(usocket) + STRCPY(sockpath, usocket); + + if(usocket) { + ac = redisAsyncConnectUnix(sockpath); + } else { + ac = redisAsyncConnect(ip, port); + } if (!ac) { fprintf(stderr,"Error: %s:%s\n", ac->errstr, ac->c.errstr); return NULL; @@ -256,6 +265,11 @@ e->port = port; if(pwd) e->pwd = strdup(pwd); + if(usocket) { + e->usocket = strdup(usocket); + } else { + e->usocket = NULL; + } e->db = db; /* Register functions to start/stop listening for events */ @@ -277,6 +291,12 @@ e); if (e->rev == NULL || e->wev == NULL) { + if(e->rev) + event_free(e->rev); + if(e->wev) + event_free(e->wev); + free(e->ip); + free(e->pwd); free(e); return NULL; } @@ -327,7 +347,11 @@ e->context = NULL; } - ac = redisAsyncConnect(e->ip, e->port); + if(e->usocket) { + ac = redisAsyncConnectUnix(e->usocket); + } else { + ac = redisAsyncConnect(e->ip, e->port); + } if(!ac) { return; }
