sr-dev

sr-dev@lists.kamailio.org

13 participants
45252 discussions

git:master:28f4cab2: dispatcher: use safer macros for temporarily making zero-ending strings
by Daniel-Constantin Mierla 29 Apr '20

29 Apr '20

Module: kamailio Branch: master Commit: 28f4cab2878b441eb6ddbed03ae7ddbcdbae37e2 URL: https://github.com/kamailio/kamailio/commit/28f4cab2878b441eb6ddbed03ae7ddb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-29T09:43:53+02:00 dispatcher: use safer macros for temporarily making zero-ending strings --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/28f4cab2878b441eb6ddbed03ae7ddb… Patch: https://github.com/kamailio/kamailio/commit/28f4cab2878b441eb6ddbed03ae7ddb… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 004bb0cfae..589b54f5b8 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -420,23 +420,16 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) } else if(dp->attrs.socket.s && dp->attrs.socket.len > 0) { /* parse_phostport(...) expects 0-terminated string * - after socket parameter is either ';' or '\0' */ - if(dp->attrs.socket.s[dp->attrs.socket.len] != '\0') { - c = dp->attrs.socket.s[dp->attrs.socket.len]; - dp->attrs.socket.s[dp->attrs.socket.len] = '\0'; - } + STR_VTOZ(dp->attrs.socket.s[dp->attrs.socket.len], c); if(parse_phostport( dp->attrs.socket.s, &host.s, &host.len, &port, &proto) != 0) { LM_ERR("bad socket <%.*s>\n", dp->attrs.socket.len, dp->attrs.socket.s); - if(c != 0) { - dp->attrs.socket.s[dp->attrs.socket.len] = c; - } + STR_ZTOV(dp->attrs.socket.s[dp->attrs.socket.len], c); goto err; } - if(c != 0) { - dp->attrs.socket.s[dp->attrs.socket.len] = c; - } + STR_ZTOV(dp->attrs.socket.s[dp->attrs.socket.len], c); dp->sock = grep_sock_info(&host, (unsigned short)port, proto); if(dp->sock == 0) { LM_ERR("non-local socket <%.*s>\n", dp->attrs.socket.len,

1 0

Next online devel meeting - Wed, Apr 29, 2020, 14:00UTC
by Daniel-Constantin Mierla 29 Apr '20

29 Apr '20

Hello, in order to plan the roadmap to next major release, it is time to organize another online devel meeting, so the developers and community members can syncronize and plan what should be done till Kamailio v5.4 will be out. Because freenode.net service is now requiring user registration to join IRC channels on their servers, we are considering some alternatives that would allow guest participation, one of them being using a matrix chat room. More details about it will be posted soon. I created a wiki page for the event at: * https://www.kamailio.org/wiki/devel/irc-meetings/2020a Feel free to add there topics that you want to be discussed. The proposed date is next Wednesday, April 29, 2020, at 14:00UTC (15:00 London/Dublin, 16:00 most of West Europe, 10:00 New York), but other dates can be proposed if they suit for more participants. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

4 7

[kamailio/kamailio] TOS field not overtaken by RTPengine (#2303)
by mihovilkolaric 29 Apr '20

29 Apr '20

### Description Altough setting TOS to -1, the TOS-header of the outgoing RTP stream is always set to the default TOS (184, resp 0xb0). ### Troubleshooting #### Reproduction Use following flags in rtpengine_manage: `rtpengine_manage("ICE=remove record-call=on call-id=$avp(correlationId) TOS=-1");` and set up a dialog, where the RTP-stream from the UA towards the rtpengine has TOS-field (e.g.: 0x80). Based on the documentation > A value of -1 may be used to leave the currently used TOS unchanged. the expected behavior was, that also the stream from rtpengine to the other UA has the same TOS field. However, the stream from rtpengine has the default value 0xb0 #### Debugging Data Relevant call in kamailio.cfg: ``` rtpengine_manage("ICE=remove record-call=on call-id=$avp(correlationId) TOS=-1"); ``` #### Log Messages  ``` 2020-04-27T14:50:08.001+02:00 vm1 rtpengine[129780] debug: DEBUG: timer run time = 0.000060 sec 2020-04-27T14:50:08.001+02:00 vm1 rtpengine[130247] debug: DEBUG: timer run time = 0.000060 sec 2020-04-27T14:50:08.968+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS]: Received command 'offer' from 192.168.211.21:47072 2020-04-27T14:50:08.968+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Dump for 'offer' from 192.168.211.21:47072: { "supports": [ "load limit" ], "sdp": "v=0 o=UA1 0 1 IN IP4 127.0.0.1 s=testcall t=0 0 m=audio 6001 RTP/AVP 8 c=IN IP4 127.0.0.1 a=rtpmap:8 PCMA/8000 a=sendrecv a=ptime:20 a=maxptime:20 a=interval:20 ", "ICE": "remove", "record-call": "on", "TOS": -1, "call-id": "75CzR7D4L7Cjjpdhq1dbyS", "received-from": [ "IP4", "127.0.0.1" ], "from-tag": "1", "command": "offer" } 2020-04-27T14:50:08.968+02:00 vm1 rtpengine[129780] notice: NOTICE: [75CzR7D4L7Cjjpdhq1dbyS]: Creating new call 2020-04-27T14:50:08.969+02:00 vm1 rtpengine[129780] notice: NOTICE: [75CzR7D4L7Cjjpdhq1dbyS]: Turning on call recording. 2020-04-27T14:50:08.969+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: kernel call idx is 0 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Default sink codec is PCMA/8000 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: 0 DTMF sink entries 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Creating codec handler for PCMA/8000 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Sink supports codec PCMA/8000 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Using passthrough handler for PCMA/8000 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: creating send_timer 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: creating send_timer 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: creating send_timer 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: creating send_timer 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: kernel stream idx is 0 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: kernel stream idx is 1 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: set FILLED flag for stream 127.0.0.1:6001 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: set FILLED flag for stream 127.0.0.1:6002 2020-04-27T14:50:08.974+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: kernel stream idx is 2 2020-04-27T14:50:08.974+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: kernel stream idx is 3 2020-04-27T14:50:08.974+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS]: Replying to 'offer' from 192.168.211.21:47072 (elapsed time 0.002197 sec) 2020-04-27T14:50:08.974+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Response dump for 'offer' to 192.168.211.21:47072: { "sdp": "v=0 o=UA1 0 1 IN IP4 127.0.0.1 s=testcall t=0 0 m=audio 6004 RTP/AVP 8 c=IN IP4 192.168.211.21 a=maxptime:20 a=interval:20 a=rtpmap:8 PCMA/8000 a=sendrecv a=rtcp:6005 a=ptime:20 ", "result": "ok" } 2020-04-27T14:50:08.982+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS]: Received command 'answer' from 192.168.211.21:60917 2020-04-27T14:50:08.982+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Dump for 'answer' from 192.168.211.21:60917: { "supports": [ "load limit" ], "sdp": "v=0 o=UA2 0 1 IN IP4 127.0.0.1 s=testcall t=0 0 m=audio 6000 RTP/AVP 8 c=IN IP4 127.0.0.1 a=rtpmap:8 PCMA/8000 a=sendrecv a=ptime:20 a=maxptime:20 a=interval:20 ", "ICE": "remove", "record-call": "on", "TOS": -1, "call-id": "75CzR7D4L7Cjjpdhq1dbyS", "received-from": [ "IP4", "127.0.0.1" ], "from-tag": "1", "to-tag": "SIPp1", "command": "answer" } 2020-04-27T14:50:08.982+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Default sink codec is PCMA/8000 2020-04-27T14:50:08.983+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: 0 DTMF sink entries 2020-04-27T14:50:08.983+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Creating codec handler for PCMA/8000 2020-04-27T14:50:08.983+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Sink supports codec PCMA/8000 2020-04-27T14:50:08.984+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Using passthrough handler for PCMA/8000 2020-04-27T14:50:08.984+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: set FILLED flag for stream 127.0.0.1:6000 2020-04-27T14:50:08.985+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: set FILLED flag for stream 127.0.0.1:6001 2020-04-27T14:50:08.985+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS]: Replying to 'answer' from 192.168.211.21:60917 (elapsed time 0.000265 sec) 2020-04-27T14:50:08.985+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Response dump for 'answer' to 192.168.211.21:60917: { "sdp": "v=0 o=UA2 0 1 IN IP4 127.0.0.1 s=testcall t=0 0 m=audio 6032 RTP/AVP 8 c=IN IP4 192.168.211.21 a=maxptime:20 a=interval:20 a=rtpmap:8 PCMA/8000 a=sendrecv a=rtcp:6033 a=ptime:20 ", "result": "ok" } 2020-04-27T14:50:09.001+02:00 vm1 rtpengine[130247] debug: DEBUG: timer run time = 0.000057 sec 2020-04-27T14:50:09.001+02:00 vm1 rtpengine[129780] debug: DEBUG: timer run time = 0.000059 sec 2020-04-27T14:50:11.001+02:00 vm1 rtpengine[130247] debug: DEBUG: timer run time = 0.000041 sec 2020-04-27T14:50:11.001+02:00 vm1 rtpengine[129780] debug: DEBUG: timer run time = 0.000043 sec 2020-04-27T14:50:11.494+02:00 vm1 rtpengine[129780] info: INFO: Received command 'ping' from 192.168.211.21:51806 2020-04-27T14:50:11.494+02:00 vm1 rtpengine[129780] debug: DEBUG: Dump for 'ping' from 192.168.211.21:51806: { "command": "ping" } 2020-04-27T14:50:11.495+02:00 vm1 rtpengine[129780] info: INFO: Replying to 'ping' from 192.168.211.21:51806 (elapsed time 0.000001 sec) 2020-04-27T14:50:11.495+02:00 vm1 rtpengine[129780] debug: DEBUG: Response dump for 'ping' to 192.168.211.21:51806: { "result": "pong" } 2020-04-27T14:50:13.001+02:00 vm1 rtpengine[130247] debug: DEBUG: timer run time = 0.000050 sec 2020-04-27T14:50:13.001+02:00 vm1 rtpengine[129780] debug: DEBUG: timer run time = 0.000058 sec 2020-04-27T14:50:14.001+02:00 vm1 rtpengine[130247] debug: DEBUG: timer run time = 0.000045 sec 2020-04-27T14:50:14.001+02:00 vm1 rtpengine[129780] debug: DEBUG: timer run time = 0.000056 sec 2020-04-27T14:50:14.001+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Confirmed peer address as 127.0.0.1:6001 2020-04-27T14:50:14.001+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19303 TS 160) 2020-04-27T14:50:14.021+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19304 TS 320) 2020-04-27T14:50:14.040+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19305 TS 480) 2020-04-27T14:50:14.061+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19306 TS 640) 2020-04-27T14:50:14.080+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19307 TS 800) 2020-04-27T14:50:14.102+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19308 TS 960) 2020-04-27T14:50:14.106+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS port 6004]: Confirmed peer address as 127.0.0.1:6000 2020-04-27T14:50:14.106+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS port 6004]: Kernelizing media stream: 127.0.0.1:6000 2020-04-27T14:50:14.106+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6004]: enabling kernel intercept with stream idx 0 2020-04-27T14:50:14.106+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6004]: Forward to sink endpoint: 127.0.0.1:6001 (RTP seq 19303 TS 160) 2020-04-27T14:50:14.121+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Kernelizing media stream: 127.0.0.1:6001 2020-04-27T14:50:14.121+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: enabling kernel intercept with stream idx 2 2020-04-27T14:50:14.121+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19309 TS 1120) ``` #### SIP Traffic  ``` No SIP-related issue (RTP only) ``` ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` rtpengine: 8.2.1 kamailio: 5.3.3 ``` * **Operating System**:  RHEL 7.6 ``` Linux vm1 3.10.0-957.el7.x86_64 #1 SMP Thu Oct 4 20:48:51 UTC 2018 x86_64 x86_64 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/2303

3 7

git:master:d815a2c9: ndb_redis: use safer macros for temporarily making zero-ending strings
by Daniel-Constantin Mierla 28 Apr '20

28 Apr '20

Module: kamailio Branch: master Commit: d815a2c92e49e315a9f6a614b7ee3a377836d368 URL: https://github.com/kamailio/kamailio/commit/d815a2c92e49e315a9f6a614b7ee3a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-28T18:28:34+02:00 ndb_redis: use safer macros for temporarily making zero-ending strings --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d815a2c92e49e315a9f6a614b7ee3a3… Patch: https://github.com/kamailio/kamailio/commit/d815a2c92e49e315a9f6a614b7ee3a3…

1 0

git:master:9657764f: modules: readme files regenerated - keepalive ... [skip ci]
by Kamailio Dev 28 Apr '20

28 Apr '20

Module: kamailio Branch: master Commit: 9657764f224bb9fb4f593dc55d3c4310ca02bb16 URL: https://github.com/kamailio/kamailio/commit/9657764f224bb9fb4f593dc55d3c431… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-28T16:16:16+02:00 modules: readme files regenerated - keepalive ... [skip ci] --- Modified: src/modules/keepalive/README --- Diff: https://github.com/kamailio/kamailio/commit/9657764f224bb9fb4f593dc55d3c431… Patch: https://github.com/kamailio/kamailio/commit/9657764f224bb9fb4f593dc55d3c431… --- diff --git a/src/modules/keepalive/README b/src/modules/keepalive/README index 9f6624daa9..150da0acdc 100644 --- a/src/modules/keepalive/README +++ b/src/modules/keepalive/README @@ -178,8 +178,9 @@ modparam("keepalive", "destination", "sip.provider.com") 2.3.3. delete_counter(int) - Unsuccesful attemps increase delete_counter . After passing it , - keepalive module doesn't try to send options requests. + Unsuccesful attemps increase delete_counter. After passing it, + keepalive module doesn't try to send options requests. Ignored if it's + set to 0. Default value is 5 .

1 0

[kamailio/kamailio] keepalive: ignore delete_counter if it is set to 0 (#2306)
by Nacho G. 28 Apr '20

28 Apr '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Recently a new parameter `delete_counter` was added. There is no way to ignore it, (just set a really big number could serve as a workaround). This is a small change to ignore it if `delete_counter` if is set to 0. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2306 -- Commit Summary -- * keepalive: ignore delete_counter if it is set to 0 -- File Changes -- M src/modules/keepalive/doc/keepalive_admin.xml (2) M src/modules/keepalive/keepalive_core.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2306.patch https://github.com/kamailio/kamailio/pull/2306.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/2306

2 2

git:master:4e881304: Merge pull request #2306 from NGSegovia/ngsegovia/keepalive_disable_delete_counter
by GitHub 28 Apr '20

28 Apr '20

Module: kamailio Branch: master Commit: 4e881304d33356a5fd3b93c15c0a9e06060049f7 URL: https://github.com/kamailio/kamailio/commit/4e881304d33356a5fd3b93c15c0a9e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-28T16:03:18+02:00 Merge pull request #2306 from NGSegovia/ngsegovia/keepalive_disable_delete_counter keepalive: ignore delete_counter if it is set to 0 --- Modified: src/modules/keepalive/doc/keepalive_admin.xml Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/4e881304d33356a5fd3b93c15c0a9e0… Patch: https://github.com/kamailio/kamailio/commit/4e881304d33356a5fd3b93c15c0a9e0… --- diff --git a/src/modules/keepalive/doc/keepalive_admin.xml b/src/modules/keepalive/doc/keepalive_admin.xml index 5db99eee4a..98e55222ea 100644 --- a/src/modules/keepalive/doc/keepalive_admin.xml +++ b/src/modules/keepalive/doc/keepalive_admin.xml @@ -96,7 +96,7 @@ modparam("keepalive", "destination", "sip.provider.com") <section> <title><varname>delete_counter</varname>(int)</title> <para> - Unsuccesful attemps increase delete_counter . After passing it , keepalive module doesn't try to send options requests. + Unsuccesful attemps increase delete_counter. After passing it, keepalive module doesn't try to send options requests. Ignored if it's set to 0. </para> <para> <emphasis> diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index ff0bed3e8e..f641aceb1f 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -67,15 +67,14 @@ void ka_check_timer(unsigned int ticks, void *param) ka_dest = ka_dest->next) { LM_DBG("ka_check_timer dest:%.*s\n", ka_dest->uri.len, ka_dest->uri.s); + if(ka_counter_del > 0 && ka_dest->counter > ka_counter_del) { + continue; + } + /* Send ping using TM-Module. * int request(str* m, str* ruri, str* to, str* from, str* h, * str* b, str *oburi, * transaction_cb cb, void* cbp); */ - - if(ka_dest->counter>ka_counter_del){ - continue; - } - set_uac_req(&uac_r, &ka_ping_method, 0, 0, 0, TMCB_LOCAL_COMPLETED, ka_options_callback, (void *)ka_dest);

1 0

git:master:6f52da52: keepalive: ignore delete_counter if it is set to 0
by Nacho Garcia Segovia 28 Apr '20

28 Apr '20

Module: kamailio Branch: master Commit: 6f52da5286b61c5c039070d20a6687ee02e4e762 URL: https://github.com/kamailio/kamailio/commit/6f52da5286b61c5c039070d20a6687e… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-04-28T14:08:19+02:00 keepalive: ignore delete_counter if it is set to 0 --- Modified: src/modules/keepalive/doc/keepalive_admin.xml Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/6f52da5286b61c5c039070d20a6687e… Patch: https://github.com/kamailio/kamailio/commit/6f52da5286b61c5c039070d20a6687e… --- diff --git a/src/modules/keepalive/doc/keepalive_admin.xml b/src/modules/keepalive/doc/keepalive_admin.xml index 5db99eee4a..98e55222ea 100644 --- a/src/modules/keepalive/doc/keepalive_admin.xml +++ b/src/modules/keepalive/doc/keepalive_admin.xml @@ -96,7 +96,7 @@ modparam("keepalive", "destination", "sip.provider.com") <section> <title><varname>delete_counter</varname>(int)</title> <para> - Unsuccesful attemps increase delete_counter . After passing it , keepalive module doesn't try to send options requests. + Unsuccesful attemps increase delete_counter. After passing it, keepalive module doesn't try to send options requests. Ignored if it's set to 0. </para> <para> <emphasis> diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index ff0bed3e8e..f641aceb1f 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -67,15 +67,14 @@ void ka_check_timer(unsigned int ticks, void *param) ka_dest = ka_dest->next) { LM_DBG("ka_check_timer dest:%.*s\n", ka_dest->uri.len, ka_dest->uri.s); + if(ka_counter_del > 0 && ka_dest->counter > ka_counter_del) { + continue; + } + /* Send ping using TM-Module. * int request(str* m, str* ruri, str* to, str* from, str* h, * str* b, str *oburi, * transaction_cb cb, void* cbp); */ - - if(ka_dest->counter>ka_counter_del){ - continue; - } - set_uac_req(&uac_r, &ka_ping_method, 0, 0, 0, TMCB_LOCAL_COMPLETED, ka_options_callback, (void *)ka_dest);

1 0

[kamailio/kamailio] core: do not use tcp id for lookup if not needed (#2305)
by Donato Sciarra 28 Apr '20

28 Apr '20

#### Pre-Submission Checklist - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] 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 - [X] 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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description In case the first lookup (with tcp id) is not successful, the second attempt should have been performed without a tcp id. Issue was introduced with dc43750644 (new global parameter tcp_connection_match) in 5.3. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2305 -- Commit Summary -- * core: do not use tcp id for lookup if not needed -- File Changes -- M src/core/tcp_main.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2305.patch https://github.com/kamailio/kamailio/pull/2305.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/2305

2 2

git:master:70929caa: Merge pull request #2305 from dsciarra/do-not-use-tcp-id-for-lookup
by GitHub 28 Apr '20

28 Apr '20

Module: kamailio Branch: master Commit: 70929caac33583ae1026234ca999cc90afcb6f4c URL: https://github.com/kamailio/kamailio/commit/70929caac33583ae1026234ca999cc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-28T15:57:29+02:00 Merge pull request #2305 from dsciarra/do-not-use-tcp-id-for-lookup core: do not use tcp id for lookup if not needed --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/70929caac33583ae1026234ca999cc9… Patch: https://github.com/kamailio/kamailio/commit/70929caac33583ae1026234ca999cc9… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e57a29d99e..89e3b56b7c 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1967,7 +1967,7 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, if (likely(port)){ /* try again w/o id */ if(tcp_connection_match==TCPCONN_MATCH_STRICT) { - c=tcpconn_lookup(dst->id, &ip, port, from, try_local_port, con_lifetime); + c=tcpconn_lookup(0, &ip, port, from, try_local_port, con_lifetime); } else { c=tcpconn_get(0, &ip, port, from, con_lifetime); }

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