sr-dev August 2021

sr-dev@lists.kamailio.org

19 participants
269 discussions

git:master:3297e99c: outbound: fix compiler warning on SHA1() call
by Daniel-Constantin Mierla 04 Aug '21

04 Aug '21

Module: kamailio Branch: master Commit: 3297e99c1ed5d3cbd2ada5597ab2a123dce4b44d URL: https://github.com/kamailio/kamailio/commit/3297e99c1ed5d3cbd2ada5597ab2a12… Author: Michael Furmur <furmur(a)pm.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-04T10:35:46+02:00 outbound: fix compiler warning on SHA1() call --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3297e99c1ed5d3cbd2ada5597ab2a12… Patch: https://github.com/kamailio/kamailio/commit/3297e99c1ed5d3cbd2ada5597ab2a12… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index ada7062454..df9538aace 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -109,7 +109,7 @@ static int mod_init(void) if(flow_token_secret.s) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); - SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); + SHA1((const unsigned char *)flow_token_secret.s, flow_token_secret.len, (unsigned char *)ob_key.s); } else { if (RAND_bytes((unsigned char *) ob_key.s, ob_key.len) == 0) {

1 0

git:master:fc313c17: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 04 Aug '21

04 Aug '21

Module: kamailio Branch: master Commit: fc313c17e5846ab0e9e594dd50ca156a2bd71534 URL: https://github.com/kamailio/kamailio/commit/fc313c17e5846ab0e9e594dd50ca156… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-04T09:31:21+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/fc313c17e5846ab0e9e594dd50ca156… Patch: https://github.com/kamailio/kamailio/commit/fc313c17e5846ab0e9e594dd50ca156… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index a805644ef1..0712afd04a 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -45,6 +45,8 @@ Daniel-Constantin Mierla 2.24. bl_iterator_end(iname) 2.25. textopsx.f.bl_iterator_next(iname) 2.26. bl_iterator_rm(iname) + 2.27. bl_iterator_append(iname, text) + 2.28. bl_iterator_insert(iname, text) 3. Selects @@ -80,7 +82,9 @@ Daniel-Constantin Mierla 1.24. bl_iterator_end usage 1.25. bl_iterator_next usage 1.26. bl_iterator_rm usage - 1.27. @hf_value select usage + 1.27. bl_iterator_append usage + 1.28. bl_iterator_insert usage + 1.29. @hf_value select usage Chapter 1. Admin Guide @@ -115,6 +119,8 @@ Chapter 1. Admin Guide 2.24. bl_iterator_end(iname) 2.25. textopsx.f.bl_iterator_next(iname) 2.26. bl_iterator_rm(iname) + 2.27. bl_iterator_append(iname, text) + 2.28. bl_iterator_insert(iname, text) 3. Selects @@ -160,6 +166,8 @@ Chapter 1. Admin Guide 2.24. bl_iterator_end(iname) 2.25. textopsx.f.bl_iterator_next(iname) 2.26. bl_iterator_rm(iname) + 2.27. bl_iterator_append(iname, text) + 2.28. bl_iterator_insert(iname, text) 2.1. msg_apply_changes() @@ -653,6 +661,46 @@ bl_iterator_end("b1"); bl_iterator_end("b1"); ... +2.27. bl_iterator_append(iname, text) + + Add text after the line at the current iterator possition. + + The parameters can be dynamic strings with variables. + + This function can be used from ANY_ROUTE. + + Example 1.27. bl_iterator_append usage +... + bl_iterator_start("b1"); + while(bl_iterator_next("b1")) { + if($blitval(b1)=~"^a=info:xyz") { + bl_iterator_append("b1", "a=info:abc\r\n"); + break; + } + } + bl_iterator_end("b1"); +... + +2.28. bl_iterator_insert(iname, text) + + Add text before the line at the current iterator possition. + + The parameters can be dynamic strings with variables. + + This function can be used from ANY_ROUTE. + + Example 1.28. bl_iterator_insert usage +... + bl_iterator_start("b1"); + while(bl_iterator_next("b1")) { + if($blitval(b1)=~"^a=info:xyz") { + bl_iterator_insert("b1", "a=info:abc\r\n"); + break; + } + } + bl_iterator_end("b1"); +... + 3. Selects 3.1. @hf_value @@ -688,7 +736,7 @@ bl_iterator_end("b1"); * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.27. @hf_value select usage + Example 1.29. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

1 0

git:master:bc25f098: textopsx: bl iterator functions to append/insert text
by Daniel-Constantin Mierla 04 Aug '21

04 Aug '21

Module: kamailio Branch: master Commit: bc25f098cfd0915daf3c086251f9dbe83eecb6c5 URL: https://github.com/kamailio/kamailio/commit/bc25f098cfd0915daf3c086251f9dbe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-04T09:07:36+02:00 textopsx: bl iterator functions to append/insert text --- Modified: src/modules/textopsx/doc/functions.xml Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/bc25f098cfd0915daf3c086251f9dbe… Patch: https://github.com/kamailio/kamailio/commit/bc25f098cfd0915daf3c086251f9dbe…

1 0

[kamailio/kamailio] SDP filtering issues with sdpops module (#2755)
by Alessio Garzi 03 Aug '21

03 Aug '21

In order to filter some specific codes from the SDP I am using this functions from sdpops module - sdp_keep_codecs_by_name() - sdp_remove_codecs_by_name() - sdp_keep_codecs_by_id - sdp_remove_codecs_by_id and since they use the same code for filtering the problem I am going to describe affects all of them. Let's say I have this data inside my SDP ``` ... a=rtcp-xr:rcvr-rtt=all:10000 stat-summary=loss,dup,jitt,TTL voip-metrics m=audio 7078 RTP/AVPF 96 97 98 0 8 3 9 18 101 99 100 a=rtpmap:96 opus/48000/2 a=fmtp:96 useinbandfec=1 a=rtpmap:97 speex/16000 a=fmtp:97 vbr=on a=rtpmap:98 speex/8000 a=fmtp:98 vbr=on a=fmtp:18 annexb=yes a=rtpmap:101 telephone-event/48000 a=rtpmap:99 telephone-event/16000 a=rtpmap:100 telephone-event/8000 a=rtcp-fb:* trr-int 1000 a=rtcp-fb:* ccm tmmbr m=video 9078 RTP/AVPF 96 97 a=rtpmap:96 VP8/90000 a=rtpmap:97 H264/90000 a=fmtp:97 profile-level-id=42801F a=rtcp-fb:* trr-int 1000 a=rtcp-fb:* ccm tmmbr a=rtcp-fb:96 nack pli a=rtcp-fb:96 nack sli a=rtcp-fb:96 ack rpsi a=rtcp-fb:96 ccm fir a=rtcp-fb:97 nack pli a=rtcp-fb:97 ccm fir ``` The sdp_keep_codecs_by_id (and I assume all other analog filter functions) correctly detects 2 SDP sessions, one for the audio and one for the video. Now, let's say we want to allow only PCMA,PCMU,GSM,telephone-event ( id 8,0,3,100,99,101 ), this means for example that 96 and 97 codecs have to be stripped. For this reason the functions sdp_remove_str_codec_id_attrs() and sdp_remove_str_codec_id() are executed passing the correct id we want to filter. The sdp_remove_str_codec_id_attrs() will then remove the corresponding lines from the SDP but ONLY IF relative to rtpmap and fmtp. This means that a=rtcp* lines will not be filtered even if they are relative to a filtered codec and this is not what the user expects. Interestingly the sdp_remove_str_codec_id_attrs() function delete the lines only if there is a match with the sdp_payload_attr linked list. https://github.com/kamailio/kamailio/blob/758c85a09ebb2848d0fd2ee82c48784b8… This linked list is built at core level and only exposes rtp_payload and fmtp_string as described here. https://github.com/kamailio/kamailio/blob/758c85a09ebb2848d0fd2ee82c48784b8… So, in other words, the sdpops module has no clue of "a=rtcp-fb*" attributes and cannot be implemented to filter them in a neat way. Another issue arises for the "m=video 9078 RTP/AVPF 96 97" line. Here, since we are filtering 96 and 97, the line remains without ids, maybe it would be better to delete the whole line? The final result after applying my filter is the following ``` m=video 23088 RTP/AVPF a=rtcp-fb:* trr-int 1000 a=rtcp-fb:* ccm tmmbr a=rtcp-fb:96 nack pli a=rtcp-fb:96 nack sli a=rtcp-fb:96 ack rpsi a=rtcp-fb:96 ccm fir a=rtcp-fb:97 nack pli a=rtcp-fb:97 ccm fir ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2755

2 5

git:master:1a15a18e: sdpops: refactored sdp_remove_str_codec_id_attrs()
by Daniel-Constantin Mierla 03 Aug '21

03 Aug '21

Module: kamailio Branch: master Commit: 1a15a18eacd5764e9ba6240acbe37e645368f825 URL: https://github.com/kamailio/kamailio/commit/1a15a18eacd5764e9ba6240acbe37e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-03T08:52:19+02:00 sdpops: refactored sdp_remove_str_codec_id_attrs() - line oriented matching of codec addributes - support to remove a=rtcp-fb per codec, GH #2755 --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1a15a18eacd5764e9ba6240acbe37e6… Patch: https://github.com/kamailio/kamailio/commit/1a15a18eacd5764e9ba6240acbe37e6… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index bebe01ba5c..37655fde4b 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -195,48 +195,45 @@ int sdp_locate_line(sip_msg_t* msg, char *pos, str *aline) int sdp_remove_str_codec_id_attrs(sip_msg_t* msg, sdp_stream_cell_t* sdp_stream, str *rm_codec) { + str sdp_attrs_list[] = { + str_init("a=rtpmap:"), + str_init("a=fmtp:"), + str_init("a=rtcp-fb:"), + {0, 0} + }; + int i; str aline = {0, 0}; - sdp_payload_attr_t *payload; + str raw_stream = {0, 0}; struct lump *anchor; - payload = sdp_stream->payload_attr; - while (payload) { - LM_DBG("a= ... for codec %.*s/%.*s\n", - payload->rtp_payload.len, payload->rtp_payload.s, - payload->rtp_enc.len, payload->rtp_enc.s); - if(rm_codec->len==payload->rtp_payload.len - && strncmp(payload->rtp_payload.s, rm_codec->s, - rm_codec->len)==0) { - if(payload->rtp_enc.s!=NULL) { - if(sdp_locate_line(msg, payload->rtp_enc.s, &aline)==0) - { - LM_DBG("removing line: %.*s", aline.len, aline.s); - anchor = del_lump(msg, aline.s - msg->buf, - aline.len, 0); - if (anchor == NULL) { - LM_ERR("failed to remove [%.*s] inside [%.*s]\n", - rm_codec->len, rm_codec->s, - aline.len, aline.s); - return -1; - } - } - } - if(payload->fmtp_string.s!=NULL) { - if(sdp_locate_line(msg, payload->fmtp_string.s, &aline)==0) - { - LM_DBG("removing line: %.*s\n", aline.len, aline.s); - anchor = del_lump(msg, aline.s - msg->buf, - aline.len, 0); - if (anchor == NULL) { - LM_ERR("failed to remove [%.*s] inside [%.*s]\n", - rm_codec->len, rm_codec->s, - aline.len, aline.s); - return -1; + raw_stream = sdp_stream->raw_stream; + while(raw_stream.len>5) { + sdp_locate_line(msg, raw_stream.s, &aline); + /* process attribute lines: a=x:c... */ + if((aline.len>5) && ((aline.s[0] | 0x20)=='a')) { + LM_DBG("processing sdp line [%.*s]\n", aline.len, aline.s); + for(i=0; sdp_attrs_list[i].s!=NULL; i++) { + if(aline.len > sdp_attrs_list[i].len + rm_codec->len) { + if(strncasecmp(aline.s, sdp_attrs_list[i].s, + sdp_attrs_list[i].len)==0 + && strncmp(aline.s+sdp_attrs_list[i].len, rm_codec->s, + rm_codec->len)==0 + && aline.s[sdp_attrs_list[i].len + rm_codec->len]==' ') { + LM_DBG("removing line: [%.*s]\n", aline.len, aline.s); + anchor = del_lump(msg, aline.s - msg->buf, + aline.len, 0); + if (anchor == NULL) { + LM_ERR("failed to remove - id [%.*s] line [%.*s]\n", + rm_codec->len, rm_codec->s, + aline.len, aline.s); + return -1; + } } } } } - payload=payload->next; + raw_stream.s = aline.s + aline.len; + raw_stream.len -= aline.len; } return 0;

1 0

git:master:4191a819: core: parser sdp - shorten debug message with sdp line
by Daniel-Constantin Mierla 03 Aug '21

03 Aug '21

Module: kamailio Branch: master Commit: 4191a8193025499df64f13d59f5716563e573161 URL: https://github.com/kamailio/kamailio/commit/4191a8193025499df64f13d59f57165… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-03T08:51:11+02:00 core: parser sdp - shorten debug message with sdp line - was printing the rest of the body, print now max 20 chars --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/4191a8193025499df64f13d59f57165… Patch: https://github.com/kamailio/kamailio/commit/4191a8193025499df64f13d59f57165… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index 7dbf259379..d5e4f0695b 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -584,7 +584,8 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ a1p = stream->path.s + stream->path.len; } else { /* unknown a= line, ignore -- jump over it */ - LM_DBG("ignoring unknown type in a= line: `%.*s'\n", tmpstr1.len, tmpstr1.s); + LM_DBG("ignoring unknown type in a= line: `%.*s...'\n", + (tmpstr1.len>20)?20:tmpstr1.len, tmpstr1.s); a1p += 2; }

1 0

git:master:921b5cbc: textops: find start of header body for filter functions
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 921b5cbcda4637393af386219cbdf4a0f9b3d3a8 URL: https://github.com/kamailio/kamailio/commit/921b5cbcda4637393af386219cbdf4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T16:09:34+02:00 textops: find start of header body for filter functions - GH #2748 --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/921b5cbcda4637393af386219cbdf4a… Patch: https://github.com/kamailio/kamailio/commit/921b5cbcda4637393af386219cbdf4a… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index b2ad856cfc..05491ab184 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1598,7 +1598,7 @@ static inline int find_line_start(char *text, unsigned int text_len, } static inline int find_hdr_line_start(char *hname, unsigned int hname_len, - char **buf, unsigned int *buf_len) + char **buf, unsigned int *buf_len, char **bstart) { hdr_field_t h1; hdr_field_t h2; @@ -1624,11 +1624,11 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, if(h1.type>0 && h1.type==h2.type) { *buf = start; *buf_len = len; - return 1; - } else if(cmp_hdrname_str(&h1.name, &h2.name)==0) { + goto found; + } else if(cmpi_str(&h1.name, &h2.name)==0) { *buf = start; *buf_len = len; - return 1; + goto found; } } /* jump to next line */ @@ -1645,6 +1645,21 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, } } return 0; + +found: + ch = memchr(start, ':', len - 1); + if(ch==NULL) { + LM_ERR("weird - no ':' found\n"); + return 0; + } + ch++; + while((ch < start + len) && (*ch==' ' || *ch=='\t')) ch++; + if(ch==start + len) { + LM_ERR("no header body content\n"); + return 0; + } + *bstart = ch; + return 1; } /** @@ -1670,6 +1685,7 @@ static int check_multipart(struct sip_msg *msg) static int ki_filter_body(struct sip_msg* msg, str *content_type) { char *start; + char *end; unsigned int len; str body; str boundary = {0,0}; @@ -1695,11 +1711,11 @@ static int ki_filter_body(struct sip_msg* msg, str *content_type) start = body.s; len = body.len; - while (find_hdr_line_start("Content-Type: ", 14, &start, &len)) + while (find_hdr_line_start("Content-Type: ", 14, &start, &len, &end)) { - start = start + 14; - len = len - 14; + len = len - (end - start); LM_DBG("line: [%.*s]\n", len, start); + start = end; if (len > content_type->len + 2) { if (strncasecmp(start, content_type->s, content_type->len)== 0) { @@ -3239,10 +3255,9 @@ static int ki_remove_multibody(sip_msg_t* msg, str* content_type) start = body.s; len = body.len; - while (find_hdr_line_start("Content-Type: ", 14, &start, &len)) + while (find_hdr_line_start("Content-Type: ", 14, &start, &len, &end)) { - end = start + 14; - len = len - 14; + len = len - (end - start); if (len > (content_type->len + 2)) { if (strncasecmp(end, content_type->s, content_type->len)== 0) { @@ -3345,10 +3360,9 @@ static int ki_get_body_part_helper(sip_msg_t* msg, str* ctype, pv_spec_t *dst, len = body.len; /* note: header body can follow just after name: - fixit */ - while (find_hdr_line_start("Content-Type: ", 14, &start, &len)) + while (find_hdr_line_start("Content-Type: ", 14, &start, &len, &end)) { - end = start + 14; - len = len - 14; + len = len - (end - start); if (len > (ctype->len + 2)) { if (strncasecmp(end, ctype->s, ctype->len)== 0) {

1 0

[kamailio/kamailio] db_redis connection broken after idle serveral minutes if redis server with timeout setting (#2764)
by FredWH 02 Aug '21

02 Aug '21

### Description db_redis connection broken after idle several minutes if redis server with timeout setting ### Troubleshooting #### Reproduction 1. configure Redis server with timeout 600. (10 minutes) 2. configure Kamailio with db_redis module and usrloc module modparam("usrloc", "db_url", "REDIS_CONNECT") 3. at client side, try to register, then close client tool. 4. after idle for 10+ minutes, no any registion, reopen client tool and try to register, <- register failed. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  db_redis [redis_dbase.c:2504]: db_redis_insert(): Failed to fetch type entry: Broken pipe db_redis [redis_dbase.c:2568]: db_redis_insert(): failed to do the insert usrloc [ucontact.c:687]: db_insert_ucontact(): inserting contact in db failed 1001 (uloc-60b45e88-1c5d-d) usrloc [urecord.c:601]: insert_ucontact(): failed to insert in database registrar [save.c:537]: insert_contacts(): failed to insert contact sl [sl_funcs.c:414]: sl_reply_error(): stateless error reply used: I'm terribly sorry, server error occurred (1/SL) #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.5.0 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 8.3.0 PS: 5.4.5 has the same issue. * **Operating System**:  Debian 10.9 Linux test1 4.19.0-16-cloud-amd64 #1 SMP Debian 4.19.181-1 (2021-03-19) x86_64 GNU/Linux -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2764

2 2

[kamailio/kamailio] db_redis: fix broken pipe issue, if redis server with timeout setting. (#2791)
by FredWH 02 Aug '21

02 Aug '21

- issue #2764   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [*] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2791 -- Commit Summary -- * db_redis: fix broken pipe issue, if redis server with timeout setting. -- File Changes -- M src/modules/db_redis/redis_connection.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2791.patch https://github.com/kamailio/kamailio/pull/2791.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2791

3 5

git:master:7cec977f: db_redis: fix broken pipe issue, if redis server with timeout setting.
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 7cec977f8e12bbeb0309d903e02461d1ccbf41a8 URL: https://github.com/kamailio/kamailio/commit/7cec977f8e12bbeb0309d903e02461d… Author: FredWH <wh720(a)139.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T15:00:18+02:00 db_redis: fix broken pipe issue, if redis server with timeout setting. - issue #2764 --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/7cec977f8e12bbeb0309d903e02461d… Patch: https://github.com/kamailio/kamailio/commit/7cec977f8e12bbeb0309d903e02461d… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index ad2921f1d5..dd421a7844 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -305,7 +305,8 @@ void *db_redis_command_argv(km_redis_con_t *con, redis_key_t *query) { LM_DBG("query has %d args\n", argc); redisReply *reply = redisCommandArgv(con->con, argc, (const char**)argv, NULL); - if (con->con->err == REDIS_ERR_EOF) { + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); pkg_free(argv); @@ -344,7 +345,8 @@ int db_redis_append_command_argv(km_redis_con_t *con, redis_key_t *query, int qu // this should actually never happen, because if all replies // are properly consumed for the previous command, it won't send // out a new query until redisGetReply is called - if (con->con->err == REDIS_ERR_EOF) { + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); pkg_free(argv); @@ -374,8 +376,8 @@ int db_redis_get_reply(km_redis_con_t *con, void **reply) { *reply = NULL; ret = redisGetReply(con->con, reply); - if (con->con->err == REDIS_ERR_EOF) { - LM_DBG("redis connection is gone, try reconnect\n"); + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); con->append_counter = 0; if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); @@ -396,7 +398,7 @@ int db_redis_get_reply(km_redis_con_t *con, void **reply) { db_redis_key_free(&query); } ret = redisGetReply(con->con, reply); - if (con->con->err != REDIS_ERR_EOF) { + if (con->con->err == REDIS_OK) { con->append_counter--; } } else {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2021