sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
389 discussions

git:5.0:8038327f: htable: do not call expired event route on get/add operations

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 8038327f7c0c6e64899072f1c778699f040b2a0a URL: https://github.com/kamailio/kamailio/commit/8038327f7c0c6e64899072f1c778699… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-26T14:02:34+02:00 htable: do not call expired event route on get/add operations - have consistent behaviour with set operation - avoid accessing the same (expired) item twice, second after being removed if the item is accessed in the event route - reported by GH #1152 (cherry picked from commit 4514c91883d67ee062582aed7b414633609cf6ac) --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/8038327f7c0c6e64899072f1c778699… Patch: https://github.com/kamailio/kamailio/commit/8038327f7c0c6e64899072f1c778699… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 4c4ba5315b..a6e9c0eba6 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -676,7 +676,6 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, /* found */ if(now>0 && it->expire!=0 && it->expire<now) { /* entry has expired */ - ht_handle_expired_record(ht, it); if(ht->flags==PV_VAL_INT) { /* initval is integer, use it to create a fresh entry */ @@ -684,16 +683,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, it->value.n = ht->initval.n; /* increment will be done below */ } else { - /* delete expired entry */ - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; if(mode) ht_slot_unlock(ht, idx); - ht_cell_free(it); return NULL; } } @@ -804,18 +794,8 @@ ht_cell_t* ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old) { /* found */ if(ht->htexpire>0 && it->expire!=0 && it->expire<time(NULL)) { - /* entry has expired, delete it and return NULL */ - ht_handle_expired_record(ht, it); - - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; + /* entry has expired, return NULL */ ht_slot_unlock(ht, idx); - ht_cell_free(it); return NULL; } if(old!=NULL) diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index 522811da58..c928bf1b49 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -91,7 +91,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, if((val==NULL) || (val->flags&PV_VAL_NULL)) { /* delete it */ - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, &hpv->htname, &htname, 0, NULL, 0)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, &hpv->htname, + &htname, 0, NULL, 0)!=0) { LM_ERR("dmq relication failed\n"); } ht_del_cell(hpv->ht, &htname); @@ -101,7 +103,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, if(val->flags&PV_TYPE_INT) { isval.n = val->ri; - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, &htname, 0, &isval, 1)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, + &htname, 0, &isval, 1)!=0) { LM_ERR("dmq relication failed\n"); } if(ht_set_cell(hpv->ht, &htname, 0, &isval, 1)!=0) @@ -111,7 +115,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, } } else { isval.s = val->rs; - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, &htname, AVP_VAL_STR, &isval, 1)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, + &htname, AVP_VAL_STR, &isval, 1)!=0) { LM_ERR("dmq relication failed\n"); } if(ht_set_cell(hpv->ht, &htname, AVP_VAL_STR, &isval, 1)!=0)

7 years, 5 months

[kamailio/kamailio] Dispatcher destination attribute "socket" does not always work (#1161)

by Mikko Lehto

### Description Dispatcher destination attribute "socket", is not always respected. Syslog throws: ``` ERROR: <core> [core/socket_info.c:2067]: parse_protohostport(): bad port number in udp:10.2.10.49:5064 ``` ### Troubleshooting #### Reproduction relevant (I think) kamailio.cfg: ``` listen=udp:127.0.0.1:5060 listen=udp:10.2.10.49:5060 listen=udp:10.2.10.49:5064 listen=udp:10.2.10.49:5065 listen=udp:10.2.10.49:5066 auto_bind_ipv6=0 auto_aliases=0 modparam("dispatcher", "list_file", "/opt/kamailio/dispatcher.list") modparam("dispatcher", "flags", 2) modparam("dispatcher", "dst_avp", "$avp(ds_dst)") modparam("dispatcher", "grp_avp", "$avp(ds_grp)") modparam("dispatcher", "cnt_avp", "$avp(ds_cnt)") modparam("dispatcher", "dstid_avp", "$avp(ds_dstid)") modparam("dispatcher", "ds_hash_size", 9) modparam("dispatcher", "setid_pvname", "$var(ds_setid)") modparam("dispatcher", "attrs_avp", "$avp(ds_attrs_dst)") modparam("dispatcher", "attrs_pvname", "$avp(ds_attrs_from)") modparam("dispatcher", "sock_avp", "$avp(ds_socket)") modparam("dispatcher", "ds_default_socket", "udp:10.2.10.49:5066") modparam("dispatcher", "ds_ping_method", "OPTIONS") modparam("dispatcher", "ds_ping_interval", 10) modparam("dispatcher", "ds_probing_mode", 3) ``` dispatcher.list: ``` 3 sip:127.0.0.1:1234;transport=udp 8 0 duid=abc;socket=udp:10.2.10.49:5064;pipe=p10 3 sip:127.0.0.1:1235;transport=udp 8 0 duid=abc;pipe=p10;socket=udp:10.2.10.49:5065 3 sip:127.0.0.1:1236;transport=udp 8 0 duid=abc;pipe=p10 ``` Above kamailio.cfg and dispatcher.list demonstrates issue when probing (OPTIONS poll). I did not test actual request dispatching yet. #### Log Messages ``` 20:26:37 freebsd11 kamailio[31694]: DEBUG: dispatcher [dispatch.c:2660]: ds_ping_set(): probing set #3, URI sip:127.0.0.1:1236;transport=udp 20:26:37 freebsd11 kamailio[31694]: DEBUG: dispatcher [dispatch.c:2674]: ds_ping_set(): >>>--- here2 - using default socket ---<<< 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:988]: request(): request 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:1027]: request(): uac_r->ssock==udp:10.2.10.49:5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2077]: lookup_local_socket(): lookup_local_socket() phostp==udp:10.2.10.49:5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:1978]: parse_protohostport(): parse_protohostport ins==udp:10.2.10.49:5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2082]: lookup_local_socket(): lookup_local_socket() grep_sock_info() 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==9 && [10.2.10.49] == [127.0.0.1] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 0) matches port 5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 0) matches port 5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5064 (advertise 0) matches port 5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5065 (advertise 0) matches port 5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5066 (advertise 0) matches port 5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:427]: t_uac_prepare(): next_hop=<sip:127.0.0.1:1236;transport=udp> 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:152]: dlg2hash(): hashid 37205 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:640]: send_prepared_request_impl(): uac: 0x802572e98 branch: 0 to 127.0.0.1:1236 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [./../../core/onsend.h:69]: run_onsend(): required parameters are not available - ignoring 20:26:37 freebsd11 kamailio[31694]: DEBUG: dispatcher [dispatch.c:2660]: ds_ping_set(): probing set #3, URI sip:127.0.0.1:1235;transport=udp 20:26:37 freebsd11 kamailio[31694]: DEBUG: dispatcher [dispatch.c:2670]: ds_ping_set(): >>>--- here1 - using destination specific socket ---<<< 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:988]: request(): request 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:1027]: request(): uac_r->ssock==udp:10.2.10.49:5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2077]: lookup_local_socket(): lookup_local_socket() phostp==udp:10.2.10.49:5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:1978]: parse_protohostport(): parse_protohostport ins==udp:10.2.10.49:5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2082]: lookup_local_socket(): lookup_local_socket() grep_sock_info() 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==9 && [10.2.10.49] == [127.0.0.1] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 0) matches port 5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 0) matches port 5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5064 (advertise 0) matches port 5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5065 (advertise 0) matches port 5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:427]: t_uac_prepare(): next_hop=<sip:127.0.0.1:1235;transport=udp> 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:152]: dlg2hash(): hashid 37202 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:640]: send_prepared_request_impl(): uac: 0x802572148 branch: 0 to 127.0.0.1:1235 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [./../../core/onsend.h:69]: run_onsend(): required parameters are not available - ignoring 20:26:37 freebsd11 kamailio[31694]: DEBUG: dispatcher [dispatch.c:2660]: ds_ping_set(): probing set #3, URI sip:127.0.0.1:1234;transport=udp 20:26:37 freebsd11 kamailio[31694]: DEBUG: dispatcher [dispatch.c:2670]: ds_ping_set(): >>>--- here1 - using destination specific socket ---<<< 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:988]: request(): request 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:1027]: request(): uac_r->ssock==udp:10.2.10.49:5064 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2077]: lookup_local_socket(): lookup_local_socket() phostp==udp:10.2.10.49:5064 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:1978]: parse_protohostport(): parse_protohostport ins==udp:10.2.10.49:5064 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2020]: parse_protohostport(): B *tmp==; 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2024]: parse_protohostport(): Y looks like strtol() ran too far 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2026]: parse_protohostport(): ins->len : 19 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2027]: parse_protohostport(): ins->s : 0x80255fe88 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2028]: parse_protohostport(): first : 0x80255fe8b 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2029]: parse_protohostport(): first+1 : 0x80255fe8c 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2030]: parse_protohostport(): second : 0x80255fe96 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2031]: parse_protohostport(): second+1 : 0x80255fe97 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2032]: parse_protohostport(): ins s+len : 0x80255fe9b 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2033]: parse_protohostport(): tmp : 0x80255fe9b 20:26:37 freebsd11 kamailio[31694]: ERROR: <core> [core/socket_info.c:2067]: parse_protohostport(): bad port number in udp:10.2.10.49:5064 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2079]: lookup_local_socket(): lookup_local_socket() return NULL 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:427]: t_uac_prepare(): next_hop=<sip:127.0.0.1:1234;transport=udp> 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:152]: dlg2hash(): hashid 37203 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:640]: send_prepared_request_impl(): uac: 0x8025713f8 branch: 0 to 127.0.0.1:1234 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [./../../core/onsend.h:69]: run_onsend(): required parameters are not available - ignoring ``` NOTE: above output contains additional debug statements, see below and 77394f06e8349de7565adcc58946da07ee0cf7d7. #### SIP Traffic ``` $ doas tcpdump -i lo0 -s 0 -n port 5060 or port 5064 or port 5065 or port 5066 tcpdump: verbose output suppressed, use -v or -vv for full protocol decode listening on lo0, link-type NULL (BSD loopback), capture size 262144 bytes . . . 20:26:37.465870 IP 10.2.10.49.5066 > 127.0.0.1.1236: UDP, length 374 20:26:37.465885 IP 10.2.10.49.5065 > 127.0.0.1.1235: UDP, length 374 20:26:37.465894 IP 10.2.10.49.5060 > 127.0.0.1.1234: SIP: OPTIONS sip:127.0.0.1:1234;transport=udp SIP/2.0 20:26:37.968876 IP 10.2.10.49.5066 > 127.0.0.1.1236: UDP, length 374 20:26:37.969043 IP 10.2.10.49.5065 > 127.0.0.1.1235: UDP, length 374 20:26:37.969216 IP 10.2.10.49.5060 > 127.0.0.1.1234: SIP: OPTIONS sip:127.0.0.1:1234;transport=udp SIP/2.0 . . . ``` Summary of sent packets: src port 5066 == listener socket + dispatcher default socket src port 5065 == listener socket + explicitly set to destination 127.0.0.1:1235 src port 5060 == listener socket, not mentioned in dispatcher config Probe packets to destination 127.0.0.1:1234 are sent with src port 5060, expected 5064. ### Possible Solutions Looks like ```strtol(second+1, &tmp, 10)``` in ```core/socket_info.c``` runs too far because it expects null terminated string but is passed ```char*``` of Kamailio ```str``` struct instead. Commit 77394f06e8349de7565adcc58946da07ee0cf7d7 tries to highlights this. ### Additional Information Found initially in stable 5.0.2 with new configuration. Replicated in master (20a961624bbe164d9120b7c9ac60df8ff1daaae4). ``` version: kamailio 5.1.0-dev4 (x86_64/freebsd) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, 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_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: unknown compiled on 19:21:12 Jun 21 2017 with clang39 3.9 ``` * **Operating System**: FreeBSD 11 ``` $ uname -a FreeBSD freebsd11 11.0-RELEASE-p9 FreeBSD 11.0-RELEASE-p9 #0: Tue Apr 11 08:48:40 UTC 2017 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 ``` -- 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/1161

7 years, 5 months

git:master:c8f7be02: corex: added $cfg(route) - return name of routing block for crt action

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c8f7be02e20f434f88c084c38b66d5dd34cf4dc1 URL: https://github.com/kamailio/kamailio/commit/c8f7be02e20f434f88c084c38b66d5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-26T08:22:34+02:00 corex: added $cfg(route) - return name of routing block for crt action - aliased $cfg(file) to $cfg(name) --- Modified: src/modules/corex/corex_var.c --- Diff: https://github.com/kamailio/kamailio/commit/c8f7be02e20f434f88c084c38b66d5d… Patch: https://github.com/kamailio/kamailio/commit/c8f7be02e20f434f88c084c38b66d5d… --- diff --git a/src/modules/corex/corex_var.c b/src/modules/corex/corex_var.c index b2dea26734..8a36158fb4 100644 --- a/src/modules/corex/corex_var.c +++ b/src/modules/corex/corex_var.c @@ -44,6 +44,13 @@ int pv_parse_cfg_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "name", 4)==0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "file", 4)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; + case 5: + if(strncmp(in->s, "route", 5)==0) + sp->pvp.pvn.u.isname.name.n = 2; else goto error; break; default: @@ -72,7 +79,12 @@ int pv_get_cfg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) switch(param->pvn.u.isname.name.n) { case 1: - n = get_cfg_crt_name(); + n = get_cfg_crt_file_name(); + if(n==0) + return pv_get_null(msg, param, res); + return pv_get_strzval(msg, param, res, n); + case 2: + n = get_cfg_crt_route_name(); if(n==0) return pv_get_null(msg, param, res); return pv_get_strzval(msg, param, res, n);

7 years, 5 months

git:master:c3212783: core: added function to return route block name from crt action

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c3212783da0af2358bcf0bcf4b5da4a8f0629251 URL: https://github.com/kamailio/kamailio/commit/c3212783da0af2358bcf0bcf4b5da4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-26T08:22:34+02:00 core: added function to return route block name from crt action - renamed the function that returns cfg file name from crt action --- Modified: src/core/action.c Modified: src/core/action.h --- Diff: https://github.com/kamailio/kamailio/commit/c3212783da0af2358bcf0bcf4b5da4a… Patch: https://github.com/kamailio/kamailio/commit/c3212783da0af2358bcf0bcf4b5da4a… --- diff --git a/src/core/action.c b/src/core/action.c index def9a64106..f766a0b894 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -103,13 +103,21 @@ int get_cfg_crt_line(void) } /* return name of config for current executed action */ -char *get_cfg_crt_name(void) +char *get_cfg_crt_file_name(void) { if(_cfg_crt_action==0) return 0; return _cfg_crt_action->cfile; } +/* return name of routing block for current executed action */ +char *get_cfg_crt_route_name(void) +{ + if(_cfg_crt_action==0) + return 0; + return _cfg_crt_action->rname; +} + /* handle the exit code of a module function call. * (used internally in do_action()) * @param h - script handle (h->last_retcode and h->run_flags will be set). diff --git a/src/core/action.h b/src/core/action.h index b4591aa115..c528fa972c 100644 --- a/src/core/action.h +++ b/src/core/action.h @@ -62,7 +62,8 @@ int run_top_route(struct action* a, sip_msg_t* msg, struct run_act_ctx* c); cfg_action_t *get_cfg_crt_action(void); int get_cfg_crt_line(void); -char *get_cfg_crt_name(void); +char *get_cfg_crt_file_name(void); +char *get_cfg_crt_route_name(void); void set_max_recursive_level(unsigned int lev);

7 years, 5 months

git:master:7dbf3fe5: modules: readme files regenerated - jsonrpcs ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 7dbf3fe5ec323571908b6bf3ef0d9e95e84d90dc URL: https://github.com/kamailio/kamailio/commit/7dbf3fe5ec323571908b6bf3ef0d9e9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-25T19:16:17+02:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/7dbf3fe5ec323571908b6bf3ef0d9e9… Patch: https://github.com/kamailio/kamailio/commit/7dbf3fe5ec323571908b6bf3ef0d9e9… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index 8457e16b4a..d615babde5 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -396,7 +396,7 @@ event_route[xhttp:request] { Example 1.15. jsonrpc_exec usage ... -jsonrpc_exec({"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); +jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); ... 6. JSONRPC Commands

7 years, 5 months

git:master:797bd944: Merge branch 'mslehto/issue1161'

by Mikko Lehto

Module: kamailio Branch: master Commit: 797bd94487cc05269b973c0dcad542838d8acbef URL: https://github.com/kamailio/kamailio/commit/797bd94487cc05269b973c0dcad5428… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-25T20:13:35+03:00 Merge branch 'mslehto/issue1161' --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/797bd94487cc05269b973c0dcad5428… Patch: https://github.com/kamailio/kamailio/commit/797bd94487cc05269b973c0dcad5428… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index f280f2dcb0..62a15f4c93 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1973,7 +1973,7 @@ int parse_protohostport(str* ins, sr_phostp_t *r) char* second; /* second ':' occurrence */ char* p; int bracket; - char* tmp; + str tmp=STR_NULL; first=second=0; bracket=0; @@ -2012,15 +2012,20 @@ int parse_protohostport(str* ins, sr_phostp_t *r) if (second) { /* 2 ':' found => check if valid */ if (parse_proto((unsigned char*)ins->s, first-ins->s, &r->proto)<0) goto error_proto; - r->port=strtol(second+1, &tmp, 10); - if ((tmp==0)||(*tmp)||(tmp==second+1)) goto error_port; + + tmp.s=second+1; + tmp.len=(ins->s + ins->len) - tmp.s; + + if (str2int(&tmp, (unsigned int *)&(r->port))<0) goto error_port; + r->host.s=first+1; r->host.len=(int)(second-r->host.s); goto end; } /* only 1 ':' found => it's either proto:host or host:port */ - r->port=strtol(first+1, &tmp, 10); - if ((tmp==0)||(*tmp)||(tmp==first+1)){ + tmp.s=first+1; + tmp.len=(ins->s + ins->len) - tmp.s; + if (str2int(&tmp, (unsigned int *)&(r->port))<0) { /* invalid port => it's proto:host */ if (parse_proto((unsigned char*)ins->s, first-ins->s, &r->proto)<0) goto error_proto;

7 years, 5 months

git:master:baf2d095: core/socket_info: use internal str2int() instead of strtol()

by Mikko Lehto

Module: kamailio Branch: master Commit: baf2d095b1d4dcc932ece9d48a6a8c397fa7b1a7 URL: https://github.com/kamailio/kamailio/commit/baf2d095b1d4dcc932ece9d48a6a8c3… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-24T13:27:40+03:00 core/socket_info: use internal str2int() instead of strtol() - strtol() works only for null terminated strings - fix for issue GH #1161 --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/baf2d095b1d4dcc932ece9d48a6a8c3… Patch: https://github.com/kamailio/kamailio/commit/baf2d095b1d4dcc932ece9d48a6a8c3… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index f280f2dcb0..62a15f4c93 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1973,7 +1973,7 @@ int parse_protohostport(str* ins, sr_phostp_t *r) char* second; /* second ':' occurrence */ char* p; int bracket; - char* tmp; + str tmp=STR_NULL; first=second=0; bracket=0; @@ -2012,15 +2012,20 @@ int parse_protohostport(str* ins, sr_phostp_t *r) if (second) { /* 2 ':' found => check if valid */ if (parse_proto((unsigned char*)ins->s, first-ins->s, &r->proto)<0) goto error_proto; - r->port=strtol(second+1, &tmp, 10); - if ((tmp==0)||(*tmp)||(tmp==second+1)) goto error_port; + + tmp.s=second+1; + tmp.len=(ins->s + ins->len) - tmp.s; + + if (str2int(&tmp, (unsigned int *)&(r->port))<0) goto error_port; + r->host.s=first+1; r->host.len=(int)(second-r->host.s); goto end; } /* only 1 ':' found => it's either proto:host or host:port */ - r->port=strtol(first+1, &tmp, 10); - if ((tmp==0)||(*tmp)||(tmp==first+1)){ + tmp.s=first+1; + tmp.len=(ins->s + ins->len) - tmp.s; + if (str2int(&tmp, (unsigned int *)&(r->port))<0) { /* invalid port => it's proto:host */ if (parse_proto((unsigned char*)ins->s, first-ins->s, &r->proto)<0) goto error_proto;

7 years, 5 months

git:master:f0f1a9a8: modules/jsonrpcs: add missing apostrophe to example

by Mikko Lehto

Module: kamailio Branch: master Commit: f0f1a9a8db1f5238b0ace1d3f190d0d9f0b2628d URL: https://github.com/kamailio/kamailio/commit/f0f1a9a8db1f5238b0ace1d3f190d0d… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-25T20:02:02+03:00 modules/jsonrpcs: add missing apostrophe to example --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f0f1a9a8db1f5238b0ace1d3f190d0d… Patch: https://github.com/kamailio/kamailio/commit/f0f1a9a8db1f5238b0ace1d3f190d0d… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index 587eba906e..5d4bd25fac 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -458,7 +458,7 @@ event_route[xhttp:request] { <title><function>jsonrpc_exec</function> usage</title> <programlisting format="linespecific"> ... -jsonrpc_exec({"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); +jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); ... </programlisting> </example>

7 years, 5 months

git:master:3188da9a: modules: readme files regenerated - topoh ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3188da9abdf5b02d4596586b979478675d2c363d URL: https://github.com/kamailio/kamailio/commit/3188da9abdf5b02d4596586b9794786… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-25T10:16:40+02:00 modules: readme files regenerated - topoh ... [skip ci] --- Modified: src/modules/topoh/README --- Diff: https://github.com/kamailio/kamailio/commit/3188da9abdf5b02d4596586b9794786… Patch: https://github.com/kamailio/kamailio/commit/3188da9abdf5b02d4596586b9794786… --- diff --git a/src/modules/topoh/README b/src/modules/topoh/README index 932aa846b7..0c1044cb09 100644 --- a/src/modules/topoh/README +++ b/src/modules/topoh/README @@ -34,6 +34,8 @@ Daniel-Constantin Mierla 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) + 3.11. event_callback (str) 4. Event Routes @@ -50,7 +52,9 @@ Daniel-Constantin Mierla 1.7. Set vparam_prefix parameter 1.8. Set callid_prefix parameter 1.9. Set sanity_checks parameter - 1.10. Usage of event_route[topoh:msg-outgoing] + 1.10. Set uri_prefix_checks parameter + 1.11. Set event_callback parameter + 1.12. Usage of event_route[topoh:msg-outgoing] Chapter 1. Admin Guide @@ -73,6 +77,8 @@ Chapter 1. Admin Guide 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) + 3.11. event_callback (str) 4. Event Routes @@ -122,6 +128,8 @@ Chapter 1. Admin Guide 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) + 3.11. event_callback (str) 3.1. mask_key (str) @@ -236,6 +244,46 @@ modparam("topoh", "callid_prefix", "***") modparam("topoh", "sanity_checks", 1) ... +3.10. uri_prefix_checks (integer) + + If set to 1, topoh module will check if URIs to be decoded match the + expected prefix composed from mask IP and parameter name prefix. It can + make the topoh processing safer by avoiding to try decoding URIs which + were not encoded previously by topoh. + + Note: do not enable this option if you have SIP devices that can alter + the URI values it takes from Contact or Record-Route headers (like + adding port 5060 when no port is in received URIs, or thet introduce + new parameters at unknown position). + + Default value is 0. + + Example 1.10. Set uri_prefix_checks parameter +... +modparam("topoh", "uri_prefix_checks", 1) +... + +3.11. event_callback (str) + + The name of the function in the KEMI configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead of + event_route[...] blocks. + + The function receives a string parameter with the name of the event. + + Default value is 'empty' (no function is executed for events). + + Example 1.11. Set event_callback parameter +... +modparam("topoh", "event_callback", "ksr_topoh_event") +... +-- event callback function implemented in Lua +function ksr_topoh_event(evname) + KSR.info("===== topoh module triggered event: " .. evname .. "\n"); + return 1; +end +... + 4. Event Routes 4.1. event_route[topoh:msg-outgoing] @@ -252,7 +300,7 @@ modparam("topoh", "sanity_checks", 1) reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.10. Usage of event_route[topoh:msg-outgoing] + Example 1.12. Usage of event_route[topoh:msg-outgoing] ... event_route[topoh:msg-outgoing] { if($sndto(ip)=="10.1.1.10") {

7 years, 5 months

git:5.0:c71bac4a: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.0 Commit: c71bac4aebbef927f7ebbed53c3d51531d6d3622 URL: https://github.com/kamailio/kamailio/commit/c71bac4aebbef927f7ebbed53c3d515… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-25T10:16:23+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/topoh/README --- Diff: https://github.com/kamailio/kamailio/commit/c71bac4aebbef927f7ebbed53c3d515… Patch: https://github.com/kamailio/kamailio/commit/c71bac4aebbef927f7ebbed53c3d515… --- diff --git a/src/modules/topoh/README b/src/modules/topoh/README index 213524545c..fb7442cc56 100644 --- a/src/modules/topoh/README +++ b/src/modules/topoh/README @@ -34,6 +34,7 @@ Daniel-Constantin Mierla 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) List of Examples @@ -46,6 +47,7 @@ Daniel-Constantin Mierla 1.7. Set vparam_prefix parameter 1.8. Set callid_prefix parameter 1.9. Set sanity_checks parameter + 1.10. Set uri_prefix_checks parameter Chapter 1. Admin Guide @@ -68,6 +70,7 @@ Chapter 1. Admin Guide 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) 1. Overview @@ -113,6 +116,7 @@ Chapter 1. Admin Guide 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) 3.1. mask_key (str) @@ -226,3 +230,22 @@ modparam("topoh", "callid_prefix", "***") ... modparam("topoh", "sanity_checks", 1) ... + +3.10. uri_prefix_checks (integer) + + If set to 1, topoh module will check if URIs to be decoded match the + expected prefix composed from mask IP and parameter name prefix. It can + make the topoh processing safer by avoiding to try decoding URIs which + were not encoded previously by topoh. + + Note: do not enable this option if you have SIP devices that can alter + the URI values it takes from Contact or Record-Route headers (like + adding port 5060 when no port is in received URIs, or thet introduce + new parameters at unknown position). + + Default value is 0. + + Example 1.10. Set uri_prefix_checks parameter +... +modparam("topoh", "uri_prefix_checks", 1) +...

7 years, 5 months

← Newer
1
...
10
11
12
13
14
15
16
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017