Mercurial > hgrepos > FreeBSD > ports > net > turnserver

comparison files/patch-src_apps_relay_hiredis__libevent2.c @ 33:e5d83559f2b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Recreate patches. Major refactoring because paths have changed and the style of some source files has changed.
author Franz Glasner <fzglas.hg@dom66.de>
date Mon, 17 Mar 2025 11:17:31 +0100
parents files/patch-src_apps_common_hiredis__libevent2.c@4e4af36a675a
children
comparison
equal deleted inserted replaced
32:ede848cde37b 33:e5d83559f2b5
1 --- src/apps/relay/hiredis_libevent2.c.orig 2024-12-11 18:13:38 UTC
2 +++ src/apps/relay/hiredis_libevent2.c
3 @@ -52,6 +52,7 @@ struct redisLibeventEvents {
4 int port;
5 char *user;
6 char *pwd;
7 + char *usocket;
8 int db;
9 };
10
11 @@ -213,8 +214,10 @@ void send_message_to_redis(redis_context_handle rch, c
12
13 ///////////////////////// Attach /////////////////////////////////
14
15 -redis_context_handle redisLibeventAttach(struct event_base *base, char *ip0, int port0, char *user, char *pwd, int db) {
16 +redis_context_handle redisLibeventAttach(struct event_base *base, char *ip0, int port0, char *usocket, char *user, char *pwd, int db) {
17
18 + redisAsyncContext *ac = NULL;
19 + char sockpath[256] = "\0";
20 char ip[256];
21 if (ip0 && ip0[0]) {
22 STRCPY(ip, ip0);
23 @@ -227,7 +230,11 @@ redis_context_handle redisLibeventAttach(struct event_
24 port = port0;
25 }
26
27 - redisAsyncContext *ac = redisAsyncConnect(ip, port);
28 + if(usocket && usocket[0]) {
29 + ac = redisAsyncConnectUnix(sockpath);
30 + } else {
31 + ac = redisAsyncConnect(ip, port);
32 + }
33 if (!ac) {
34 fprintf(stderr, "Error: redisAsyncConnect returned NULL\n");
35 return NULL;
36 @@ -253,6 +260,9 @@ redis_context_handle redisLibeventAttach(struct event_
37 if (pwd) {
38 e->pwd = strdup(pwd);
39 }
40 + if (usocket) {
41 + e->usocket = strdup(usocket);
42 + }
43 e->db = db;
44
45 /* Register functions to start/stop listening for events */
46 @@ -270,6 +280,16 @@ redis_context_handle redisLibeventAttach(struct event_
47 e->wev = event_new(e->base, e->context->c.fd, EV_WRITE, redisLibeventWriteEvent, e);
48
49 if (e->rev == NULL || e->wev == NULL) {
50 + if (e->rev) {
51 + event_free(e->rev);
52 + }
53 + if (e->wev) {
54 + event_free(e->wev);
55 + }
56 + free(e->ip);
57 + free(e->usocket);
58 + free(e->user);
59 + free(e->pwd);
60 free(e);
61 return NULL;
62 }
63 @@ -329,7 +349,11 @@ static void redis_reconnect(struct redisLibeventEvents
64 e->context = NULL;
65 }
66
67 - ac = redisAsyncConnect(e->ip, e->port);
68 + if(e->usocket) {
69 + ac = redisAsyncConnectUnix(e->usocket);
70 + } else {
71 + ac = redisAsyncConnect(e->ip, e->port);
72 + }
73 if (!ac) {
74 return;
75 }