sr-dev November 2018

sr-dev@lists.kamailio.org

22 participants
299 discussions

[kamailio/kamailio] dispatcher on 5.2 not setting the destination properly for the second route (#1728)
by David Villasmil 23 Nov '18

23 Nov '18

### Description When using `ds_select_routes` $du is properly set to the first setid (1) and limiting properly the calls (with maxload), but when the nodes on setid 1 are at maxload and kamailio properly selects the second setid (11) it does NOT set $du. ### Troubleshooting My dispatcher table is: ``` +-----+-------+-------------------------+-------+----------+-----------------------------------+-------------+ | id | setid | destination | flags | priority | attrs | description | +-----+-------+-------------------------+-------+----------+-----------------------------------+-------------+ | 213 | 1 | sip:1.1.1.1:5080 | 0 | 0 | weight=100;maxload=2;duid=cuore_1 | node1-proxy | | 229 | 1 | sip:2.2.2.2:5080 | 0 | 0 | weight=100;maxload=2;duid=cuore_2 | node2-proxy | | 232 | 11 | sip:3.3.3.3:5080 | 0 | 0 | weight=100;maxload=2;duid=cuore_3 | node3-proxy | +-----+-------+-------------------------+-------+----------+-----------------------------------+-------------+ ``` #### Log Messages ``` [DISPATCH] 1-12743(a)192.168.1.201: ds_select_routes was succesful (ruri: sip:*TESTCALL@cuore-proxy.sandbox-sngl.com - du: <sip:1.1.1.1:5080> [DISPATCH] 2-12743(a)192.168.1.201: ds_select_routes was succesful (ruri: sip:*TESTCALL@cuore-proxy.sandbox-sngl.com - du: <sip:2.2.2.2:5080> [DISPATCH] 3-12743(a)192.168.1.201: ds_select_routes was succesful (ruri: sip:*TESTCALL@cuore-proxy.sandbox-sngl.com - du: <sip:1.1.1.1:5080> [DISPATCH] 4-12743(a)192.168.1.201: ds_select_routes was succesful (ruri: sip:*TESTCALL@cuore-proxy.sandbox-sngl.com - du: <sip:2.2.2.2:5080> [DISPATCH] 5-12743(a)192.168.1.201: ds_select_routes was succesful (ruri: sip:*TESTCALL@cuore-proxy.sandbox-sngl.com - du: <<null>> [DISPATCH] 6-12743(a)192.168.1.201: ds_select_routes was succesful (ruri: sip:*TESTCALL@cuore-proxy.sandbox-sngl.com - du: <<null>> ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.0-dev0 (x86_64/linux) f465d2 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, HAVE_RESOLV_RES 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: f465d2 compiled on 01:08:37 Nov 17 2018 with gcc 4.9.2 ``` * **Operating System**:  ``` Linux my-proxy 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1 (2016-12-30) 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/1728

3 12

git:master:a35503b3: misc/examples/kemi: Added 'msg' argument to ksr_route_relay
by root 22 Nov '18

22 Nov '18

Module: kamailio Branch: master Commit: a35503b3837cfc804f30c7493fbd13573c1a55e1 URL: https://github.com/kamailio/kamailio/commit/a35503b3837cfc804f30c7493fbd135… Author: Joonas Keskitalo <git(a)joonake.fi> Committer: root <root(a)joonake.fi> Date: 2018-11-22T19:17:53+02:00 misc/examples/kemi: Added 'msg' argument to ksr_route_relay --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/a35503b3837cfc804f30c7493fbd135… Patch: https://github.com/kamailio/kamailio/commit/a35503b3837cfc804f30c7493fbd135… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index 7d952e413e..611a204087 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -62,7 +62,7 @@ def ksr_request_route(self, msg): # CANCEL processing if KSR.pv.get("$rm") == "CANCEL" : if KSR.tm.t_check_trans()>0 : - self.ksr_route_relay(); + self.ksr_route_relay(msg); return 1; # handle requests within SIP dialogs

1 0

git:master:fe259304: Merge pull request #1734 from Joonake/master
by GitHub 22 Nov '18

22 Nov '18

Module: kamailio Branch: master Commit: fe259304d83123842ce1f76aefe1ce8c905a5dae URL: https://github.com/kamailio/kamailio/commit/fe259304d83123842ce1f76aefe1ce8… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: GitHub <noreply(a)github.com> Date: 2018-11-22T19:54:30+02:00 Merge pull request #1734 from Joonake/master misc/examples/kemi: Added 'msg' argument to ksr_route_relay --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/fe259304d83123842ce1f76aefe1ce8… Patch: https://github.com/kamailio/kamailio/commit/fe259304d83123842ce1f76aefe1ce8… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index 7d952e413e..611a204087 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -62,7 +62,7 @@ def ksr_request_route(self, msg): # CANCEL processing if KSR.pv.get("$rm") == "CANCEL" : if KSR.tm.t_check_trans()>0 : - self.ksr_route_relay(); + self.ksr_route_relay(msg); return 1; # handle requests within SIP dialogs

1 0

[kamailio/kamailio] Added 'msg' argument to ksr_route_relay (#1734)
by Joonas Keskitalo 22 Nov '18

22 Nov '18

#### 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  Kemi framework python example configuration had a problem when handling CANCEL messages. Called function needed 'msg' attribute. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1734 -- Commit Summary -- * Added 'msg' argument to ksr_route_relay -- File Changes -- M misc/examples/kemi/kamailio-basic-kemi-python.py (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1734.patch https://github.com/kamailio/kamailio/pull/1734.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/1734

2 2

[kamailio/kamailio] Crash using TLS with many child processes (#1670)
by Adrien Menella 22 Nov '18

22 Nov '18

### Description Started from the [minimal proxy config](https://github.com/kamailio/kamailio/blob/master/misc/examples/mixe…, we tried to run **more than 1** process using TLS, and, unforntunately it crashed. Everything is working fine **using TLS with 1 child**. Everything is working fine with **more than 1 child process without TLS**. To ease the reproduction, we set an env var called `TARGET` at container instanciation, its value is set to a reachable SIP address using TLS (without DNS resolution). To reproduce issue you will need pjsip/pjsua with SSL/TLS enabled: * install OpenSSL (`sudo apt-get install openssl` for ubuntu) * [install pjsip using autoconf](https://trac.pjsip.org/repos/wiki/Getting-Started/Autoconf) * [manually configure TLS support if necessary](https://trac.pjsip.org/repos/wiki/TLS) * [build and install pjsua](https://trac.pjsip.org/repos/wiki/Python_SIP/Build_Install) We've seen on some issues that a low memory allocation could be an issue using TLS, so we are running kamailio using more memory `kamailio -DD -E -M 256 -m 1024` (still crashing). ### Troubleshooting #### Reproduction Here are the steps to reproduce the issue: * start from [Kamailio minimal proxy config](https://github.com/kamailio/kamailio/blob/master/misc/examples/mixe… * enable TLS by adding/uncommenting following lines: ```diff @@ -1,4 +1,5 @@ #!KAMAILIO +#!define WITH_TLS # # Kamailio (OpenSER) SIP Server v5.2 - default configuration script # - web: https://www.kamailio.org @@ -28,7 +29,7 @@ ####### Global Parameters ######### ### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR -debug=2 +debug=3 log_stderror=no memdbg=5 @@ -38,10 +39,13 @@ log_facility=LOG_LOCAL0 log_prefix="{$mt $hdr(CSeq) $ci} " /* number of SIP routing processes */ -children=2 +children=1 /* uncomment the next line to disable TCP (default on) */ # disable_tcp=yes +#!ifdef WITH_TLS +enable_tls=yes +#!endif /* uncomment the next line to disable the auto discovery of local aliases * based on reverse DNS on IPs (default on) */ @@ -65,6 +69,9 @@ children=2 ####### Modules Section ######## /* set paths to location of modules */ +#!ifdef WITH_TLS +loadmodule "tls.so" +#!endif loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" @@ -85,6 +92,9 @@ loadmodule "counters.so" # ----------------- setting module-specific parameters --------------- +#!ifdef WITH_TLS +modparam("tls", "config", "/etc/kamailio/tls.cfg") +#!endif # ----- jsonrpcs params ----- modparam("jsonrpcs", "pretty_format", 1) @@ -180,7 +190,7 @@ request_route { } # update $du to set the destination address for proxying - $du = "sip:" + $rd + ":9"; + $du = $env(TARGET); route(RELAY); exit; } ``` * use a proper `tls.cfg` file with self-signed certificates: ```c [server:default] method = TLSv1 verify_certificate = no require_certificate = no private_key = /etc/kamailio/privkey.pem certificate = /etc/kamailio/server-cert.pem [client:default] #method = TLSv1 verify_certificate = no require_certificate = no ``` * use following `Dockerfile`: ```docker FROM kamailio/kamailio-ci:master-alpine # Override default kamailio configuration COPY kamailio.cfg /etc/kamailio/kamailio.cfg COPY tls.cfg /etc/kamailio/tls.cfg COPY privkey.pem /etc/kamailio/privkey.pem COPY server-cert.pem /etc/kamailio/server-cert.pem ``` * build docker image `docker build -f Dockerfile -t kamailio-tls-issue .` * launch docker container using your own `TARGET`: ```sh docker run -it -p 5061:5061/tcp -e "TARGET=sip:AA.BB.CC.DD;transport=tls" kamailio-tls-issue ``` * make a SIP call with pjsua: ```sh pjsua --stun-srv=stun.l.google.com:19302 --use-tls --no-tcp --no-udp --use-srtp=2 --local-port=5062 --id=sip:alice@localhost "sip:bob@localhost;transport=tls" ``` **Everything should work fine because we only used 1 child process** * stop everything * update your `kamailio.cfg` by setting `children=2` (or above) * reproduce steps (build docker image, launch container, make a SIP call) * kamailio should crash with specific logs (see `Log messages` section) #### Log Messages Log messages from kamailio proxy: ```c 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <script>: new branch [0] to sip:bob@localhost;transport=tls 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/msg_translator.c:2933]: create_via_hf(): id added: <;i=1>, rcv proto=3 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/tcp_main.c:1747]: tcp_send(): no open tcp connection found, opening new one 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/ip_addr.c:229]: print_ip(): tcpconn_new: new tcp connection: 34.240.160.168 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/tcp_main.c:999]: tcpconn_new(): on port 5061, type 3 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/tcp_main.c:1305]: tcpconn_add(): hashes: 1752:0:0, 2 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tls [tls_server.c:199]: tls_complete_init(): completing tls connection initialization 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tls [tls_server.c:162]: tls_get_connect_server_name(): xavp with outbound server name not found 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tls [tls_server.c:142]: tls_get_connect_server_id(): xavp with outbound server id not found 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tls [tls_server.c:228]: tls_complete_init(): Using initial TLS domain TLSc<default> (dom 0x7fe7740bdaf0 ctx 0x55d98553ca40 sn []) 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tls [tls_domain.c:1155]: tls_lookup_private_key(): Private key lookup for SSL_CTX-0x55d98553ca40: 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tls [tls_domain.c:737]: sr_ssl_ctx_info_callback(): SSL handshake started 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/tcp_main.c:2641]: tcpconn_1st_send(): pending write on new connection 0x7fe7742cd200 (-1/122 bytes written) (err: 11 - Resource temporarily unavailable) 13(18) DEBUG: <core> [core/tcp_main.c:3540]: handle_ser_child(): read response= 7fe7742cd200, 5, fd 29 from 11 (16) 13(18) DEBUG: <core> [core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0x55d984d52f20, 29, 2, 0x7fe7742cd200), fd_no=18 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tm [t_funcs.c:372]: t_relay_to(): new transaction forwarded 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/receive.c:353]: receive_msg(): request-route executed in: 10827 usec 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/xavp.c:495]: xavp_destroy_list(): destroying xavp list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/receive.c:457]: receive_msg(): cleaning up 13(18) DEBUG: <core> [core/io_wait.h:777]: io_watch_chg(): DBG: io_watch_chg (0x55d984d52f20, 29, 0x1, 0xffffffff) fd_no=19 called 13(18) DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0x55d984d52f20, 29, -1, 0x0) fd_no=19 called 13(18) DEBUG: <core> [core/tcp_main.c:4196]: handle_tcpconn_ev(): sending to child, events 1 13(18) DEBUG: <core> [core/tcp_main.c:3875]: send2child(): selected tcp worker 1 12(17) for activity on [tls:172.17.0.2:5061], 0x7fe7742cd200 12(17) DEBUG: <core> [core/tcp_read.c:1767]: handle_io(): received n=8 con=0x7fe7742cd200, fd=7 13(18) DEBUG: <core> [core/tcp_main.c:3279]: handle_tcp_child(): dead tcp child 1 (pid 17, no 12) (shutting down?) 13(18) DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0x55d984d52f20, 27, -1, 0x0) fd_no=18 called 13(18) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 24 13(18) DEBUG: <core> [core/tcp_main.c:3512]: handle_ser_child(): dead child 12, pid 17 (shutting down?) 13(18) DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0x55d984d52f20, 24, -1, 0x0) fd_no=17 called 0(1) ALERT: <core> [main.c:740]: handle_sigs(): child process 17 exited by a signal 11 0(1) ALERT: <core> [main.c:743]: handle_sigs(): core was generated 0(1) INFO: <core> [main.c:766]: handle_sigs(): terminating due to SIGCHLD 0(1) DEBUG: <core> [main.c:768]: handle_sigs(): terminating due to SIGCHLD 10(15) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 1(6) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 8(13) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 7(12) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 6(11) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 5(10) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 4(9) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 3(8) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 13(18) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 9(14) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 11(16) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 2(7) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 0(1) DEBUG: tm [t_funcs.c:85]: tm_shutdown(): start 0(1) DEBUG: tm [t_funcs.c:88]: tm_shutdown(): emptying hash table 0(1) DEBUG: tm [h_table.c:133]: free_cell_helper(): freeing transaction 0x7fe7742c9580 from h_table.c:465 0(1) DEBUG: tm [t_funcs.c:90]: tm_shutdown(): removing semaphores 0(1) DEBUG: tm [t_funcs.c:92]: tm_shutdown(): destroying tmcb lists 0(1) DEBUG: tm [t_funcs.c:95]: tm_shutdown(): done ``` ### Additional Information * **Kamailio Version** : Kamailio (OpenSER) SIP Server v5.2 * **Operating System**: Kamailio was running on Linux Alpine from [kamailio/kamailio-ci:master-alpine](https://hub.docker.com/r/kamailio/kamai… docker image. -- 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/1670

4 15

git:master:074d3c67: dispatcher: ds_select_routes() - set r-uri/d-uri even when first group has no available dst
by Daniel-Constantin Mierla 22 Nov '18

22 Nov '18

Module: kamailio Branch: master Commit: 074d3c67a96a49e9b8c86f6ec4cfd61725b0ccce URL: https://github.com/kamailio/kamailio/commit/074d3c67a96a49e9b8c86f6ec4cfd61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-22T08:56:54+01:00 dispatcher: ds_select_routes() - set r-uri/d-uri even when first group has no available dst - GH #1728 --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/074d3c67a96a49e9b8c86f6ec4cfd61… Patch: https://github.com/kamailio/kamailio/commit/074d3c67a96a49e9b8c86f6ec4cfd61… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 80540ee6ba..d247d6e104 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2181,6 +2181,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) idx->dlist[hash].uri.len, idx->dlist[hash].uri.s); return -1; } + rstate->emode = 1; } LM_DBG("selected [%d-%d-%d/%d] <%.*s>\n", rstate->alg, rstate->setid, diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 7a798fc162..14db0e2a30 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -214,11 +214,12 @@ typedef struct _ds_set { } ds_set_t; typedef struct _ds_select_state { - int setid; - int alg; - int umode; - uint32_t limit; - int cnt; + int setid; /* dispatcher set id (group id) */ + int alg; /* algorithm to select destionations */ + int umode; /* update mode - push to: r-uri, d-uri, xavp */ + uint32_t limit; /* limit of destination addresses to be selected */ + int cnt; /* output: number of xavps set with destination addresses */ + int emode; /* output: update operation was executed or not */ sr_xavp_t *lxavp; } ds_select_state_t; diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 750f17b670..66ed3248ef 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -632,7 +632,6 @@ static int ki_ds_select_routes_limit(sip_msg_t *msg, str *srules, str *smode, int i; int vret; int gret; - int vfirst; sr_xval_t nxval; ds_select_state_t vstate; @@ -644,7 +643,6 @@ static int ki_ds_select_routes_limit(sip_msg_t *msg, str *srules, str *smode, } vret = -1; gret = -1; - vfirst = 0; i = 0; while(i<srules->len) { vstate.setid = 0; @@ -677,9 +675,11 @@ static int ki_ds_select_routes_limit(sip_msg_t *msg, str *srules, str *smode, } LM_DBG("routing with setid=%d alg=%d cnt=%d limit=0x%x (%u)\n", vstate.setid, vstate.alg, vstate.cnt, vstate.limit, vstate.limit); - + vstate.umode = DS_SETOP_XAVP; - if(vfirst==0) { + /* if no r-uri/d-uri was set already, keep using the update mode + * specified by the param, then just add to xavps list */ + if(vstate.emode==0) { switch(smode->s[0]) { case '0': case 'd': @@ -700,7 +700,6 @@ static int ki_ds_select_routes_limit(sip_msg_t *msg, str *srules, str *smode, smode->len, smode->s); return -1; } - vfirst = 1; } vret = ds_manage_routes(msg, &vstate); if(vret<0) {

1 0

git:master:929823cd: core: added kemi KSR.is_myself_srcip()
by Daniel-Constantin Mierla 22 Nov '18

22 Nov '18

Module: kamailio Branch: master Commit: 929823cd5620f8ee3ee7c8961f810e16b2031b01 URL: https://github.com/kamailio/kamailio/commit/929823cd5620f8ee3ee7c8961f810e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-22T08:30:09+01:00 core: added kemi KSR.is_myself_srcip() - equivalent of src_ip==myself condition --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/929823cd5620f8ee3ee7c8961f810e1… Patch: https://github.com/kamailio/kamailio/commit/929823cd5620f8ee3ee7c8961f810e1… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 9b1d0050a5..526ebf996b 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -274,12 +274,30 @@ static int sr_kemi_core_is_myself_suri(sip_msg_t *msg) if(get_src_uri(msg, 0, &suri)<0) { LM_ERR("cannot src address uri\n"); - return SR_KEMI_FALSE; + return SR_KEMI_FALSE; } return sr_kemi_core_is_myself(msg, &suri); } +/** + * + */ +static int sr_kemi_core_is_myself_srcip(sip_msg_t *msg) +{ + str srcip; + int ret; + + srcip.s = ip_addr2a(&msg->rcv.src_ip); + srcip.len = strlen(srcip.s); + + ret = check_self(&srcip, 0, 0); + if(ret==1) { + return SR_KEMI_TRUE; + } + return SR_KEMI_FALSE; +} + /** * */ @@ -1267,6 +1285,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_myself_srcip"), + SR_KEMIP_BOOL, sr_kemi_core_is_myself_srcip, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("setflag"), SR_KEMIP_BOOL, sr_kemi_core_setflag, { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:dcf9ee88: topos: do not add contact header in outgoing 1xx responses if not present
by Daniel-Constantin Mierla 21 Nov '18

21 Nov '18

Module: kamailio Branch: master Commit: dcf9ee88dbf68eeaf0f64d203ce831eb6f536a85 URL: https://github.com/kamailio/kamailio/commit/dcf9ee88dbf68eeaf0f64d203ce831e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-21T10:42:02+01:00 topos: do not add contact header in outgoing 1xx responses if not present - GH #1720 --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/dcf9ee88dbf68eeaf0f64d203ce831e… Patch: https://github.com/kamailio/kamailio/commit/dcf9ee88dbf68eeaf0f64d203ce831e… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index b349865262..9880650290 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1029,6 +1029,7 @@ int tps_response_sent(sip_msg_t *msg) str lkey; uint32_t direction = TPS_DIR_UPSTREAM; str xvbranch = {0, 0}; + int contact_keep = 0; LM_DBG("handling outgoing response\n"); @@ -1078,8 +1079,15 @@ int tps_response_sent(sip_msg_t *msg) /* keep contact without updates for redirect responses sent out */ if(msg->first_line.u.reply.statuscode<300 || msg->first_line.u.reply.statuscode>=400) { + contact_keep = 1; + } + if(contact_keep==0 && msg->first_line.u.reply.statuscode>100 + && msg->first_line.u.reply.statuscode<200 + && msg->contact==NULL) { + contact_keep = 1; + } + if(contact_keep==0) { tps_remove_headers(msg, HDR_CONTACT_T); - if(direction==TPS_DIR_DOWNSTREAM) { tps_reinsert_contact(msg, &stsd, &stsd.as_contact); } else {

1 0

[kamailio/kamailio] Module: rtpengine timeout log fixed (#1732)
by Surendra Tiwari 21 Nov '18

21 Nov '18

#### 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 Previously for timeout reply kamailio was not printing the command for which we received the timeout, Also if kamailio not able to read the response then also command was not getting printed. some indention fix is also done.  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1732 -- Commit Summary -- * Merge pull request #1 from kamailio/master * Modules: rtpengine: fixing log for printing the command when timeout and bad error reply -- File Changes -- M src/modules/rtpengine/rtpengine.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1732.patch https://github.com/kamailio/kamailio/pull/1732.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/1732

2 3

git:master:9d1e8e25: rtpengine: print command in log message on timeout
by Daniel-Constantin Mierla 21 Nov '18

21 Nov '18

Module: kamailio Branch: master Commit: 9d1e8e256e49968776f7abb740a6d02739547ec2 URL: https://github.com/kamailio/kamailio/commit/9d1e8e256e49968776f7abb740a6d02… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-21T09:30:06+01:00 rtpengine: print command in log message on timeout - few indentation fixes - GH #1732 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/9d1e8e256e49968776f7abb740a6d02… Patch: https://github.com/kamailio/kamailio/commit/9d1e8e256e49968776f7abb740a6d02… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 2ca9219e71..4074385b1d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2630,7 +2630,7 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t *dict, int *outlen) } v[0].iov_base = gencookie(); v[0].iov_len = strlen(v[0].iov_base); - rtpengine_retr = cfg_get(rtpengine,rtpengine_cfg,rtpengine_retr); + rtpengine_retr = cfg_get(rtpengine,rtpengine_cfg,rtpengine_retr); for (i = 0; i < rtpengine_retr; i++) { do { len = writev(rtpp_socks[node->idx], v, vcnt + 1); @@ -2640,14 +2640,14 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t *dict, int *outlen) LM_ERR("can't send command \"%.*s\" to RTP proxy <%s>\n", out.len, out.s, node->rn_url.s); goto badproxy; } - rtpengine_tout_ms = cfg_get(rtpengine,rtpengine_cfg,rtpengine_tout_ms); + rtpengine_tout_ms = cfg_get(rtpengine,rtpengine_cfg,rtpengine_tout_ms); while ((poll(fds, 1, rtpengine_tout_ms) == 1) && (fds[0].revents & POLLIN) != 0) { do { len = recv(rtpp_socks[node->idx], buf, sizeof(buf)-1, 0); } while (len == -1 && errno == EINTR); if (len <= 0) { - LM_ERR("can't read reply from RTP proxy <%s>\n", node->rn_url.s); + LM_ERR("can't read reply for command \"%.*s\" from RTP proxy <%s>\n", out.len, out.s, node->rn_url.s); goto badproxy; } if (len >= (v[0].iov_len - 1) && @@ -2664,7 +2664,7 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t *dict, int *outlen) } } if (i == rtpengine_retr) { - LM_ERR("timeout waiting reply from RTP proxy <%s>\n", node->rn_url.s); + LM_ERR("timeout waiting reply for command \"%.*s\" from RTP proxy <%s>\n", out.len, out.s, node->rn_url.s); goto badproxy; } }

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2018