June 2018 - sr-dev - kamailio.org

git:5.1:538ac2c5: core: make dns name to IP conversion more robust for IPv4 and IPv6
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: 5.1 Commit: 538ac2c5eeb9f2df1d896adf0661e5e35fadb504 URL: https://github.com/kamailio/kamailio/commit/538ac2c5eeb9f2df1d896adf0661e5e… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-08T21:20:54+02:00 core: make dns name to IP conversion more robust for IPv4 and IPv6 (cherry picked from commit 4a55a2b40b91f282d7fd8f0e3c3ae22bcf56d9dc) --- Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/538ac2c5eeb9f2df1d896adf0661e5e… Patch: https://github.com/kamailio/kamailio/commit/538ac2c5eeb9f2df1d896adf0661e5e… --- diff --git a/src/core/resolve.h b/src/core/resolve.h index fad783e4e6..30cce19581 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -229,6 +229,10 @@ static inline struct ip_addr* str2ip(str* st) static struct ip_addr ip; unsigned char* s; + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!st->s || st->len <= 0)) { + LM_ERR("invalid name, no conversion to IP address possible\n"); + } s=(unsigned char*)st->s; /*init*/ @@ -281,6 +285,10 @@ static inline struct ip_addr* str2ip6(str* st) unsigned char* limit; unsigned char* s; + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!st->s || st->len <= 0)) { + LM_ERR("invalid name, no conversion to IP address possible\n"); + } /* init */ if ((st->len) && (st->s[0]=='[')){ /* skip over [ ] */

1 0

git:5.0:11300211: core: make dns name to IP conversion more robust for IPv4 and IPv6
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: 5.0 Commit: 11300211d6562aafc654a778f25657f001a39790 URL: https://github.com/kamailio/kamailio/commit/11300211d6562aafc654a778f25657f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-08T21:20:32+02:00 core: make dns name to IP conversion more robust for IPv4 and IPv6 (cherry picked from commit 4a55a2b40b91f282d7fd8f0e3c3ae22bcf56d9dc) --- Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/11300211d6562aafc654a778f25657f… Patch: https://github.com/kamailio/kamailio/commit/11300211d6562aafc654a778f25657f… --- diff --git a/src/core/resolve.h b/src/core/resolve.h index fad783e4e6..30cce19581 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -229,6 +229,10 @@ static inline struct ip_addr* str2ip(str* st) static struct ip_addr ip; unsigned char* s; + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!st->s || st->len <= 0)) { + LM_ERR("invalid name, no conversion to IP address possible\n"); + } s=(unsigned char*)st->s; /*init*/ @@ -281,6 +285,10 @@ static inline struct ip_addr* str2ip6(str* st) unsigned char* limit; unsigned char* s; + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!st->s || st->len <= 0)) { + LM_ERR("invalid name, no conversion to IP address possible\n"); + } /* init */ if ((st->len) && (st->s[0]=='[')){ /* skip over [ ] */

1 0

git:master:4a55a2b4: core: make dns name to IP conversion more robust for IPv4 and IPv6
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 4a55a2b40b91f282d7fd8f0e3c3ae22bcf56d9dc URL: https://github.com/kamailio/kamailio/commit/4a55a2b40b91f282d7fd8f0e3c3ae22… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-08T21:16:51+02:00 core: make dns name to IP conversion more robust for IPv4 and IPv6 --- Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/4a55a2b40b91f282d7fd8f0e3c3ae22… Patch: https://github.com/kamailio/kamailio/commit/4a55a2b40b91f282d7fd8f0e3c3ae22… --- diff --git a/src/core/resolve.h b/src/core/resolve.h index fad783e4e6..30cce19581 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -229,6 +229,10 @@ static inline struct ip_addr* str2ip(str* st) static struct ip_addr ip; unsigned char* s; + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!st->s || st->len <= 0)) { + LM_ERR("invalid name, no conversion to IP address possible\n"); + } s=(unsigned char*)st->s; /*init*/ @@ -281,6 +285,10 @@ static inline struct ip_addr* str2ip6(str* st) unsigned char* limit; unsigned char* s; + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!st->s || st->len <= 0)) { + LM_ERR("invalid name, no conversion to IP address possible\n"); + } /* init */ if ((st->len) && (st->s[0]=='[')){ /* skip over [ ] */

1 0

git:master:6a478a24: core: bug fix in function reference for full preprocessor defines output
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 6a478a2432e04652f2f5ef5919101dd166d9ee2d URL: https://github.com/kamailio/kamailio/commit/6a478a2432e04652f2f5ef5919101dd… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-08T18:09:08+02:00 core: bug fix in function reference for full preprocessor defines output --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/6a478a2432e04652f2f5ef5919101dd… Patch: https://github.com/kamailio/kamailio/commit/6a478a2432e04652f2f5ef5919101dd… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index d1ceb88cef..9acc5361b0 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -1072,9 +1072,9 @@ static rpc_export_t core_rpc_methods[] = { 0}, {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0}, {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, - {"core.modules", core_modules, core_modules_doc, RET_ARRAY}, - {"core.ppdefines", core_ppdefines, core_ppdefines_doc, RET_ARRAY}, - {"core.ppdefines_full", core_ppdefines_full, core_ppdefines_doc, RET_ARRAY}, + {"core.modules", core_modules, core_modules_doc, RET_ARRAY}, + {"core.ppdefines", core_ppdefines, core_ppdefines_doc, RET_ARRAY}, + {"core.ppdefines_full", core_ppdefines_full, core_ppdefines_full_doc, RET_ARRAY}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 },

1 0

git:master:94e7a4d8: modules: readme files regenerated - sdpops ... [skip ci]
by Kamailio Dev 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 94e7a4d862909886ef9ed9426532eee32f0262d9 URL: https://github.com/kamailio/kamailio/commit/94e7a4d862909886ef9ed9426532eee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-08T11:01:48+02:00 modules: readme files regenerated - sdpops ... [skip ci] --- Modified: src/modules/sdpops/README --- Diff: https://github.com/kamailio/kamailio/commit/94e7a4d862909886ef9ed9426532eee… Patch: https://github.com/kamailio/kamailio/commit/94e7a4d862909886ef9ed9426532eee… --- diff --git a/src/modules/sdpops/README b/src/modules/sdpops/README index 5986d445e0..7e029018f9 100644 --- a/src/modules/sdpops/README +++ b/src/modules/sdpops/README @@ -481,7 +481,8 @@ if(sdp_with_ice()) { Store the search part of SDP body message with line beginning with 'string' in an AVP. Return 1 if 'string' is found in SDP, -1 on error - and -2 if there is no SDP part in the message body. + and -2 if there is no SDP part in the message body. The second + parameter can contain psudeo-variables. This function can be used from ANY_ROUTE.

1 0

[kamailio/kamailio] log_prefix do not work in failure_route (#1531)
by Jurijs Ivolga 08 Jun '18

08 Jun '18

### Description log_prefix do not work in failure_route ### Troubleshooting #### Reproduction log_prefix="{$mt $hdr(CSeq) $ci} " ... ... failure_route[RTF_LCR_ROUTE] { if (t_is_canceled()) { exit; } xlog("L_INFO", "--- SCRIPT: failure_route - RTF_LCR_ROUTE\n"); if (t_check_status("408|50[0-4]") or (t_branch_timeout() and !t_branch_replied())) { if(!next_gw()) { send_reply("503", "No more LCR gateways"); exit; } xlog("L_INFO", "flag $avp(lcr_flag) \n"); t_on_failure("RTF_LCR_ROUTE"); t_set_retr(0, 4000); route(RELAY); exit; } } #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` INFO: <script>: --- SCRIPT: failure_route - RTF_LCR_ROUTE ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.7 (x86_64/linux) 35d8ab 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, 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_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 35d8ab compiled on 11:55:20 Mar 19 2018 with gcc 6.3.0 ``` * **Operating System**:  ``` Linux kamailio 4.13.0-37-generic #42~16.04.1-Ubuntu SMP Wed Mar 7 16:03:28 UTC 2018 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/1531

2 3

git:master:f34654a2: sdpops: docs - note that second param of ki_sdp_get_line_startswith() can have pv
by Daniel-Constantin Mierla 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: f34654a2a0e7127ac7a2094cb8bc261e4a9c4e50 URL: https://github.com/kamailio/kamailio/commit/f34654a2a0e7127ac7a2094cb8bc261… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-08T10:53:03+02:00 sdpops: docs - note that second param of ki_sdp_get_line_startswith() can have pv --- Modified: src/modules/sdpops/doc/sdpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f34654a2a0e7127ac7a2094cb8bc261… Patch: https://github.com/kamailio/kamailio/commit/f34654a2a0e7127ac7a2094cb8bc261… --- diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml index 094aaa88ad..37f7f2d5a7 100644 --- a/src/modules/sdpops/doc/sdpops_admin.xml +++ b/src/modules/sdpops/doc/sdpops_admin.xml @@ -557,6 +557,7 @@ if(sdp_with_ice()) { <para> Store the search part of SDP body message with line beginning with 'string' in an AVP. Return 1 if 'string' is found in SDP, -1 on error and -2 if there is no SDP part in the message body. + The second parameter can contain psudeo-variables. </para> <para> This function can be used from ANY_ROUTE.

1 0

git:master:8ba8dcfe: sdpops: allow vars in second parameter for sdp_get_line_startswith()
by Daniel-Constantin Mierla 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 8ba8dcfe425afcbca32a82e0b1fc46124f86f603 URL: https://github.com/kamailio/kamailio/commit/8ba8dcfe425afcbca32a82e0b1fc461… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-08T10:51:09+02:00 sdpops: allow vars in second parameter for sdp_get_line_startswith() - export sdp_get_line_startswith() to KSR kemi framework --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8ba8dcfe425afcbca32a82e0b1fc461… Patch: https://github.com/kamailio/kamailio/commit/8ba8dcfe425afcbca32a82e0b1fc461…

1 0

git:master:41067694: core: helper fixup function for none and spve parameters
by Daniel-Constantin Mierla 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 4106769466e842f971d8aeab38cb2343cb90efdf URL: https://github.com/kamailio/kamailio/commit/4106769466e842f971d8aeab38cb234… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-08T10:48:59+02:00 core: helper fixup function for none and spve parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/4106769466e842f971d8aeab38cb234… Patch: https://github.com/kamailio/kamailio/commit/4106769466e842f971d8aeab38cb234… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index b07adcfc26..df3775f6cd 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -664,3 +664,23 @@ int fixup_free_spve_pvar(void** param, int param_no) return fixup_free_pvar_null(param, 1); return E_UNSPEC; } + +/** + * + */ +int fixup_none_spve(void** param, int param_no) +{ + if(param_no==2) + return fixup_spve_null(param, 1); + return 0; +} + +/** + * + */ +int fixup_free_none_spve(void** param, int param_no) +{ + if(param_no==2) + return fixup_free_spve_null(param, 1); + return 0; +} \ No newline at end of file diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 869dd78527..e78b2d2df0 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -146,6 +146,9 @@ int fixup_free_spve_igp(void** param, int param_no); int fixup_spve_pvar(void** param, int param_no); int fixup_free_spve_pvar(void** param, int param_no); +int fixup_none_spve(void** param, int param_no); +int fixup_free_none_spve(void** param, int param_no); + /** get the corresp. free fixup function.*/ free_fixup_function mod_fix_get_fixup_free(fixup_function f);

1 0

git:master:7e5e5ca4: topos: docs - added section ids to parameters
by Daniel-Constantin Mierla 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 7e5e5ca4ccf21e2644ed8e82bc5225f4432b1247 URL: https://github.com/kamailio/kamailio/commit/7e5e5ca4ccf21e2644ed8e82bc5225f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-08T09:20:20+02:00 topos: docs - added section ids to parameters --- Modified: src/modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7e5e5ca4ccf21e2644ed8e82bc5225f… Patch: https://github.com/kamailio/kamailio/commit/7e5e5ca4ccf21e2644ed8e82bc5225f… --- diff --git a/src/modules/topoh/doc/topoh_admin.xml b/src/modules/topoh/doc/topoh_admin.xml index a54c66ece6..857813585b 100644 --- a/src/modules/topoh/doc/topoh_admin.xml +++ b/src/modules/topoh/doc/topoh_admin.xml @@ -66,7 +66,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="topoh.p.mask_key"> <title><varname>mask_key</varname> (str)</title> <para> Keyword to mask the headers. @@ -85,7 +85,7 @@ modparam("topoh", "mask_key", "some secret here") </programlisting> </example> </section> - <section> + <section id="topoh.p.mask_ip"> <title><varname>mask_ip</varname> (str)</title> <para> IP address to be used in masked headers to build valid @@ -108,7 +108,7 @@ modparam("topoh", "mask_ip", "192.168.0.1") </programlisting> </example> </section> - <section> + <section id="topoh.p.mask_callid"> <title><varname>mask_callid</varname> (integer)</title> <para> Whether to encode the Call-id: header. Some SIP extensions include @@ -136,7 +136,7 @@ modparam("topoh", "mask_callid", 1) </programlisting> </example> </section> - <section> + <section id="topoh.p.uparam_name"> <title><varname>uparam_name</varname> (str)</title> <para> Name of URI parameter where to store encoded value. @@ -155,7 +155,7 @@ modparam("topoh", "uparam_name", "myparam") </programlisting> </example> </section> - <section> + <section id="topoh.p.uparam_prefix"> <title><varname>uparam_prefix</varname> (str)</title> <para> Prefix to be added in encoded URI parameters. @@ -174,7 +174,7 @@ modparam("topoh", "uparam_prefix", "xyz") </programlisting> </example> </section> - <section> + <section id="topoh.p.vparam_name"> <title><varname>vparam_name</varname> (str)</title> <para> Name of Via: parameter used to store encoded value. @@ -193,7 +193,7 @@ modparam("topoh", "vparam_name", "myv") </programlisting> </example> </section> - <section> + <section id="topoh.p.vparam_prefix"> <title><varname>vparam_prefix</varname> (str)</title> <para> Prefix to be added in encoded Via: parameters. @@ -212,7 +212,7 @@ modparam("topoh", "vparam_prefix", "xyz") </programlisting> </example> </section> - <section> + <section id="topoh.p.callid_prefix"> <title><varname>callid_prefix</varname> (str)</title> <para> Prefix to be added in encoded Call-ID: headers. @@ -231,7 +231,7 @@ modparam("topoh", "callid_prefix", "***") </programlisting> </example> </section> - <section> + <section id="topoh.p.sanity_checks"> <title><varname>sanity_checks</varname> (integer)</title> <para> If set to 1, topoh module will bind to sanity module in order @@ -253,7 +253,7 @@ modparam("topoh", "sanity_checks", 1) </programlisting> </example> </section> - <section> + <section id="topoh.p.uri_prefix_checks"> <title><varname>uri_prefix_checks</varname> (integer)</title> <para> If set to 1, topoh module will check if URIs to be decoded match

1 0

[kamailio/kamailio] Modules: sdpops sdp_get_line_startswith export to kemi (#1557)
by Surendra Tiwari 07 Jun '18

07 Jun '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 Export the sdp_get_line_startswith function to KEMI Interface. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1557 -- Commit Summary -- * Modules: sdpops sdp_get_line_startswith export to kemi -- File Changes -- M src/modules/sdpops/sdpops_mod.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1557.patch https://github.com/kamailio/kamailio/pull/1557.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/1557

1 1

git:5.0:6935fb74: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 Jun '18

07 Jun '18

Module: kamailio Branch: 5.0 Commit: 6935fb7419d144478f67357551c0e7161639651e URL: https://github.com/kamailio/kamailio/commit/6935fb7419d144478f67357551c0e71… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-07T17:46:21+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/cfgt/README --- Diff: https://github.com/kamailio/kamailio/commit/6935fb7419d144478f67357551c0e71… Patch: https://github.com/kamailio/kamailio/commit/6935fb7419d144478f67357551c0e71… --- diff --git a/src/modules/cfgt/README b/src/modules/cfgt/README index 8a098a69dc..03c3bbd61b 100644 --- a/src/modules/cfgt/README +++ b/src/modules/cfgt/README @@ -74,7 +74,7 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules The following modules must be loaded before this module: - * None. + * pv. 2.2. External Libraries or Applications

1 0

git:5.0:0d9c9785: cfgt: documment that pv module has to be loaded in order to work
by Victor Seva 07 Jun '18

07 Jun '18

Module: kamailio Branch: 5.0 Commit: 0d9c9785b7891ed52eb23d0cb596cd42b4e3153d URL: https://github.com/kamailio/kamailio/commit/0d9c9785b7891ed52eb23d0cb596cd4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:37:10+02:00 cfgt: documment that pv module has to be loaded in order to work (cherry picked from commit 7d21723205ad02374364c3f0143b618d1a649d4d) --- Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0d9c9785b7891ed52eb23d0cb596cd4… Patch: https://github.com/kamailio/kamailio/commit/0d9c9785b7891ed52eb23d0cb596cd4… --- diff --git a/src/modules/cfgt/doc/cfgt_admin.xml b/src/modules/cfgt/doc/cfgt_admin.xml index 38490d3d87..9917a13902 100644 --- a/src/modules/cfgt/doc/cfgt_admin.xml +++ b/src/modules/cfgt/doc/cfgt_admin.xml @@ -35,7 +35,7 @@ <itemizedlist> <listitem> <para> - <emphasis>None</emphasis>. + <emphasis>pv</emphasis>. </para> </listitem> </itemizedlist>

1 0

git:5.0:adbaeee8: core: unset routename when default_routename is set
by Victor Seva 07 Jun '18

07 Jun '18

Module: kamailio Branch: 5.0 Commit: adbaeee8de57312336df571045001fb1fab259c6 URL: https://github.com/kamailio/kamailio/commit/adbaeee8de57312336df571045001fb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:36:52+02:00 core: unset routename when default_routename is set fix #1536 (cherry picked from commit 92f8fdabcffd84e315d749bae8ded3490f8de014) --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/adbaeee8de57312336df571045001fb… Patch: https://github.com/kamailio/kamailio/commit/adbaeee8de57312336df571045001fb… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 53fefd34c8..f7a3f145f1 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -556,23 +556,23 @@ IMPORTFILE "import_file" <INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } <INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } <INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } -<INITIAL>{ROUTE} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE; } -<INITIAL>{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE_REQUEST} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE_REQUEST; } -<INITIAL>{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_ONREPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_ONREPLY; } -<INITIAL>{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_REPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_REPLY; } -<INITIAL>{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE"; +<INITIAL>{ROUTE_FAILURE} { count(); routename=0; default_routename="DEFAULT_FAILURE"; yylval.strval=yytext; return ROUTE_FAILURE; } -<INITIAL>{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH"; +<INITIAL>{ROUTE_BRANCH} { count(); routename=0; default_routename="DEFAULT_BRANCH"; yylval.strval=yytext; return ROUTE_BRANCH; } -<INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; +<INITIAL>{ROUTE_SEND} { count(); routename=0; default_routename="DEFAULT_SEND"; yylval.strval=yytext; return ROUTE_SEND; } -<INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; +<INITIAL>{ROUTE_EVENT} { count(); routename=0; default_routename="DEFAULT_EVENT"; yylval.strval=yytext; state=EVRT_NAME_S; BEGIN(EVRTNAME); return ROUTE_EVENT; }

1 0

git:5.1:a8bbf774: cfgt: documment that pv module has to be loaded in order to work
by Victor Seva 07 Jun '18

07 Jun '18

Module: kamailio Branch: 5.1 Commit: a8bbf774d0c92e2c177c4a860bb18211d56186dd URL: https://github.com/kamailio/kamailio/commit/a8bbf774d0c92e2c177c4a860bb1821… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:37:19+02:00 cfgt: documment that pv module has to be loaded in order to work (cherry picked from commit 7d21723205ad02374364c3f0143b618d1a649d4d) --- Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a8bbf774d0c92e2c177c4a860bb1821… Patch: https://github.com/kamailio/kamailio/commit/a8bbf774d0c92e2c177c4a860bb1821… --- diff --git a/src/modules/cfgt/doc/cfgt_admin.xml b/src/modules/cfgt/doc/cfgt_admin.xml index 38490d3d87..9917a13902 100644 --- a/src/modules/cfgt/doc/cfgt_admin.xml +++ b/src/modules/cfgt/doc/cfgt_admin.xml @@ -35,7 +35,7 @@ <itemizedlist> <listitem> <para> - <emphasis>None</emphasis>. + <emphasis>pv</emphasis>. </para> </listitem> </itemizedlist>

1 0

git:5.1:1ea010dd: core: unset routename when default_routename is set
by Victor Seva 07 Jun '18

07 Jun '18

Module: kamailio Branch: 5.1 Commit: 1ea010dd4db8e6486cf0fa928a2b11ffb0d441fa URL: https://github.com/kamailio/kamailio/commit/1ea010dd4db8e6486cf0fa928a2b11f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:36:15+02:00 core: unset routename when default_routename is set fix #1536 (cherry picked from commit 92f8fdabcffd84e315d749bae8ded3490f8de014) --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/1ea010dd4db8e6486cf0fa928a2b11f… Patch: https://github.com/kamailio/kamailio/commit/1ea010dd4db8e6486cf0fa928a2b11f… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index cd6808d063..4d3931d419 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -562,23 +562,23 @@ IMPORTFILE "import_file" <INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } <INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } <INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } -<INITIAL>{ROUTE} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE; } -<INITIAL>{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE_REQUEST} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE_REQUEST; } -<INITIAL>{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_ONREPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_ONREPLY; } -<INITIAL>{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_REPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_REPLY; } -<INITIAL>{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE"; +<INITIAL>{ROUTE_FAILURE} { count(); routename=0; default_routename="DEFAULT_FAILURE"; yylval.strval=yytext; return ROUTE_FAILURE; } -<INITIAL>{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH"; +<INITIAL>{ROUTE_BRANCH} { count(); routename=0; default_routename="DEFAULT_BRANCH"; yylval.strval=yytext; return ROUTE_BRANCH; } -<INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; +<INITIAL>{ROUTE_SEND} { count(); routename=0; default_routename="DEFAULT_SEND"; yylval.strval=yytext; return ROUTE_SEND; } -<INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; +<INITIAL>{ROUTE_EVENT} { count(); routename=0; default_routename="DEFAULT_EVENT"; yylval.strval=yytext; state=EVRT_NAME_S; BEGIN(EVRTNAME); return ROUTE_EVENT; }

1 0

git:master:caefbb2c: modules: readme files regenerated - cfgt ... [skip ci]
by Kamailio Dev 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: caefbb2c97eed2313d5cca95fa7a510a96237377 URL: https://github.com/kamailio/kamailio/commit/caefbb2c97eed2313d5cca95fa7a510… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-07T17:31:39+02:00 modules: readme files regenerated - cfgt ... [skip ci] --- Modified: src/modules/cfgt/README --- Diff: https://github.com/kamailio/kamailio/commit/caefbb2c97eed2313d5cca95fa7a510… Patch: https://github.com/kamailio/kamailio/commit/caefbb2c97eed2313d5cca95fa7a510… --- diff --git a/src/modules/cfgt/README b/src/modules/cfgt/README index eb4ead159c..c237d1e9d1 100644 --- a/src/modules/cfgt/README +++ b/src/modules/cfgt/README @@ -74,7 +74,7 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules The following modules must be loaded before this module: - * None. + * pv. 2.2. External Libraries or Applications

1 0

[kamailio/kamailio] cfgt: wrong route name if onsend_route is not declared at the beginning (#1536)
by Marco Capetta 07 Jun '18

07 Jun '18

kamailio version: kamailio 5.1.2 (x86_64/linux) If "onsend_route" routing block is defined at the beginning of the kamailio.cfg routing part, the name defined in "src/core/cfg.lex" file (DEFAULT_SEND) is used when printed in the json files. Instead, if this routing block is defined in between the configuration, its name is changed to the previous defined block. For example, if the cfg file looks like the following: route[TEST_1] { ... } onsend_route { ... } route[TEST_2] { ... } then in the output json file, the "onsend_route" block is called TEST_1. The issue doesn't happen for "request_route" block. -- 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/1536

2 2

git:master:7d217232: cfgt: documment that pv module has to be loaded in order to work
by Victor Seva 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: 7d21723205ad02374364c3f0143b618d1a649d4d URL: https://github.com/kamailio/kamailio/commit/7d21723205ad02374364c3f0143b618… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:16:16+02:00 cfgt: documment that pv module has to be loaded in order to work --- Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d21723205ad02374364c3f0143b618… Patch: https://github.com/kamailio/kamailio/commit/7d21723205ad02374364c3f0143b618… --- diff --git a/src/modules/cfgt/doc/cfgt_admin.xml b/src/modules/cfgt/doc/cfgt_admin.xml index ce6fb16c4f..c85cae4335 100644 --- a/src/modules/cfgt/doc/cfgt_admin.xml +++ b/src/modules/cfgt/doc/cfgt_admin.xml @@ -35,7 +35,7 @@ <itemizedlist> <listitem> <para> - <emphasis>None</emphasis>. + <emphasis>pv</emphasis>. </para> </listitem> </itemizedlist>

1 0

git:master:92f8fdab: core: unset routename when default_routename is set
by Victor Seva 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: 92f8fdabcffd84e315d749bae8ded3490f8de014 URL: https://github.com/kamailio/kamailio/commit/92f8fdabcffd84e315d749bae8ded34… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-07T17:15:48+02:00 core: unset routename when default_routename is set fix #1536 --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/92f8fdabcffd84e315d749bae8ded34… Patch: https://github.com/kamailio/kamailio/commit/92f8fdabcffd84e315d749bae8ded34… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 192b488938..ddef8a03ea 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -569,23 +569,23 @@ IMPORTFILE "import_file" <INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } <INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } <INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } -<INITIAL>{ROUTE} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE; } -<INITIAL>{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE_REQUEST} { count(); routename=0; default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE_REQUEST; } -<INITIAL>{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_ONREPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_ONREPLY; } -<INITIAL>{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_REPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_REPLY; } -<INITIAL>{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE"; +<INITIAL>{ROUTE_FAILURE} { count(); routename=0; default_routename="DEFAULT_FAILURE"; yylval.strval=yytext; return ROUTE_FAILURE; } -<INITIAL>{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH"; +<INITIAL>{ROUTE_BRANCH} { count(); routename=0; default_routename="DEFAULT_BRANCH"; yylval.strval=yytext; return ROUTE_BRANCH; } -<INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; +<INITIAL>{ROUTE_SEND} { count(); routename=0; default_routename="DEFAULT_SEND"; yylval.strval=yytext; return ROUTE_SEND; } -<INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; +<INITIAL>{ROUTE_EVENT} { count(); routename=0; default_routename="DEFAULT_EVENT"; yylval.strval=yytext; state=EVRT_NAME_S; BEGIN(EVRTNAME); return ROUTE_EVENT; }

1 0

git:master:513a1763: dispatcher: print runtime details in rpc command output
by Daniel-Constantin Mierla 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: 513a176394247a3378ee218bf9df611da7296061 URL: https://github.com/kamailio/kamailio/commit/513a176394247a3378ee218bf9df611… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T13:05:04+02:00 dispatcher: print runtime details in rpc command output - contains dialog loads per destination if the call load algorithm is enabled --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/513a176394247a3378ee218bf9df611… Patch: https://github.com/kamailio/kamailio/commit/513a176394247a3378ee218bf9df611… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index bcb085c624..72aa94d1e2 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1282,7 +1282,8 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) void *sh; void *vh; void *wh; - void *lh; // latency stats handle + void *lh; + void *dh; int j; char c[3]; str data = STR_NULL; @@ -1327,23 +1328,22 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) c[1] = 'X'; if(node->dlist[j].attrs.body.s) { - if(rpc->struct_add(vh, "Ssd{", "URI", &node->dlist[j].uri, "FLAGS", - c, "PRIORITY", node->dlist[j].priority, "ATTRS", &wh) - < 0) { + if(rpc->struct_add(vh, "Ssd{", "URI", &node->dlist[j].uri, + "FLAGS", c, + "PRIORITY", node->dlist[j].priority, + "ATTRS", &wh) < 0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } - if(rpc->struct_add(wh, "SSdddS", "BODY", - &(node->dlist[j].attrs.body), "DUID", - (node->dlist[j].attrs.duid.s) - ? &(node->dlist[j].attrs.duid) - : &data, - "MAXLOAD", node->dlist[j].attrs.maxload, "WEIGHT", - node->dlist[j].attrs.weight, "RWEIGHT", - node->dlist[j].attrs.rweight, "SOCKET", - (node->dlist[j].attrs.socket.s) - ? &(node->dlist[j].attrs.socket) - : &data) + if(rpc->struct_add(wh, "SSdddS", + "BODY", &(node->dlist[j].attrs.body), + "DUID", (node->dlist[j].attrs.duid.s) + ? &(node->dlist[j].attrs.duid) : &data, + "MAXLOAD", node->dlist[j].attrs.maxload, + "WEIGHT", node->dlist[j].attrs.weight, + "RWEIGHT", node->dlist[j].attrs.rweight, + "SOCKET", (node->dlist[j].attrs.socket.s) + ? &(node->dlist[j].attrs.socket) : &data) < 0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1; @@ -1371,6 +1371,16 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) return -1; } } + if (ds_hash_size>0) { + if(rpc->struct_add(vh, "{", "RUNTIME", &dh) < 0) { + rpc->fault(ctx, 500, "Internal error creating runtime struct"); + return -1; + } + if (rpc->struct_add(dh, "d", "DLGLOAD", node->dlist[j].dload) < 0) { + rpc->fault(ctx, 500, "Internal error creating runtime attrs"); + return -1; + } + } } return 0;

1 0

git:master:20eb9951: Merge pull request #1555 from sergey-safarov/my-master
by GitHub 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: 20eb9951a574a5ef3163d975bd0c360471d09180 URL: https://github.com/kamailio/kamailio/commit/20eb9951a574a5ef3163d975bd0c360… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-07T12:44:53+02:00 Merge pull request #1555 from sergey-safarov/my-master pkg/kamailio/centos: Removed not updated packaging files --- Removed: pkg/kamailio/centos/6/README Removed: pkg/kamailio/centos/6/kamailio.init Removed: pkg/kamailio/centos/6/kamailio.spec Removed: pkg/kamailio/centos/6/kamailio.sysconfig Removed: pkg/kamailio/centos/7/README Removed: pkg/kamailio/centos/7/kamailio.init Removed: pkg/kamailio/centos/7/kamailio.service Removed: pkg/kamailio/centos/7/kamailio.spec Removed: pkg/kamailio/centos/7/kamailio.sysconfig Removed: pkg/kamailio/centos/7/kamailio.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/20eb9951a574a5ef3163d975bd0c360… Patch: https://github.com/kamailio/kamailio/commit/20eb9951a574a5ef3163d975bd0c360…

1 0

git:master:8a274cb4: pkg/kamailio/centos: Removed not updated packaging files
by Sergey Safarov 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: 8a274cb474799428b4ec838da53000fedd16abd8 URL: https://github.com/kamailio/kamailio/commit/8a274cb474799428b4ec838da53000f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-06-07T09:51:19Z pkg/kamailio/centos: Removed not updated packaging files --- Removed: pkg/kamailio/centos/6/README Removed: pkg/kamailio/centos/6/kamailio.init Removed: pkg/kamailio/centos/6/kamailio.spec Removed: pkg/kamailio/centos/6/kamailio.sysconfig Removed: pkg/kamailio/centos/7/README Removed: pkg/kamailio/centos/7/kamailio.init Removed: pkg/kamailio/centos/7/kamailio.service Removed: pkg/kamailio/centos/7/kamailio.spec Removed: pkg/kamailio/centos/7/kamailio.sysconfig Removed: pkg/kamailio/centos/7/kamailio.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/8a274cb474799428b4ec838da53000f… Patch: https://github.com/kamailio/kamailio/commit/8a274cb474799428b4ec838da53000f…

1 0

[kamailio/kamailio] pkg/kamailio/centos: Removed not updated packaging files (#1555)
by sergey-safarov 07 Jun '18

07 Jun '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1555 -- Commit Summary -- * pkg/kamailio/centos: Removed not updated packaging files -- File Changes -- D pkg/kamailio/centos/6/README (29) D pkg/kamailio/centos/6/kamailio.init (134) D pkg/kamailio/centos/6/kamailio.spec (1279) D pkg/kamailio/centos/6/kamailio.sysconfig (30) D pkg/kamailio/centos/7/README (16) D pkg/kamailio/centos/7/kamailio.init (141) D pkg/kamailio/centos/7/kamailio.service (27) D pkg/kamailio/centos/7/kamailio.spec (1468) D pkg/kamailio/centos/7/kamailio.sysconfig (30) D pkg/kamailio/centos/7/kamailio.tmpfiles (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1555.patch https://github.com/kamailio/kamailio/pull/1555.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/1555

2 2

git:master:f5792d1c: core: new rpc command - core.ppdefines_full
by Daniel-Constantin Mierla 07 Jun '18

07 Jun '18

Module: kamailio Branch: master Commit: f5792d1c61702526f6382d4250c16ba0deacff6f URL: https://github.com/kamailio/kamailio/commit/f5792d1c61702526f6382d4250c16ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T12:40:13+02:00 core: new rpc command - core.ppdefines_full - print preprocess defines with their details --- Modified: src/core/cfg.lex Modified: src/core/core_cmd.c Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/f5792d1c61702526f6382d4250c16ba… Patch: https://github.com/kamailio/kamailio/commit/f5792d1c61702526f6382d4250c16ba… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 65507e7dfb..192b488938 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1724,6 +1724,13 @@ str* pp_get_define_name(int idx) return &pp_defines[idx].name; } +ksr_ppdefine_t* pp_get_define(int idx) +{ + if(idx<0 || idx>=pp_num_defines) + return NULL; + return &pp_defines[idx]; +} + static int pp_lookup(int len, const char * text) { str var = {(char *)text, len}; @@ -1768,7 +1775,7 @@ int pp_define(int len, const char * text) pp_defines[ppos].value.len = 0; pp_defines[ppos].value.s = NULL; } - pp_defines[ppos].type = pp_define_type; + pp_defines[ppos].dtype = pp_define_type; return 0; } else { LM_CRIT("already defined: %.*s\n", len, text); @@ -1786,7 +1793,7 @@ int pp_define(int len, const char * text) pp_defines[pp_num_defines].name.s[len] = '\0'; pp_defines[pp_num_defines].value.len = 0; pp_defines[pp_num_defines].value.s = NULL; - pp_defines[pp_num_defines].type = pp_define_type; + pp_defines[pp_num_defines].dtype = pp_define_type; pp_define_index = pp_num_defines; pp_num_defines++; diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 4dc5554671..d1ceb88cef 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -998,6 +998,44 @@ static void core_ppdefines(rpc_t* rpc, void* c) } } +/** + * + */ +static const char* core_ppdefines_full_doc[] = { + "List preprocessor defines with full details", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +/** + * list listen sockets for SIP server + */ +static void core_ppdefines_full(rpc_t* rpc, void* c) +{ + ksr_ppdefine_t *ppdef; + void *vp; + int i=0; + + while((ppdef=pp_get_define(i))!=NULL && ppdef->name.s!=NULL) { + if (rpc->add(c, "{", &vp) < 0) { + rpc->fault(c, 500, "Server Failure"); + return; + } + if(ppdef->value.s!=NULL) { + rpc->struct_add(vp, "SdS", + "name", &ppdef->name, + "type", ppdef->dtype, + "value", &ppdef->value); + } else { + rpc->struct_add(vp, "Sds", + "name", &ppdef->name, + "type", ppdef->dtype, + "value", "none"); + } + + i++; + } +} + /* * RPC Methods exported by core */ @@ -1036,6 +1074,7 @@ static rpc_export_t core_rpc_methods[] = { {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, {"core.modules", core_modules, core_modules_doc, RET_ARRAY}, {"core.ppdefines", core_ppdefines, core_ppdefines_doc, RET_ARRAY}, + {"core.ppdefines_full", core_ppdefines_full, core_ppdefines_doc, RET_ARRAY}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 }, diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index c28258b71f..5524b9fd58 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -28,10 +28,11 @@ typedef struct ksr_ppdefine { str name; str value; - int type; + int dtype; } ksr_ppdefine_t; str* pp_get_define_name(int idx); +ksr_ppdefine_t* pp_get_define(int idx); int pp_subst_add(char *data); int pp_substdef_add(char *data, int mode);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018