sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
418 discussions

[kamailio/kamailio] $dns pseudovar does not allow direct index access on the addr attribute (#2179)
by pwakano 07 Jan '20

07 Jan '20

### Description When trying to use the pseudovar $dns(xyz=>addr[0]) Kamailio script parser complains there is a syntax error and script won't start. However if a variable with value 0 is used, it works. There is no reason why one should not access those indexes directly using the value 0. Piece of code that does not work: ``` if(dns_query("$rd", "ddst")) { $var(dest_ip) = $dns(ddst=>addr[0]); # We just need first IP } ``` Piece of code that works: ``` if(dns_query("$rd", "ddst")) { $… [View More]var(i) = 0; $var(dest_ip) = $dns(ddst=>addr[$var(i)]); # We just need first IP } ``` I tried using the 0 with quotes, but no luck. I had to use a variable to access the index 0. I have not tried the "type" attribute, maybe same problem can happen with it. #### Reproduction Try adding this piece of code to the script: ``` if(dns_query("$rd", "ddst")) { $var(dest_ip) = $dns(ddst=>addr[0]); # We just need first IP } ``` This will output this error when running kamailio -c: ``` 0(22439) ERROR: ipops [ipops_pv.c:249]: pv_parse_dns_name(): invalid index [ddst=>addr[0]] 0(22439) ERROR: ipops [ipops_pv.c:261]: pv_parse_dns_name(): error at PV dns name: ddst=>addr[0] 0(22439) ERROR: <core> [core/pvapi.c:952]: pv_parse_spec2(): pvar "dns" has an invalid name param [ddst=>addr[0]] 0(22439) ERROR: <core> [core/pvapi.c:1107]: pv_parse_spec2(): wrong char [)/41] in [$dns(ddst=>addr[0])] at [18 (5)] 0(22439) CRITICAL: <core> [core/cfg.y:3508]: yyerror_at(): parse error in config file /etc/kamailio/routing.cfg, line 2398, column 20-38: Can't get from cache: $dns(ddst=>addr[0]) ``` ### Possible Solutions Instead of direct index access with integer values, it is necessary to access it with a variable. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.2.2 (x86_64/linux) 67f967 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: 67f967 compiled on 11:40:41 Mar 11 2019 with gcc 4.8.5 ``` -- 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/2179 [View Less]

2 2

git:master:a383caa1: ipops: fix locating static index for dns pv
by Daniel-Constantin Mierla 07 Jan '20

07 Jan '20

Module: kamailio Branch: master Commit: a383caa12a1af2cbc0f135add643045a159f24f2 URL: https://github.com/kamailio/kamailio/commit/a383caa12a1af2cbc0f135add643045… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-07T10:11:42+01:00 ipops: fix locating static index for dns pv - reported by GH #2179 --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] msrp: update m=message media to (#2186)
by sergey-safarov 07 Jan '20

07 Jan '20

# Description I want proxy MSRP messages via Kamailio. To get it working for SIP calls (not WebRTC) need alter SDP `m=message` media connection information: 1. set IP address to Kamailio TLS socket; 1. set port to Kamailio TLS socket. At preset time I cannot find way to do it. Could you add function like `msrp_manage` (like `rtpengine_manage`) that update SDP (request and answer) to allow proxy MSRP session via Kamailio socket. -- You are receiving this because you are subscribed to this … [View More]

2 6

[kamailio/kamailio] keepalive: added add/del/get/flush rpc commands (#2177)
by Yasin CANER 06 Jan '20

06 Jan '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  added add/del/get/flush rpc commands You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2177 -- Commit Summary -- * keepalive : added keepalive.add rpc command * keepalive : added keepalive.del rpc command * keepalive : added keepalive.get and keepalive.flush rpc commands -- File Changes -- M src/modules/keepalive/keepalive_rpc.c (147) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2177.patch https://github.com/kamailio/kamailio/pull/2177.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/2177 [View Less]

4 9

git:master:91e4e177: keepalive: adjustments to log messages and help text for rpc commands
by Daniel-Constantin Mierla 06 Jan '20

06 Jan '20

Module: kamailio Branch: master Commit: 91e4e1772289f0a6a6f19ff88f5861072611b25f URL: https://github.com/kamailio/kamailio/commit/91e4e1772289f0a6a6f19ff88f58610… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-06T18:30:14+01:00 keepalive: adjustments to log messages and help text for rpc commands --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/… [View More]commit/91e4e1772289f0a6a6f19ff88f58610… Patch: https://github.com/kamailio/kamailio/commit/91e4e1772289f0a6a6f19ff88f58610… --- diff --git a/src/modules/keepalive/keepalive_rpc.c b/src/modules/keepalive/keepalive_rpc.c index 9850b29648..0e6e6ec036 100644 --- a/src/modules/keepalive/keepalive_rpc.c +++ b/src/modules/keepalive/keepalive_rpc.c @@ -72,7 +72,7 @@ int ka_init_rpc(void) } static const char *keepalive_rpc_list_doc[2] = { - "Return the content of dispatcher sets", 0}; + "Return the content of keepalive destination groups", 0}; static void keepalive_rpc_list(rpc_t *rpc, void *ctx) { @@ -115,7 +115,7 @@ static void keepalive_rpc_add(rpc_t *rpc, void *ctx) return; } - LM_DBG(" keepalive adds [%.*s]\n", sip_adress.len , sip_adress.s); + LM_DBG("keepalive add [%.*s]\n", sip_adress.len, sip_adress.s); if(sip_adress.len<1 || table_name.len <1){ LM_ERR("parameter is len less than 1 \n" ); rpc->fault(ctx, 500, "parameter is len less than 1"); @@ -131,7 +131,7 @@ static void keepalive_rpc_add(rpc_t *rpc, void *ctx) return; } static const char *keepalive_rpc_add_doc[2] = { - "adds new destination to keepalive memory. usage: keepalive.add sip:username@domain listname", 0}; + "add new destination to keepalive memory. Usage: keepalive.add sip:user@domain listname", 0}; static void keepalive_rpc_del(rpc_t *rpc, void *ctx) { @@ -147,7 +147,7 @@ static void keepalive_rpc_del(rpc_t *rpc, void *ctx) return; } - LM_DBG(" keepalive deletes [%.*s]\n", sip_adress.len , sip_adress.s); + LM_DBG("keepalive delete [%.*s]\n", sip_adress.len, sip_adress.s); if(sip_adress.len < 1 || table_name.len < 1){ LM_ERR("parameter is len less than 1 \n"); @@ -164,7 +164,7 @@ static void keepalive_rpc_del(rpc_t *rpc, void *ctx) return; } static const char *keepalive_rpc_del_doc[2] = { - "deletes destination from keepalive memory. usage: keepalive.del sip:username@domain listname", 0}; + "delete destination from keepalive memory. Usage: keepalive.del sip:user@domain listname", 0}; static void keepalive_rpc_get(rpc_t *rpc, void *ctx) { @@ -182,7 +182,7 @@ static void keepalive_rpc_get(rpc_t *rpc, void *ctx) return; } - LM_DBG(" keepalive gets [%.*s]\n", sip_adress.len , sip_adress.s); + LM_DBG("keepalive get [%.*s]\n", sip_adress.len , sip_adress.s); if(sip_adress.len < 1 || table_name.len < 1){ LM_ERR("parameter is len less than 1 \n"); @@ -215,13 +215,13 @@ static void keepalive_rpc_get(rpc_t *rpc, void *ctx) return; } static const char *keepalive_rpc_get_doc[2] = { - "gets destination info data from keepalive memory. usage keepalive.get sip:xx@domain listname", 0}; + "get destination details from keepalive memory. Usage: keepalive.get sip:user@domain listname", 0}; static void keepalive_rpc_flush(rpc_t *rpc, void *ctx) { ka_dest_t *dest; - LM_DBG("Keepalive flushes \n"); + LM_DBG("keepalive flushe\n"); ka_lock_destination_list(); for(dest = ka_destinations_list->first; dest != NULL; dest = dest->next) { @@ -233,4 +233,4 @@ static void keepalive_rpc_flush(rpc_t *rpc, void *ctx) return; } static const char *keepalive_rpc_flush_doc[2] = { - "Flush data from keepalive memory. usage keepalive.flush ", 0}; + "Flush data from keepalive memory. Usage: keepalive.flush", 0}; [View Less]

1 0

git:master:7a136428: Merge pull request #2177 from ycaner06/keepalive3
by GitHub 06 Jan '20

06 Jan '20

Module: kamailio Branch: master Commit: 7a136428c73be8409779a7d40b90cd71dd599a2a URL: https://github.com/kamailio/kamailio/commit/7a136428c73be8409779a7d40b90cd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-01-06T18:23:17+01:00 Merge pull request #2177 from ycaner06/keepalive3 keepalive: added add/del/get/flush rpc commands --- Modified: src/modules/keepalive/doc/keepalive_admin.xml Modified: src/modules/keepalive/… [View More]

1 0

git:master:d79e26fd: keepalive : added doc for add/del/get/flush rpc commands
by Yasin CANER 06 Jan '20

06 Jan '20

Module: kamailio Branch: master Commit: d79e26fd50b3a28dcfd4c0a938bcc3d0a3fc30b5 URL: https://github.com/kamailio/kamailio/commit/d79e26fd50b3a28dcfd4c0a938bcc3d… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Yasin CANER <caner_yaso(a)hotmail.com> Date: 2019-12-16T16:49:02+03:00 keepalive : added doc for add/del/get/flush rpc commands added doc for add/del/get/flush rpc commands --- Modified: src/modules/keepalive/doc/keepalive_admin.xml --- Diff: https://github.… [View More]com/kamailio/kamailio/commit/d79e26fd50b3a28dcfd4c0a938bcc3d… Patch: https://github.com/kamailio/kamailio/commit/d79e26fd50b3a28dcfd4c0a938bcc3d… --- diff --git a/src/modules/keepalive/doc/keepalive_admin.xml b/src/modules/keepalive/doc/keepalive_admin.xml index 4fcd0a18ae..5db99eee4a 100644 --- a/src/modules/keepalive/doc/keepalive_admin.xml +++ b/src/modules/keepalive/doc/keepalive_admin.xml @@ -245,7 +245,71 @@ ka_del_destination("sip:192.168.1.10:5060;transport=tcp"); keepalive.list </programlisting> </example> - </section> + </section> + <section id="keepalive.add"> + <title><function>keepalive.add</function></title> + <para> + Adds destination in memory. + </para> + <para> + Name: <emphasis>keepalive.add</emphasis> + </para> + <para>Parameters: <emphasis>sip_uri listname</emphasis></para> + <example> + <title><function>keepalive.add</function> RPC example</title> + <programlisting format="linespecific"> + keepalive.add sip:username@domain listname + </programlisting> + </example> + </section> + <section id="keepalive.del"> + <title><function>keepalive.del</function></title> + <para> + Deletes destination in memory. + </para> + <para> + Name: <emphasis>keepalive.del</emphasis> + </para> + <para>Parameters: <emphasis>sip_uri listname</emphasis></para> + <example> + <title><function>keepalive.del</function> RPC example</title> + <programlisting format="linespecific"> + keepalive.del sip:username@domain listname + </programlisting> + </example> + </section> + <section id="keepalive.get"> + <title><function>keepalive.get</function></title> + <para> + Gets destination in memory. + </para> + <para> + Name: <emphasis>keepalive.get</emphasis> + </para> + <para>Parameters: <emphasis>sip_uri listname</emphasis></para> + <example> + <title><function>keepalive.get</function> RPC example</title> + <programlisting format="linespecific"> + keepalive.get sip:username@domain listname + </programlisting> + </example> + </section> + <section id="keepalive.flush"> + <title><function>keepalive.flush</function></title> + <para> + Deletes all destinations in memory. + </para> + <para> + Name: <emphasis>keepalive.flush</emphasis> + </para> + <para>Parameters: <emphasis></emphasis></para> + <example> + <title><function>keepalive.flush</function> RPC example</title> + <programlisting format="linespecific"> + keepalive.flush + </programlisting> + </example> + </section> </section> </section> </chapter> [View Less]

1 0

git:master:4160842f: keepalive : added keepalive.get and keepalive.flush rpc commands
by Yasin CANER 06 Jan '20

06 Jan '20

Module: kamailio Branch: master Commit: 4160842f809edffe6c09ef0f84ba53fef01cbc6f URL: https://github.com/kamailio/kamailio/commit/4160842f809edffe6c09ef0f84ba53f… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Yasin CANER <caner_yaso(a)hotmail.com> Date: 2019-12-16T06:41:50-05:00 keepalive : added keepalive.get and keepalive.flush rpc commands added keepalive.get and keepalive.flush rpc commands --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://… [View More]github.com/kamailio/kamailio/commit/4160842f809edffe6c09ef0f84ba53f… Patch: https://github.com/kamailio/kamailio/commit/4160842f809edffe6c09ef0f84ba53f… --- diff --git a/src/modules/keepalive/keepalive_rpc.c b/src/modules/keepalive/keepalive_rpc.c index a873effdd6..9850b29648 100644 --- a/src/modules/keepalive/keepalive_rpc.c +++ b/src/modules/keepalive/keepalive_rpc.c @@ -44,18 +44,21 @@ static const char *keepalive_rpc_list_doc[2]; static const char *keepalive_rpc_add_doc[2]; static const char *keepalive_rpc_del_doc[2]; - +static const char *keepalive_rpc_get_doc[2]; +static const char *keepalive_rpc_flush_doc[2]; static void keepalive_rpc_list(rpc_t *rpc, void *ctx); static void keepalive_rpc_add(rpc_t *rpc, void *ctx); static void keepalive_rpc_del(rpc_t *rpc, void *ctx); - +static void keepalive_rpc_get(rpc_t *rpc, void *ctx); +static void keepalive_rpc_flush(rpc_t *rpc, void *ctx); rpc_export_t keepalive_rpc_cmds[] = { {"keepalive.list", keepalive_rpc_list, keepalive_rpc_list_doc, 0}, {"keepalive.add", keepalive_rpc_add, keepalive_rpc_add_doc, 0}, {"keepalive.del", keepalive_rpc_del, keepalive_rpc_del_doc, 0}, - + {"keepalive.get", keepalive_rpc_get, keepalive_rpc_get_doc, 0}, + {"keepalive.flush", keepalive_rpc_flush, keepalive_rpc_flush_doc, 0}, {0, 0, 0, 0} }; @@ -162,3 +165,72 @@ static void keepalive_rpc_del(rpc_t *rpc, void *ctx) } static const char *keepalive_rpc_del_doc[2] = { "deletes destination from keepalive memory. usage: keepalive.del sip:username@domain listname", 0}; + +static void keepalive_rpc_get(rpc_t *rpc, void *ctx) +{ + str sip_adress = {0,0}; + str table_name ={0,0}; + int ret = 0; + ka_dest_t *target=0 , *head =0; + void *sub; + + ret = rpc->scan(ctx, "SS",&sip_adress,&table_name); + + if (ret < 2) { + LM_ERR("not enough parameters - read so far: %d\n", ret); + rpc->fault(ctx, 500, "Not enough parameters or wrong format"); + return; + } + + LM_DBG(" keepalive gets [%.*s]\n", sip_adress.len , sip_adress.s); + + if(sip_adress.len < 1 || table_name.len < 1){ + LM_ERR("parameter is len less than 1 \n"); + rpc->fault(ctx, 500, "parameter is len less than 1"); + return; + } + ka_lock_destination_list(); + + if(ka_find_destination(&sip_adress, &table_name, &target, &head) < 0 ){ + LM_ERR("couldn't get data from list \n" ); + rpc->fault(ctx, 500, "couldn't get data from list"); + ka_unlock_destination_list(); + + return; + } + + if(!target){ + LM_ERR("Target is empty \n" ); + rpc->fault(ctx, 500, "couldn't get data from list"); + ka_unlock_destination_list(); + return; + } + + rpc->add(ctx, "{", &sub); + + rpc->struct_add(sub, "SSd", "uri", &target->uri, "owner", &target->owner,"state", target->state); + + ka_unlock_destination_list(); + + return; +} +static const char *keepalive_rpc_get_doc[2] = { + "gets destination info data from keepalive memory. usage keepalive.get sip:xx@domain listname", 0}; + + +static void keepalive_rpc_flush(rpc_t *rpc, void *ctx) +{ + ka_dest_t *dest; + LM_DBG("Keepalive flushes \n"); + ka_lock_destination_list(); + + for(dest = ka_destinations_list->first; dest != NULL; dest = dest->next) { + free_destination(dest); + } + ka_destinations_list->first = 0; + ka_unlock_destination_list(); + + return; +} +static const char *keepalive_rpc_flush_doc[2] = { + "Flush data from keepalive memory. usage keepalive.flush ", 0}; [View Less]

1 0

git:master:844c680f: keepalive : added keepalive.del rpc command
by Yasin CANER 06 Jan '20

06 Jan '20

Module: kamailio Branch: master Commit: 844c680fbe6740f5eef9bee83ebefa36934142d7 URL: https://github.com/kamailio/kamailio/commit/844c680fbe6740f5eef9bee83ebefa3… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Yasin CANER <caner_yaso(a)hotmail.com> Date: 2019-12-16T06:38:05-05:00 keepalive : added keepalive.del rpc command added keepalive.del rpc command --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]844c680fbe6740f5eef9bee83ebefa3… Patch: https://github.com/kamailio/kamailio/commit/844c680fbe6740f5eef9bee83ebefa3… --- diff --git a/src/modules/keepalive/keepalive_rpc.c b/src/modules/keepalive/keepalive_rpc.c index 88de7bae04..a873effdd6 100644 --- a/src/modules/keepalive/keepalive_rpc.c +++ b/src/modules/keepalive/keepalive_rpc.c @@ -43,13 +43,19 @@ static const char *keepalive_rpc_list_doc[2]; static const char *keepalive_rpc_add_doc[2]; +static const char *keepalive_rpc_del_doc[2]; + static void keepalive_rpc_list(rpc_t *rpc, void *ctx); static void keepalive_rpc_add(rpc_t *rpc, void *ctx); +static void keepalive_rpc_del(rpc_t *rpc, void *ctx); + rpc_export_t keepalive_rpc_cmds[] = { {"keepalive.list", keepalive_rpc_list, keepalive_rpc_list_doc, 0}, {"keepalive.add", keepalive_rpc_add, keepalive_rpc_add_doc, 0}, + {"keepalive.del", keepalive_rpc_del, keepalive_rpc_del_doc, 0}, + {0, 0, 0, 0} }; @@ -122,4 +128,37 @@ static void keepalive_rpc_add(rpc_t *rpc, void *ctx) return; } static const char *keepalive_rpc_add_doc[2] = { - "adds new destination to keepalive memory. usage keepalive.add sip:username@domain listname", 0}; + "adds new destination to keepalive memory. usage: keepalive.add sip:username@domain listname", 0}; + +static void keepalive_rpc_del(rpc_t *rpc, void *ctx) +{ + str sip_adress = {0,0}; + str table_name ={0,0}; + int ret = 0; + + ret = rpc->scan(ctx, "SS",&sip_adress,&table_name); + + if (ret < 2) { + LM_ERR("not enough parameters - read so far: %d\n", ret); + rpc->fault(ctx, 500, "Not enough parameters or wrong format"); + return; + } + + LM_DBG(" keepalive deletes [%.*s]\n", sip_adress.len , sip_adress.s); + + if(sip_adress.len < 1 || table_name.len < 1){ + LM_ERR("parameter is len less than 1 \n"); + rpc->fault(ctx, 500, "parameter is len less than 1"); + return; + } + + if(ka_del_destination(&sip_adress,&table_name) < 0 ){ + LM_ERR("couldn't delete data from list \n" ); + rpc->fault(ctx, 500, "couldn't delete data from list"); + return; + } + + return; +} +static const char *keepalive_rpc_del_doc[2] = { + "deletes destination from keepalive memory. usage: keepalive.del sip:username@domain listname", 0}; [View Less]

1 0

git:master:5b2ad5c7: keepalive : added keepalive.add rpc command
by Yasin CANER 06 Jan '20

06 Jan '20

Module: kamailio Branch: master Commit: 5b2ad5c7c3fbdadb856b32b1cf8ad8ecb913ba63 URL: https://github.com/kamailio/kamailio/commit/5b2ad5c7c3fbdadb856b32b1cf8ad8e… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Yasin CANER <caner_yaso(a)hotmail.com> Date: 2019-12-16T06:35:55-05:00 keepalive : added keepalive.add rpc command added keepalive.add rpc command --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

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 January 2020